mapshaper 0.5.71 → 0.5.72

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.5.72
+* Improved performance of non-adjacent polygon coloring using DSATUR algorithm.
+
+v0.5.71
+* Added -classify non-adjacent option, for assigning non-adjacent colors to a polygon layer in a randomish pattern.
+
 v0.5.70
 * Added -join duplication option, which duplicates features in the target layer when many-to-one joins occur.
 
@@ -23,7 +29,7 @@ v0.5.64
 * Bug fixes
 
 v0.5.63
-* Added -o decimal-comma function, for exporting CSV numbers with decimal commas.
+* Added -o decimal-comma option, for exporting CSV numbers with decimal commas.
 * Fix for issue #497 (error erasing with overlapping polygons).
 
 v0.5.62

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.69";
+  var VERSION = "0.5.72";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -28208,6 +28208,8 @@ ${svg}
     findPairsOfNeighbors: findPairsOfNeighbors
   });
 
+  var BALANCE_COLORS = true;
+
   function getNonAdjacentClassifier(lyr, dataset, colors) {
     requirePolygonLayer(lyr);
     var getNeighbors = getNeighborLookupFunction(lyr, dataset.arcs);
@@ -28215,25 +28217,30 @@ ${svg}
     var data = utils.range(getFeatureCount(lyr)).map(function(shpId) {
       var nabes = getNeighbors(shpId) || [];
       return {
+        // id: shpId,
         nabes: nabes,
-        n: nabes.length,
-        colorId: -1
+        colorId: -1,
+        nabeColors: [],
+        uncolored: nabes.length,
+        saturation: 0,
+        saturation2: 0
       };
     });
     var getSortedColorIds = getUpdateFunction(colors.length);
     var colorIds = getSortedColorIds();
     // Sort adjacency data by number of neighbors in descending order
-    var sorted = data.concat();
-    utils.sortOn(sorted, 'n', false);
+    var iter = getNodeIterator(data);
     // Assign colors, starting with polygons with the largest number of neighbors
-    sorted.forEach(function(d) {
+    iter.forEach(function(d) {
       var colorId = pickColor(d, data, colorIds);
       if (colorId == -1) {
         errorCount++;
         colorId = colorIds[0];
       }
       d.colorId = colorId;
-      colorIds = getSortedColorIds(colorId);
+      if (BALANCE_COLORS) {
+        colorIds = getSortedColorIds(colorId);
+      }
     });
 
     if (errorCount > 0) {
@@ -28244,6 +28251,59 @@ ${svg}
     };
   }
 
+  function getNodeIterator(data) {
+    var sorted = data.concat();
+    utils.sortOn(sorted, 'uncolored', true);
+    function forEach(cb) {
+      var item;
+      while(sorted.length > 0) {
+        item = sorted.pop();
+        cb(item);
+        updateNeighbors(item, sorted, data);
+      }
+    }
+
+    return {
+      forEach: forEach
+    };
+  }
+
+  function updateNeighbors(item, sorted, data) {
+    var nabe;
+    var ids = item.nabes;
+    for (var i=0; i<ids.length; i++) {
+      nabe = data[ids[i]];
+      if (nabe.colorId > -1) continue;
+      updateNeighbor(nabe, item.colorId, sorted);
+    }
+  }
+
+  function updateNeighbor(a, colorId, sorted) {
+    var i = sorted.indexOf(a); // could optimize with a binary search
+    var n = sorted.length;
+    var b;
+    if (i == -1) {
+      error('Indexing error');
+    }
+    a.uncolored--;
+    a.saturation2++;
+    if (!a.nabeColors.includes(colorId)) {
+      a.saturation++;
+      a.nabeColors.push(colorId);
+    }
+    // insertion sort with a stopping condition
+    while (++i < n) {
+      b = sorted[i];
+      // standard dsatur
+      if (a.saturation < b.saturation || a.saturation == b.saturation && a.uncolored > b.uncolored) break;
+      // based on 4-color tests with counties and zipcodes, this condition adds a bit of strength
+      if (a.saturation == b.saturation && a.uncolored == b.uncolored && a.saturation2 < b.saturation2) break; // 332
+      sorted[i-1] = b;
+      sorted[i] = a;
+    }
+  }
+
+
   // Pick the id of a color that is not shared with a neighboring polygon
   function pickColor(d, data, colorIds) {
     var candidateId;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.71",
+	"version": "0.5.72",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -24,8 +24,8 @@
 	"scripts": {
 		"test": "mocha -r esm --parallel --jobs 4 --check-leaks -R dot",
 		"build": "rollup --config",
-		"prepublishOnly": "npm test",
-		"postpublish": "./release",
+		"prepublishOnly": "npm test; ./pre-publish",
+		"postpublish": "./release_web_ui; ./release_github_version",
 		"browserify_old": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r d3-scale-chromatic -r d3-color -r d3-interpolate -o www/modules.js",
 		"browserify": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r d3-scale-chromatic -r d3-color -r d3-interpolate -r kdbush -o www/modules.js",
 		"watch": "rollup --config --watch",

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.69";
+  var VERSION = "0.5.72";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -28208,6 +28208,8 @@ ${svg}
     findPairsOfNeighbors: findPairsOfNeighbors
   });
 
+  var BALANCE_COLORS = true;
+
   function getNonAdjacentClassifier(lyr, dataset, colors) {
     requirePolygonLayer(lyr);
     var getNeighbors = getNeighborLookupFunction(lyr, dataset.arcs);
@@ -28215,25 +28217,30 @@ ${svg}
     var data = utils.range(getFeatureCount(lyr)).map(function(shpId) {
       var nabes = getNeighbors(shpId) || [];
       return {
+        // id: shpId,
         nabes: nabes,
-        n: nabes.length,
-        colorId: -1
+        colorId: -1,
+        nabeColors: [],
+        uncolored: nabes.length,
+        saturation: 0,
+        saturation2: 0
       };
     });
     var getSortedColorIds = getUpdateFunction(colors.length);
     var colorIds = getSortedColorIds();
     // Sort adjacency data by number of neighbors in descending order
-    var sorted = data.concat();
-    utils.sortOn(sorted, 'n', false);
+    var iter = getNodeIterator(data);
     // Assign colors, starting with polygons with the largest number of neighbors
-    sorted.forEach(function(d) {
+    iter.forEach(function(d) {
       var colorId = pickColor(d, data, colorIds);
       if (colorId == -1) {
         errorCount++;
         colorId = colorIds[0];
       }
       d.colorId = colorId;
-      colorIds = getSortedColorIds(colorId);
+      if (BALANCE_COLORS) {
+        colorIds = getSortedColorIds(colorId);
+      }
     });
 
     if (errorCount > 0) {
@@ -28244,6 +28251,59 @@ ${svg}
     };
   }
 
+  function getNodeIterator(data) {
+    var sorted = data.concat();
+    utils.sortOn(sorted, 'uncolored', true);
+    function forEach(cb) {
+      var item;
+      while(sorted.length > 0) {
+        item = sorted.pop();
+        cb(item);
+        updateNeighbors(item, sorted, data);
+      }
+    }
+
+    return {
+      forEach: forEach
+    };
+  }
+
+  function updateNeighbors(item, sorted, data) {
+    var nabe;
+    var ids = item.nabes;
+    for (var i=0; i<ids.length; i++) {
+      nabe = data[ids[i]];
+      if (nabe.colorId > -1) continue;
+      updateNeighbor(nabe, item.colorId, sorted);
+    }
+  }
+
+  function updateNeighbor(a, colorId, sorted) {
+    var i = sorted.indexOf(a); // could optimize with a binary search
+    var n = sorted.length;
+    var b;
+    if (i == -1) {
+      error('Indexing error');
+    }
+    a.uncolored--;
+    a.saturation2++;
+    if (!a.nabeColors.includes(colorId)) {
+      a.saturation++;
+      a.nabeColors.push(colorId);
+    }
+    // insertion sort with a stopping condition
+    while (++i < n) {
+      b = sorted[i];
+      // standard dsatur
+      if (a.saturation < b.saturation || a.saturation == b.saturation && a.uncolored > b.uncolored) break;
+      // based on 4-color tests with counties and zipcodes, this condition adds a bit of strength
+      if (a.saturation == b.saturation && a.uncolored == b.uncolored && a.saturation2 < b.saturation2) break; // 332
+      sorted[i-1] = b;
+      sorted[i] = a;
+    }
+  }
+
+
   // Pick the id of a color that is not shared with a neighboring polygon
   function pickColor(d, data, colorIds) {
     var candidateId;