mapshaper 0.5.118 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.118",
+	"version": "0.6.3",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -9,6 +9,7 @@
 		"cartography",
 		"simplification",
 		"topology",
+		"csv",
 		"gis"
 	],
 	"author": "Matthew Bloch <masiyou@gmail.com>",
@@ -19,16 +20,15 @@
 		"url": "https://github.com/mbloch/mapshaper"
 	},
 	"engines": {
-		"node": ">=6.0.0"
+		"node": ">=12.0.0"
 	},
 	"scripts": {
-		"test": "mocha -r esm --parallel --jobs 4 --check-leaks -R dot",
+		"test": "mocha test",
 		"build": "rollup --config",
-		"prepublishOnly": "npm test; ./pre-publish",
+    "lint": "eslint --ext mjs src/",
+		"prepublishOnly": "npm lint; 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 -r @tmcw/togeojson -o www/modules.js",
-		"watch": "rollup --config --watch",
+		"browserify": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r kdbush -r @tmcw/togeojson -o www/modules.js",
 		"dev": "rollup --config --watch"
 	},
 	"main": "./mapshaper.js",
@@ -36,7 +36,7 @@
 		"/bin/**",
 		"/www/**",
 		"!/www/basemap.js",
-		"!/www/nacis/",
+		"!/www/nacis/**",
 		"/mapshaper.js",
 		"!.DS_Store"
 	],
@@ -50,7 +50,7 @@
 		"delaunator": "^5.0.0",
 		"flatbush": "^3.2.1",
 		"geokdbush": "^1.1.0",
-		"iconv-lite": "0.4.24",
+		"iconv-lite": "^0.6.3",
 		"kdbush": "^3.0.0",
 		"mproj": "0.0.35",
 		"opn": "^5.3.0",
@@ -59,16 +59,24 @@
 		"tinyqueue": "^2.0.3"
 	},
 	"devDependencies": {
-		"@rollup/plugin-node-resolve": "^13.0.6",
+		"@rollup/plugin-node-resolve": "^13.3.0",
 		"browserify": "^17.0.0",
 		"csv-spectrum": "^1.0.0",
-		"deep-eql": ">=0.1.3",
-		"esm": "^3.2.25",
-		"mocha": "^8.4.0",
-		"rollup": "^2.60.0",
+		"eslint": "^8.16.0",
+		"mocha": "^10.0.0",
+		"rollup": "^2.73.0",
 		"shell-quote": "^1.6.1",
 		"underscore": "^1.13.1"
 	},
