Update unkink-polygon testing/refactoring (#889)

* Update unkink-polygon testing/refactoring * Fix linting issue
Turfjs · Aug 4, 2017 · 51c513d · 51c513d
1 parent 4ae9c80
commit 51c513d
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 94 deletions.
diff --git a/packages/turf-unkink-polygon/index.js b/packages/turf-unkink-polygon/index.js
@@ -1,7 +1,10 @@
+var meta = require('@turf/meta');
+var helpers = require('@turf/helpers');
 var simplepolygon = require('simplepolygon');
-var flatten = require('@turf/flatten');
-var featureEach = require('@turf/meta').featureEach;
-var featureCollection = require('@turf/helpers').featureCollection;
+var flattenEach = meta.flattenEach;
+var featureEach = meta.featureEach;
+var polygon = helpers.polygon;
+var featureCollection = helpers.featureCollection;
 
 /**
  * Takes a kinked polygon and returns a feature collection of polygons that have no kinks.
@@ -19,23 +22,12 @@ var featureCollection = require('@turf/helpers').featureCollection;
  * var addToMap = [poly, result]
  */
 module.exports = function (geojson) {
-    var results = featureCollection([]);
-
-    // Handles FeatureCollection & Feature
-    featureEach(geojson, function (feature) {
-
-        // Handle MultiPolygons as Feature or FeatureCollection
-        if (feature.geometry.type === 'MultiPolygon') { feature = flatten(feature); }
-
-        // Store simple polygons in results
-        featureEach(feature, function (polygon) {
-            var simple = simplepolygon(polygon);
-
-            featureEach(simple, function (poly) {
-                poly.properties = (polygon.properties) ? polygon.properties : {};
-                results.features.push(poly);
-            });
+    var features = [];
+    flattenEach(geojson, function (feature) {
+        if (feature.geometry.type !== 'Polygon') return;
+        featureEach(simplepolygon(feature), function (poly) {
+            features.push(polygon(poly.geometry.coordinates, feature.properties));
         });
     });
-    return results;
+    return featureCollection(features);
 };
diff --git a/packages/turf-unkink-polygon/package.json b/packages/turf-unkink-polygon/package.json
@@ -36,9 +36,8 @@
     "write-json-file": "^2.0.0"
   },
   "dependencies": {
-    "@turf/flatten": "^4.6.0",
     "@turf/helpers": "^4.6.0",
     "@turf/meta": "^4.6.0",
-    "simplepolygon": "1.2.0"
+    "simplepolygon": "1.2.1"
   }
 }
diff --git a/packages/turf-unkink-polygon/test.js b/packages/turf-unkink-polygon/test.js
@@ -20,7 +20,7 @@ test('unkink-polygon', t => {
     for (const {filename, geojson} of fixtures) {
         const unkinked = colorize(unkink(geojson));
 
-        if (process.env.REGEN) { write.sync(directories.out + filename, unkinked); }
+        if (process.env.REGEN) write.sync(directories.out + filename, unkinked);
 
         const expected = load.sync(directories.out + filename);
         t.deepEquals(unkinked, expected, path.parse(filename).name);
@@ -39,16 +39,16 @@ test('unkink-polygon -- throws', t => {
     t.end();
 });
 
-function colorize(features, colors = ['#F00', '#00F'], width = 6) {
+function colorize(features, colors = ['#F00', '#00F', '#0F0', '#F0F', '#FFF'], width = 6) {
     const results = [];
     featureEach(features, (feature, index) => {
         const color = colors[index % colors.length];
-        feature.properties = {
+        feature.properties = Object.assign({
             stroke: color,
             fill: color,
             'stroke-width': width,
-            'fill-opacity': 0.1
-        };
+            'fill-opacity': 0.5
+        }, feature.properties);
         results.push(feature);
     });
     return featureCollection(results);

diff --git a/packages/turf-unkink-polygon/test/in/complex.geojson b/packages/turf-unkink-polygon/test/in/complex.geojson
@@ -1,6 +1,8 @@
 {
   "type": "Feature",
-  "properties": {},
+  "properties": {
+    "foo": "bar"
+  },
   "geometry": {
     "type": "Polygon",
     "coordinates": [

diff --git a/packages/turf-unkink-polygon/test/out/complex.geojson b/packages/turf-unkink-polygon/test/out/complex.geojson
@@ -7,7 +7,8 @@
 				"stroke": "#F00",
 				"fill": "#F00",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5,
+				"foo": "bar"
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -43,7 +44,8 @@
 				"stroke": "#00F",
 				"fill": "#00F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5,
+				"foo": "bar"
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -148,10 +150,11 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
-				"fill": "#F00",
+				"stroke": "#0F0",
+				"fill": "#0F0",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5,
+				"foo": "bar"
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -228,10 +231,11 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
-				"fill": "#00F",
+				"stroke": "#F0F",
+				"fill": "#F0F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5,
+				"foo": "bar"
 			},
 			"geometry": {
 				"type": "Polygon",

diff --git a/packages/turf-unkink-polygon/test/out/hourglass.geojson b/packages/turf-unkink-polygon/test/out/hourglass.geojson
@@ -4,10 +4,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
+				"stroke": "#ff0000",
 				"fill": "#F00",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -36,10 +36,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
+				"stroke": "#ff0000",
 				"fill": "#00F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",

diff --git a/packages/turf-unkink-polygon/test/out/hourglassFeatureCollection.geojson b/packages/turf-unkink-polygon/test/out/hourglassFeatureCollection.geojson
@@ -4,10 +4,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
+				"stroke": "#ff0000",
 				"fill": "#F00",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -36,10 +36,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
+				"stroke": "#ff0000",
 				"fill": "#00F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -68,10 +68,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
-				"fill": "#F00",
+				"stroke": "#0000ff",
+				"fill": "#0F0",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -100,10 +100,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
-				"fill": "#00F",
+				"stroke": "#0000ff",
+				"fill": "#F0F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",

diff --git a/...ges/turf-unkink-polygon/test/out/hourglassFeatureCollectionMultiPolygon.geojson b/...ges/turf-unkink-polygon/test/out/hourglassFeatureCollectionMultiPolygon.geojson
@@ -4,10 +4,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
+				"stroke": "#ff0000",
 				"fill": "#F00",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -36,10 +36,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
+				"stroke": "#ff0000",
 				"fill": "#00F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -68,10 +68,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
-				"fill": "#F00",
+				"stroke": "#ff0000",
+				"fill": "#0F0",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -100,10 +100,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
-				"fill": "#00F",
+				"stroke": "#ff0000",
+				"fill": "#F0F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -132,10 +132,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
-				"fill": "#F00",
+				"stroke": "#0000ff",
+				"fill": "#FFF",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -164,10 +164,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
-				"fill": "#00F",
+				"stroke": "#0000ff",
+				"fill": "#F00",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",

diff --git a/packages/turf-unkink-polygon/test/out/hourglassMultiPolygon.geojson b/packages/turf-unkink-polygon/test/out/hourglassMultiPolygon.geojson
@@ -4,10 +4,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
+				"stroke": "#ff0000",
 				"fill": "#F00",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -36,10 +36,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
+				"stroke": "#ff0000",
 				"fill": "#00F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -68,10 +68,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#F00",
-				"fill": "#F00",
+				"stroke": "#ff0000",
+				"fill": "#0F0",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",
@@ -100,10 +100,10 @@
 		{
 			"type": "Feature",
 			"properties": {
-				"stroke": "#00F",
-				"fill": "#00F",
+				"stroke": "#ff0000",
+				"fill": "#F0F",
 				"stroke-width": 6,
-				"fill-opacity": 0.1
+				"fill-opacity": 0.5
 			},
 			"geometry": {
 				"type": "Polygon",