mapshaper 0.6.107 → 0.6.109

package/mapshaper.js

@@ -3193,7 +3193,8 @@
     var den = determinant2D(bx - ax, by - ay, dx - cx, dy - cy);
     var m = orient2D(cx, cy, dx, dy, ax, ay) / den;
     var p = [ax + m * (bx - ax), ay + m * (by - ay)];
-    if (Math.abs(den) < 1e-18) {
+    if (Math.abs(den) < 1e-25) {
+      // changed from 1e-18 to 1e-25 (see geom ex1)
       // assume that collinear and near-collinear segment intersections have been
       // accounted for already.
       // TODO: is this a valid assumption?
@@ -13545,14 +13546,8 @@
   function getBoundsPrecisionForDisplay(bbox) {
     var w = Math.abs(bbox[2] - bbox[0]),
         h = Math.abs(bbox[3] - bbox[1]),
-        // switched to max bound, based on experience with shift-drag box info
-        // range = Math.min(w, h) + 1e-8,
-        range = Math.max(w, h) + 1e-8,
-        digits = 0;
-    while (range < 2000 && digits < 1) {
-      range *= 10;
-      digits++;
-    }
+        range = (w + h) / 2 + 1e-8,
+        digits = Math.max(0, Math.round(3 - Math.log10(range)));
     return digits;
   }
 
@@ -16796,6 +16791,7 @@
     arcs.flatten();
 
     var changed = snapAndCut(dataset, snapDist);
+
     // Detect topology again if coordinates have changed
     if (changed || opts.rebuild_topology) {
       buildTopology(dataset);
@@ -16834,6 +16830,7 @@
     if (cutCount > 0 || snapCount > 0 || dupeCount > 0) {
       coordsHaveChanged = true;
     }
+
     // perform a second snap + cut pass if needed
     if (cutCount > 0) {
       cutCount = 0;
@@ -16882,17 +16879,6 @@
     }
   }
 
-  // Divides a collection of arcs at points where arc paths cross each other
-  // Returns array for remapping arc ids
-  function divideArcs(arcs, opts) {
-    var points = findClippingPoints(arcs, opts);
-    // TODO: avoid the following if no points need to be added
-    var map = insertCutPoints(points, arcs);
-    // segment-point intersections currently create duplicate points
-    // TODO: consider dedup in a later cleanup pass?
-    // arcs.dedupCoords();
-    return map;
-  }
 
   function cutPathsAtIntersections(dataset, opts) {
     var n = dataset.arcs.getPointCount();
@@ -16911,6 +16897,25 @@
     });
   }
 
+
+  // Divides a collection of arcs at points where arc paths cross each other
+  // Returns array for remapping arc ids
+  function divideArcs(arcs, opts) {
+    var points = findClippingPoints(arcs, opts);
+    // TODO: avoid the following if no points need to be added
+    var map = insertCutPoints(points, arcs);
+    // segment-point intersections currently create duplicate points
+    // TODO: consider dedup in a later cleanup pass?
+    // arcs.dedupCoords();
+    return map;
+  }
+
+  function findClippingPoints(arcs, opts) {
+    var intersections = findSegmentIntersections(arcs, opts),
+        data = arcs.getVertexData();
+    return convertIntersectionsToCutPoints(intersections, data.xx, data.yy);
+  }
+
   // Inserts array of cutting points into an ArcCollection
   // Returns array for remapping arc ids
   function insertCutPoints(unfilteredPoints, arcs) {
@@ -17043,12 +17048,6 @@
     return filtered;
   }
 
