mapshaper 0.5.117 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.117",
+	"version": "0.6.2",
 	"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",
@@ -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/elements.css

@@ -67,10 +67,10 @@ div.tip {
 	z-index: 500;
 	cursor: pointer;
 	text-align: center;
-	font-size: 13px;
+	font-size: 14px;
 	line-height: 1;
 	font-weight: normal;
-	color: #799FCB;
+	color: #1385B7;
 }
 
 .tip-button .tip-anchor {

package/www/index.html

@@ -130,7 +130,8 @@
 
 <div class="export-options main-area popup-dialog">
 	<div class="info-box">
-		<h3>Export menu</h3>
+		<div class="close2-btn"></div>
+		<h3>Export options</h3>
 		<div style="height:3px"></div>
 		<div class=export-layers>
 			<h4 class="menu-title">Layers</h4>
@@ -140,22 +141,23 @@
 		<div class="export-formats option-menu">
 		</div>
 
-		<div class="option-menu"><input type="text" class="advanced-options" placeholder="export options" /><div class="tip-button">?<div class="tip-anchor">
+		<div class="option-menu"><input type="text" class="advanced-options" placeholder="command line options" /><div class="tip-button">?<div class="tip-anchor">
 		<div class="tip">Enter options from the command line interface for the -o command. Examples: "bbox" "no-quantization"
 "precision=0.001"</div></div></div></div>
-		<div class="cancel-btn btn dialog-btn">Cancel</div>
+		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
 		<div class="save-btn btn dialog-btn">Export</div>
 	</div>
 </div>
 
 <div class="basemap-options main-area popup-dialog">
 	<div class="info-box">
+		<div class="close2-btn"></div>
 		<h3>Basemap options</h3>
 		<p class="basemap-note">Your data will be displayed using the Mercator projection.</p>
 		<p class="basemap-warning"></p>
 		<div class="basemap-styles"></div>
 		<div>
-			<div class="close-btn btn dialog-btn">Close</div>
+			<!-- <div class="close-btn btn dialog-btn">Close</div> -->
 			<div class="clear-btn btn dialog-btn disabled">Clear</div>
 			<div class="fade-btn btn dialog-btn disabled">Fade</div>
 			<!-- <div class="hide-btn btn dialog-btn disabled">Hide</div> -->
@@ -165,7 +167,8 @@
 
 <div class="simplify-options main-area popup-dialog">
 	<div class="info-box">
-		<h3>Simplification menu</h3>
+		<div class="close2-btn"></div>
+		<h3>Simplification</h3>
 		<div class="option-menu">
 			<div><label for="import-retain-opt"><input type="checkbox" class="checkbox import-retain-opt"/>prevent shape removal</label>
 							<div class="tip-button">?<div class="tip-anchor">
@@ -208,7 +211,7 @@ a smoother appearance.</div></div></div></div>
 		</div> <!-- option menu -->
 
 		<div>
-			<div class="cancel-btn btn dialog-btn">Cancel</div>
+<!-- 			<div class="cancel-btn btn dialog-btn">Cancel</div> -->
 			<div class="submit-btn btn dialog-btn">Apply</div>
 		</div>
 	</div> <!-- .info-box -->

package/www/mapshaper-gui.js

@@ -310,7 +310,6 @@
 
   // tests if filename is a type that can be used
   GUI.isReadableFileType = function(filename) {
-    var ext = internal.getFileExtension(filename).toLowerCase();
     return !!internal.guessInputFileType(filename) || internal.couldBeDsvFile(filename) ||
       internal.isZipFile(filename);
   };
@@ -1354,7 +1353,6 @@
         }
       }
       model.updated({select: true});
-
     }
 
     function clearQueuedFiles() {
@@ -1451,9 +1449,8 @@
     }
 
 
-    // TODO: support .cpg
     function isShapefilePart(name) {
-      return /\.(shp|shx|dbf|prj)$/i.test(name);
+      return /\.(shp|shx|dbf|prj|cpg)$/i.test(name);
     }
 
     function readImportOpts() {
@@ -1685,7 +1682,6 @@
   }
 
   function Slider(ref, opts) {
-    var _el = El(ref);
     var _self = this;
     var defaults = {
       space: 7
@@ -1716,7 +1712,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();
@@ -1742,7 +1738,7 @@
       return _pct;
     };
 
-    function setHandlePos(x, fire) {
+    function setHandlePos(x) {
       x = utils$1.clamp(x, 0, size());
       var pct = x / size();
       if (pct != _pct) {
@@ -2131,7 +2127,7 @@
 
     // init settings menu
     new SimpleButton(menu.findChild('.submit-btn').addClass('default-btn')).on('click', onSubmit);
-    new SimpleButton(menu.findChild('.cancel-btn')).on('click', function() {
+    new SimpleButton(menu.findChild('.close2-btn')).on('click', function() {
       if (el.visible()) {
         // cancel just hides menu if slider is visible
         menu.hide();
@@ -2264,7 +2260,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({
@@ -3125,7 +3121,7 @@
 
   function cleanLayerName(raw) {
     return raw.replace(/[\n\t/\\]/g, '')
-      .replace(/^[\.\s]+/, '').replace(/[\.\s]+$/, '');
+      .replace(/^[.\s]+/, '').replace(/[.\s]+$/, '');
   }
 
   function updateLayerStackOrder(layers) {
@@ -3159,7 +3155,7 @@
     var layersArr = [];
     var toggleBtn = null; // checkbox <input> for toggling layer selection
     var exportBtn = gui.container.findChild('.export-btn');
-    new SimpleButton(menu.findChild('.cancel-btn')).on('click', gui.clearMode);
+    new SimpleButton(menu.findChild('.close2-btn')).on('click', gui.clearMode);
 
     if (!GUI.exportIsSupported()) {
       exportBtn.on('click', function() {
@@ -3859,8 +3855,6 @@
     }
   }
 
-  var snapVerticesToPoint = internal.snapVerticesToPoint;
-  var cloneShape = internal.cloneShape;
   var copyRecord = internal.copyRecord;
 
   function Undo(gui) {
@@ -4415,7 +4409,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.
@@ -4743,7 +4738,7 @@
     '/': '&#x2F;'
   };
   function htmlEscape(s) {
-    return String(s).replace(/[&<>"'\/]/g, function(s) {
+    return String(s).replace(/[&<>"'/]/g, function(s) {
       return entityMap[s];
     });
   }
@@ -5386,8 +5381,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 = "",
@@ -5446,7 +5441,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,
@@ -5490,10 +5485,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);
     }
   }
 
@@ -5846,27 +5841,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
       };
@@ -8756,7 +8745,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;
@@ -8813,14 +8802,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;
         }
       }
@@ -8907,24 +8894,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) {
@@ -9497,7 +9485,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);
@@ -9764,7 +9752,7 @@
     var menu = gui.container.findChild('.basemap-options');
     // var hideBtn = new SimpleButton(menu.findChild('.hide-btn'));
     var fadeBtn = new SimpleButton(menu.findChild('.fade-btn'));
-    var closeBtn = new SimpleButton(menu.findChild('.close-btn'));
+    var closeBtn = new SimpleButton(menu.findChild('.close2-btn'));
     var clearBtn = new SimpleButton(menu.findChild('.clear-btn'));
     var list = menu.findChild('.basemap-styles');
     var container = gui.container.findChild('.basemap-container');
@@ -9863,7 +9851,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 {