+	"mocha": {
+		"reporter": "dot",
+		"node-option": [
+			"experimental-specifier-resolution=node"
+		],
+		"check-leaks": true,
+		"parallel": true,
+		"jobs": 4
+	},
 	"bin": {
 		"mapshaper": "./bin/mapshaper",
 		"mapshaper-gui": "./bin/mapshaper-gui",

package/www/mapshaper-gui.js

@@ -78,6 +78,7 @@
     get findValueByPct () { return findValueByPct; },
     get findValueByRank () { return findValueByRank; },
     get findMedian () { return findMedian; },
+    get findQuantile () { return findQuantile; },
     get mean () { return mean; },
     get format () { return format; },
     get formatter () { return formatter; },
@@ -1682,7 +1683,6 @@
   }
 
   function Slider(ref, opts) {
-    var _el = El(ref);
     var _self = this;
     var defaults = {
       space: 7
@@ -1713,7 +1713,7 @@
         _handle = El(ref);
         draggable(_handle)
           .on('drag', function(e) {
-            setHandlePos(startX + e.dx, true);
+            setHandlePos(startX + e.dx);
           })
           .on('dragstart', function(e) {
             startX = position();
@@ -1739,7 +1739,7 @@
       return _pct;
     };
 
-    function setHandlePos(x, fire) {
+    function setHandlePos(x) {
       x = utils$1.clamp(x, 0, size());
       var pct = x / size();
       if (pct != _pct) {
@@ -2261,7 +2261,7 @@
       menu.hide();
       setTimeout(function() {
         var opts = getSimplifyOptions();
-        mapshaper.simplify(dataset, opts);
+        mapshaper.cmd.simplify(dataset, opts);
         gui.session.simplificationApplied(getSimplifyOptionsAsString());
         updateZ(gui.map.getActiveLayer()); // question: does this update all display layers?
         model.updated({
@@ -3122,7 +3122,7 @@
 
   function cleanLayerName(raw) {
     return raw.replace(/[\n\t/\\]/g, '')
-      .replace(/^[\.\s]+/, '').replace(/[\.\s]+$/, '');
+      .replace(/^[.\s]+/, '').replace(/[.\s]+$/, '');
   }
 
   function updateLayerStackOrder(layers) {
@@ -3856,8 +3856,6 @@
     }
   }
 
-  var snapVerticesToPoint = internal.snapVerticesToPoint;
-  var cloneShape = internal.cloneShape;
   var copyRecord = internal.copyRecord;
 
   function Undo(gui) {
@@ -4412,7 +4410,8 @@
     return self;
   }
 
-  var Buffer = require('buffer').Buffer; // works with browserify
+  // Fall back to browserify's Buffer polyfill
+  var B = typeof Buffer != 'undefined' ? Buffer : require('buffer').Buffer;
 
   // This module provides a way for multiple jobs to run together asynchronously
   // while keeping job-level context variables (like "defs") separate.
@@ -4740,7 +4739,7 @@
     '/': '/'
   };
   function htmlEscape(s) {
-    return String(s).replace(/[&<>"'\/]/g, function(s) {
+    return String(s).replace(/[&<>"'/]/g, function(s) {
       return entityMap[s];
     });
   }
@@ -5314,18 +5313,24 @@
     return arr[k];
   }
 
-  //
-  //
   function findMedian(arr) {
-    var n = arr.length,
-        rank = Math.floor(n / 2) + 1,
-        median = findValueByRank(arr, rank);
-    if ((n & 1) == 0) {
-      median = (median + findValueByRank(arr, rank - 1)) / 2;
-    }
-    return median;
+    return findQuantile(arr, 0.5);
   }
 
+  function findQuantile(arr, k) {
+    var n = arr.length,
+        i1 = Math.floor((n - 1) * k),
+        i2 = Math.ceil((n - 1) * k);
+    if (i1 < 0 || i2 >= n) return NaN;
+    var v1 = findValueByRank(arr, i1 + 1);
+    if (i1 == i2) return v1;
+    var v2 = findValueByRank(arr, i2 + 1);
+    // use linear interpolation
+    var w1 = i2 / (n - 1) - k;
+    var w2 = k - i1 / (n - 1);
+    var v = (v1 * w1 + v2 * w2) * (n - 1);
+    return v;
+  }
 
   function mean(arr) {
     var count = 0,
@@ -5383,8 +5388,8 @@
     var type = matches[4];
     var isString = type == 's',
         isHex = type == 'x' || type == 'X',
-        isInt = type == 'd' || type == 'i',
-        isFloat = type == 'f',
+        // isInt = type == 'd' || type == 'i',
+        // isFloat = type == 'f',
         isNumber = !isString;
 
     var sign = "",
@@ -5443,7 +5448,7 @@
 
   // Get a function for interpolating formatted values into a string.
   function formatter(fmt) {
-    var codeRxp = /%([\',+0]*)([1-9]?)((?:\.[1-9])?)([sdifxX%])/g;
+    var codeRxp = /%([',+0]*)([1-9]?)((?:\.[1-9])?)([sdifxX%])/g;
     var literals = [],
         formatCodes = [],
         startIdx = 0,
@@ -5487,10 +5492,10 @@
 
   function createBuffer(arg, arg2) {
     if (isInteger(arg)) {
-      return Buffer.allocUnsafe ? Buffer.allocUnsafe(arg) : new Buffer(arg);
+      return B.allocUnsafe ? B.allocUnsafe(arg) : new B(arg);
     } else {
       // check allocUnsafe to make sure Buffer.from() will accept strings (it didn't before Node v5.10)
-      return Buffer.from && Buffer.allocUnsafe ? Buffer.from(arg, arg2) : new Buffer(arg, arg2);
+      return B.from && B.allocUnsafe ? B.from(arg, arg2) : new B(arg, arg2);
     }
   }
 
@@ -5843,27 +5848,21 @@
 
     function pointTest(x, y) {
       var bullseyeDist = 2, // hit all points w/in 2 px
-          tinyDist = 0.5,
-          toPx = ext.getTransform().mx,
-          hits = [],
           hitThreshold = 25,
-          newThreshold = Infinity;
+          toPx = ext.getTransform().mx,
+          hits = [];
 
+      // inlining forEachPoint() does not not appreciably speed this up
       internal.forEachPoint(displayLayer.layer.shapes, function(p, id) {
         var dist = geom.distance2D(x, y, p[0], p[1]) * toPx;
         if (dist > hitThreshold) return;
-        // got a hit
-        if (dist < newThreshold) {
-          // start a collection of hits
-          hits = [id];
-          hitThreshold = Math.max(bullseyeDist, dist + tinyDist);
-          newThreshold = dist < bullseyeDist ? -1 : dist - tinyDist;
-        } else {
-          // add to hits if inside bullseye or is same dist as previous hit
-          hits.push(id);
+        if (dist < hitThreshold && hitThreshold > bullseyeDist) {
+          hits = [];
+          hitThreshold = Math.max(bullseyeDist, dist);
         }
+        hits.push(id);
       });
-      // TODO: add info on what part of a shape gets hit
+      // TODO: add info on what part of a shape gets hit?
       return {
         ids: utils$1.uniq(hits) // multipoint features can register multiple hits
       };
@@ -8272,20 +8271,25 @@
         _frame;
 
     _position.on('resize', function(e) {
-      if (_contentBounds) {
+      if (ready()) {
         onChange({resize: true});
       }
     });
 
+    function ready() { return !!_contentBounds; }
+
     this.reset = function() {
+      if (!ready()) return;
       recenter(_contentBounds.centerX(), _contentBounds.centerY(), 1, {reset: true});
     };
 
     this.home = function() {
+      if (!ready()) return;
       recenter(_contentBounds.centerX(), _contentBounds.centerY(), 1);
     };
 
     this.pan = function(xpix, ypix) {
+      if (!ready()) return;
       var t = this.getTransform();
       recenter(_cx - xpix / t.mx, _cy - ypix / t.my);
     };
@@ -8293,6 +8297,7 @@
     // Zoom to @w (width of the map viewport in coordinates)
     // @xpct, @ypct: optional focus, [0-1]...
     this.zoomToExtent = function(w, xpct, ypct) {
+      if (!ready()) return;
       if (arguments.length < 3) {
         xpct = 0.5;
         ypct = 0.5;
@@ -8312,6 +8317,7 @@
     };
 
     this.zoomByPct = function(pct, xpct, ypct) {
+      if (!ready()) return;
       this.zoomToExtent(this.getBounds().width() / pct, xpct, ypct);
     };
 
@@ -8753,7 +8759,7 @@
           bx = t.bx,
           by = t.by;
       if (size === 0) return;
-      if (size <= 4 && !styler) {
+      if (size <= 6 && !styler) {
         // optimized drawing of many small same-colored dots
         _self.drawSquareDotsFaster(shapes, color, size, t);
         return;
@@ -8810,14 +8816,12 @@
     // pixels: Uint32Array of pixel colors
     // w, h: Size of canvas
     function drawSquareFaster(x, y, rgba, size, pixels, w, h) {
-      var xmin = (x - size * 0.5) | 0;
-      var ymin = (y - size * 0.5) | 0;
-      var xmax = xmin + size - 1;
-      var ymax = ymin + size - 1;
-      var c, r;
-      for (c = xmin; c <= xmax; c++) {
-        if (c < 0 || c >= w) continue;
-        for (r = ymin; r <= ymax && r >= 0 && r < h; r++) {
+      var xmin = x < 0 ? 0 : (x - size * 0.5) | 0;
+      var ymin = y < 0 ? 0 : (y - size * 0.5) | 0;
+      var xmax = x >= w-1 ? w-1 : xmin + size - 1;
+      var ymax = y >= h-1 ? h-1 : ymin + size - 1;
+      for (var r = ymin; r <= ymax; r++) {
+        for (var c = xmin; c <= xmax; c++) {
           pixels[r * w + c] = rgba;
         }
       }
@@ -8904,24 +8908,25 @@
     return s;
   }
 
-
   function getDotScale(ext) {
     var smallSide = Math.min(ext.width(), ext.height());
+    var mapScale = ext.scale();
     // reduce size on smaller screens
     var j = smallSide < 200 && 0.5 || smallSide < 400 && 0.75 || 1;
+    // grow dots as map zooms in
     var k = 1;
-    var mapScale = ext.scale();
     if (mapScale < 0.5) {
       k = Math.pow(mapScale + 0.5, 0.35);
-    }
-    if (mapScale > 1) {
+    } else if (mapScale > 1) {
       // scale faster at first, so small dots in large datasets
       // become easily visible and clickable after zooming in a bit
       k *= Math.pow(Math.min(mapScale, 10), 0.3);
       k *= Math.pow(mapScale, 0.1);
     }
-
-    return k * j * GUI.getPixelRatio();
+    // grow pixels more slowly on retina displays (to reduce number of pixels to
+    // draw for large point datasets when slightly zoomed in)
+    var l = Math.pow(GUI.getPixelRatio(), 0.8);
+    return j * k * l;
   }
 
   function getScaledTransform(ext) {
@@ -9494,7 +9499,7 @@
 
     // Only generate low-detail arcs for larger datasets
     if (size > 5e5) {
-      if (!!unfilteredArcs.getVertexData().zz) {
+      if (unfilteredArcs.getVertexData().zz) {
         // Use precalculated simplification data for vertex filtering, if available
         filteredArcs = initFilteredArcs(unfilteredArcs);
         filteredSegLen = internal.getAvgSegment(filteredArcs);
@@ -9860,7 +9865,13 @@
       var warning;
 
       if (!dataCRS || !displayCRS || !crsIsUsable(displayCRS) || !crsIsUsable(dataCRS)) {
-        warning = 'The current layer is not compatible with the projection used by the basemaps.';
+        warning = 'This data is incompatible with the basemaps.';
+        if (!internal.layerHasGeometry(activeLyr.layer)) {
+          warning += ' Reason: layer is missing geographic data';
+        } else if (!dataCRS) {
+          warning += ' Reason: unknown projection.';
+        }
+
         basemapWarning.html(warning).show();
         basemapNote.hide();
       } else {