-  function findClippingPoints(arcs, opts) {
-    var intersections = findSegmentIntersections(arcs, opts),
-        data = arcs.getVertexData();
-    return convertIntersectionsToCutPoints(intersections, data.xx, data.yy);
-  }
-
   var IntersectionCuts = /*#__PURE__*/Object.freeze({
     __proto__: null,
     addIntersectionCuts: addIntersectionCuts,
@@ -25446,6 +25445,9 @@ ${svg}
       .option('calc', calcOpt)
       .option('name', nameOpt)
       .option('target', targetOpt)
+      .option('no-snap', { // undocumented, for debugging
+        type: 'flag'
+      })
       .option('no-replace', noReplaceOpt);
 
     parser.command('point-grid')
@@ -30101,8 +30103,6 @@ ${svg}
       const detright = (ax - cx) * (by - cy);
       const det = detleft - detright;
 
-      if (detleft === 0 || detright === 0 || (detleft > 0) !== (detright > 0)) return det;
-
       const detsum = Math.abs(detleft + detright);
       if (Math.abs(det) >= ccwerrboundA * detsum) return det;
 
@@ -46044,7 +46044,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.107";
+  var version = "0.6.109";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.107",
+  "version": "0.6.109",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -69,6 +69,7 @@
     "csv-spectrum": "^1.0.0",
     "eslint": "^8.16.0",
     "mocha": "^10.2.0",
+    "robust-predicates": "^3.0.2",
     "rollup": "^4.44.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
     "shell-quote": "^1.7.4",

package/www/index.html

@@ -244,7 +244,6 @@ of more acute angles are
 preferentially removed, for
 a smoother appearance.</div></div></div></div>
 
-
 		</div> <!-- option menu -->
 
 		<div>

package/www/mapshaper-gui.js

@@ -2726,11 +2726,12 @@
   // p1: [x, y] coords
   // p2: [x, y] coords offset by 1x1 pixel
   function formatCoordsForDisplay(p1, p2) {
+    var maxD = 13;
     var dx = Math.abs(p1[0] - p2[0]);
     var dy = Math.abs(p1[1] - p2[1]);
     var offs = (dx + dy) / 2;
     var decimals = 0;
-    while (offs < 1 && decimals < 6) {
+    while (offs < 1 && decimals <= maxD) {
       offs *= 10;
       decimals++;
     }
@@ -4757,6 +4758,7 @@
       if (_open) close();
       menu.empty();
 
+
       if (openMenu && openMenu != this) {
         openMenu.close();
       }
@@ -11560,6 +11562,7 @@
     // stop zooming before rounding errors become too obvious
     function maxScale() {
       var minPixelScale = 1e-16;
+      // var minPixelScale = 1e-17; // gets jumpy
       var xmax = maxAbs(_fullBounds.xmin, _fullBounds.xmax, _fullBounds.centerX());
       var ymax = maxAbs(_fullBounds.ymin, _fullBounds.ymax, _fullBounds.centerY());
       var xscale = _fullBounds.width() / _position.width() / xmax / minPixelScale;
@@ -11906,9 +11909,8 @@
       var iter = new internal.ShapeIter(arcs);
       var t = getScaledTransform(_ext);
       var bounds = _ext.getBounds();
-      var radius = (style.strokeWidth > 2 ? style.strokeWidth * 0.9 : 1.8) * GUI.getPixelRatio() * getScaledLineScale(_ext, style);
+      var radius = (style.strokeWidth > 2 ? style.strokeWidth * 1 : 2.2) * GUI.getPixelRatio() * getScaledLineScale(_ext, style);
       var color = style.strokeColor || 'black';
-
       var i, j, p;
       _ctx.beginPath();
       _ctx.fillStyle = color;
@@ -12560,7 +12562,7 @@
     var self = new EventDispatcher();
     var box = new HighlightBox(gui, {name: 'box-tool', persistent: true, handles: true, draggable: true});
     var popup = gui.container.findChild('.box-tool-options');
-    var coords = popup.findChild('.box-coords');
+    var coords = popup.findChild('.box-coords').hide();
     var _on = false;
     var instructionsShown = false;
     var alert;
@@ -12994,6 +12996,10 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       var fullBounds;
       var needReset;
 
+      if (!updated) {
+        return; // e.g. if command is run in console before data is loaded
+      }
+
       if (arcsMayHaveChanged(e.flags)) {
         // regenerate filtered arcs the next time they are needed for rendering
         // delete e.dataset.gui.displayArcs
@@ -13099,15 +13105,17 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       // add margin
       // use larger margin for small sizes
       var widthPx = _ext.width();
-      var marginPct = widthPx < 700 && 3.5 || widthPx < 800 && 3 || 2.5;
+      var marginPct = widthPx < 700 && 4.5 || widthPx < 800 && 4 || 3.5;
       if (isTableView()) {
         var n = internal.getFeatureCount(_activeLyr);
         marginPct = n < 5 && 20 || n < 100 && 10 || 4;
       }
       b.scale(1 + marginPct / 100 * 2);
 
-      // Inflate display bounding box by a tiny amount (gives extent to single-point layers and collapsed shapes)
-      b.padBounds(1e-4, 1e-4, 1e-4, 1e-4);
+      // Inflate display bounding box of single-point layers and collapsed shapes a bit
+      if (b.width() === 0 || b.height() === 0) {
+        b.padBounds(1e-4, 1e-4, 1e-4, 1e-4);
+      }
       return b;
     }
 

package/www/mapshaper.js

@@ -3193,7 +3193,8 @@
     var den = determinant2D(bx - ax, by - ay, dx - cx, dy - cy);
     var m = orient2D(cx, cy, dx, dy, ax, ay) / den;
     var p = [ax + m * (bx - ax), ay + m * (by - ay)];
-    if (Math.abs(den) < 1e-18) {
+    if (Math.abs(den) < 1e-25) {
+      // changed from 1e-18 to 1e-25 (see geom ex1)
       // assume that collinear and near-collinear segment intersections have been
       // accounted for already.
       // TODO: is this a valid assumption?
@@ -13545,14 +13546,8 @@
   function getBoundsPrecisionForDisplay(bbox) {
     var w = Math.abs(bbox[2] - bbox[0]),
         h = Math.abs(bbox[3] - bbox[1]),
-        // switched to max bound, based on experience with shift-drag box info
-        // range = Math.min(w, h) + 1e-8,
-        range = Math.max(w, h) + 1e-8,
-        digits = 0;
-    while (range < 2000 && digits < 1) {
-      range *= 10;
-      digits++;
-    }
+        range = (w + h) / 2 + 1e-8,
+        digits = Math.max(0, Math.round(3 - Math.log10(range)));
     return digits;
   }
 
@@ -16796,6 +16791,7 @@
     arcs.flatten();
 
     var changed = snapAndCut(dataset, snapDist);
+
     // Detect topology again if coordinates have changed
     if (changed || opts.rebuild_topology) {
       buildTopology(dataset);
@@ -16834,6 +16830,7 @@
     if (cutCount > 0 || snapCount > 0 || dupeCount > 0) {
       coordsHaveChanged = true;
     }
+
     // perform a second snap + cut pass if needed
     if (cutCount > 0) {
       cutCount = 0;
@@ -16882,17 +16879,6 @@
     }
   }
 
-  // Divides a collection of arcs at points where arc paths cross each other
-  // Returns array for remapping arc ids
-  function divideArcs(arcs, opts) {
-    var points = findClippingPoints(arcs, opts);
-    // TODO: avoid the following if no points need to be added
-    var map = insertCutPoints(points, arcs);
-    // segment-point intersections currently create duplicate points
-    // TODO: consider dedup in a later cleanup pass?
-    // arcs.dedupCoords();
-    return map;
-  }
 
   function cutPathsAtIntersections(dataset, opts) {
     var n = dataset.arcs.getPointCount();
@@ -16911,6 +16897,25 @@
     });
   }
 
+
+  // Divides a collection of arcs at points where arc paths cross each other
+  // Returns array for remapping arc ids
+  function divideArcs(arcs, opts) {
+    var points = findClippingPoints(arcs, opts);
+    // TODO: avoid the following if no points need to be added
+    var map = insertCutPoints(points, arcs);
+    // segment-point intersections currently create duplicate points
+    // TODO: consider dedup in a later cleanup pass?
+    // arcs.dedupCoords();
+    return map;
+  }
+
+  function findClippingPoints(arcs, opts) {
+    var intersections = findSegmentIntersections(arcs, opts),
+        data = arcs.getVertexData();
+    return convertIntersectionsToCutPoints(intersections, data.xx, data.yy);
+  }
+
   // Inserts array of cutting points into an ArcCollection
   // Returns array for remapping arc ids
   function insertCutPoints(unfilteredPoints, arcs) {
@@ -17043,12 +17048,6 @@
     return filtered;
   }
 
-  function findClippingPoints(arcs, opts) {
-    var intersections = findSegmentIntersections(arcs, opts),
-        data = arcs.getVertexData();
-    return convertIntersectionsToCutPoints(intersections, data.xx, data.yy);
-  }
-
   var IntersectionCuts = /*#__PURE__*/Object.freeze({
     __proto__: null,
     addIntersectionCuts: addIntersectionCuts,
@@ -25446,6 +25445,9 @@ ${svg}
       .option('calc', calcOpt)
       .option('name', nameOpt)
       .option('target', targetOpt)
+      .option('no-snap', { // undocumented, for debugging
+        type: 'flag'
+      })
       .option('no-replace', noReplaceOpt);
 
     parser.command('point-grid')
@@ -30101,8 +30103,6 @@ ${svg}
       const detright = (ax - cx) * (by - cy);
       const det = detleft - detright;
 
-      if (detleft === 0 || detright === 0 || (detleft > 0) !== (detright > 0)) return det;
-
       const detsum = Math.abs(detleft + detright);
       if (Math.abs(det) >= ccwerrboundA * detsum) return det;
 
@@ -46044,7 +46044,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.107";
+  var version = "0.6.109";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.