Merge pull request mapbox#55 from mapbox/correct-rhr

fix RHR logic

lib/object.js

@@ -202,6 +202,7 @@ function hint(gj, options) {
  message: 'the first and last positions in a LinearRing of coordinates must be the same',
  line: line
  });
+ return true;
  }
  } else if (type === 'Line' && coords.length < 2) {
  return errors.push({
@@ -216,8 +217,11 @@ function hint(gj, options) {
  line: line
  });
  } else {
- coords.forEach(function(c) {
- positionArray(c, type, depth - 1, c.__line__ || line);
+ var results = coords.map(function(c) {
+ return positionArray(c, type, depth - 1, c.__line__ || line);
+ });
+ return results.some(function(r) {
+ return r;
  });
  }
  }

lib/rhr.js

@@ -18,10 +18,10 @@ function isRingClockwise (coords) {
 
 function isPolyRHR (coords) {
  if (coords && coords.length > 0) {
- if (!isRingClockwise(coords[0]))
+ if (isRingClockwise(coords[0]))
  return false;
  var interiorCoords = coords.slice(1, coords.length);
- if (interiorCoords.some(isRingClockwise))
+ if (!interiorCoords.every(isRingClockwise))
  return false;
  }
  return true;

test/data/bad/bad-polygon-interiorring-rhr.cli-output-json

@@ -0,0 +1,7 @@
+[
+ {
+ "message": "Polygons and MultiPolygons should follow the right-hand rule",
+ "level": "message",
+ "line": 1
+ }
+]

test/data/bad/bad-polygon-interiorring-rhr.cli-output-pretty

@@ -0,0 +1,3 @@
+ 1:1 warning Polygons and MultiPolygons should follow the right-hand rule
+
+⚠ 1 warning

test/data/bad/bad-polygon-interiorring-rhr.geojson

@@ -0,0 +1,6 @@
+{ "type": "Polygon",
+ "coordinates": [
+ [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+ [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]
+ ]
+ }

test/data/bad/bad-polygon-interiorring-rhr.result

@@ -0,0 +1,7 @@
+[
+ {
+ "message": "Polygons and MultiPolygons should follow the right-hand rule",
+ "level": "message",
+ "line": 1
+ }
+]

test/data/bad/bad-polygon-interiorring-rhr.result-object

@@ -0,0 +1,6 @@
+[
+ {
+ "message": "Polygons and MultiPolygons should follow the right-hand rule",
+ "level": "message"
+ }
+]

test/data/bad/bad-polygonloop.cli-output-json

@@ -1442,10 +1442,5 @@
  {
  "message": "a number was found where a coordinate array should have been found: this needs to be nested more deeply",
  "line": 1445
- },
- {
- "message": "Polygons and MultiPolygons should follow the right-hand rule",
- "level": "message",
- "line": 2
  }
 ]

test/data/bad/bad-polygonloop.result

@@ -1442,10 +1442,5 @@
  {
  "message": "a number was found where a coordinate array should have been found: this needs to be nested more deeply",
  "line": 1445
- },
- {
- "message": "Polygons and MultiPolygons should follow the right-hand rule",
- "level": "message",
- "line": 2
  }
-]
+]

test/data/bad/bad-polygonloop.result-object

@@ -1081,9 +1081,5 @@
  },
  {
  "message": "a number was found where a coordinate array should have been found: this needs to be nested more deeply"
- },
- {
- "message": "Polygons and MultiPolygons should follow the right-hand rule",
- "level": "message"
  }
-]
+]

test/data/bad/different-first-last.geojson

@@ -1,5 +1,5 @@
 { "type": "Polygon",
  "coordinates": [
- [ [100.0, 0.0], [100.0, 1.0], [101.0, 1.0], [101.0, 0.0] ]
+ [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0] ]
  ]
  }

test/data/bad/different-first-size.geojson

@@ -1,7 +1,7 @@
 { "type": "MultiPolygon",
  "coordinates": [
- [[[102.0, 2.0], [102.0, 3.0], [103.0, 3.0], [103.0, 2.0], [102.0, 2.0]]],
+ [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
  [[[100.0, 0.0], [100.0, 1.0], [101.0, 1.0], [101.0, 0.0], [100.0, 0.0, 4.9]],
- [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+ [[100.2, 0.2], [100.2, 0.8], [100.8, 0.8], [100.8, 0.2], [100.2, 0.2]]]
  ]
  }

test/data/bad/featurecollection_changed_semantics.geojson

@@ -22,7 +22,7 @@
  "geometry": {
  "type": "Polygon",
  "coordinates": [
- [ [100.0, 0.0], [100.0, 1.0], [101.0, 1.0], [101.0, 0.0], [100.0, 0.0] ]
+ [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
  ]
  },
  "properties": {

test/data/bad/polygon_winding_order.geojson

@@ -1,3 +1,3 @@
 { "type":"Polygon",
- "coordinates":[[[100,0],[101,0],[101,1],[100,1],[100,0]]]
+ "coordinates":[[[100,0],[100,1],[101,1],[101,0],[100,0]]]
  }

test/data/good/good-featurecollection-extensions.geojson

@@ -27,8 +27,8 @@
  "type": "Polygon",
  "custom": true,
  "coordinates": [
- [ [100.0, 0.0], [100.0, 1.0], [101.0, 1.0],
- [101.0, 0.0], [100.0, 0.0] ]
+ [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
+ [100.0, 1.0], [100.0, 0.0] ]
  ]
  },
  "properties": {

test/data/good/good-featurecollection.geojson

@@ -20,7 +20,7 @@
  "geometry": {
  "type": "Polygon",
  "coordinates": [
- [ [100.0, 0.0], [100.0, 1.0], [101.0, 1.0], [101.0, 0.0], [100.0, 0.0] ]
+ [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
  ]
  },
  "properties": {

test/data/good/good-polygon.geojson

@@ -1,5 +1,5 @@
 { "type": "Polygon",
  "coordinates": [
- [ [100.0, 0.0], [100.0, 1.0], [101.0, 1.0], [101.0, 0.0], [100.0, 0.0] ]
+ [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
  ]
  }

test/data/good/multipolygon.geojson

@@ -1,7 +1,7 @@
 { "type": "MultiPolygon",
  "coordinates": [
- [[[102.0, 2.0], [102.0, 3.0], [103.0, 3.0], [103.0, 2.0], [102.0, 2.0]]],
- [[[100.0, 0.0], [100.0, 1.0], [101.0, 1.0], [101.0, 0.0], [100.0, 0.0]],
- [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+ [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+ [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+ [[100.2, 0.2], [100.2, 0.8], [100.8, 0.8], [100.8, 0.2], [100.2, 0.2]]]
  ]
  }