mapshaper 0.5.102 → 0.5.103

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+v0.5.103
+* Bug fixes
+
 v0.5.102
 * Fix for bug in -v/--version command.
 

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.102";
+  var VERSION = "0.5.103";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -33173,7 +33173,6 @@ ${svg}
     return coords;
   }
 
-
   function appendArr(dest, src) {
     for (var i=0; i<src.length; i++) dest.push(src[i]);
   }
@@ -33213,20 +33212,46 @@ ${svg}
     }
   }
 
-  function getDefaultDensifyInterval(arcs, proj) {
-    var xy = getAvgSegment2(arcs),
-        bb = arcs.getBounds(),
-        a = proj(bb.centerX(), bb.centerY()),
-        b = proj(bb.centerX() + xy[0], bb.centerY() + xy[1]),
+  // Use the median of intervals computed by projecting segments.
+  // We're probing a number of points, because @proj might only be valid in
+  // a sub-region of the dataset bbox (e.g. +proj=tpers)
+  function findDensifyInterval(bounds, xy, proj) {
+    var steps = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9];
+    var points = [];
+    for (var i=0; i<steps.length; i++) {
+      for (var j=0; j<steps.length; j++) {
+        points.push([steps[i], steps[j]]);
+      }
+    }
+    var intervals = points.map(function(pos) {
+      var x = bounds.xmin + bounds.width() * pos[0];
+      var y = bounds.ymin + bounds.height() * pos[1];
+      var a = proj(x, y);
+      var b = proj(x + xy[0], y + xy[1]);
+      return a && b ? geom.distance2D(a[0], a[1], b[0], b[1]) : Infinity;
+    }).filter(function(int) {return int < Infinity;});
+    return intervals.length > 0 ? utils.findMedian(intervals) : Infinity;
+  }
+
+  // Kludgy way to get a useful interval for densifying a bounding box.
+  // Uses a fraction of average bbox side length)
+  // TODO: improve
+  function findDensifyInterval2(bb, proj) {
+    var a = proj(bb.centerX(), bb.centerY()),
         c = proj(bb.centerX(), bb.ymin), // right center
         d = proj(bb.xmax, bb.centerY()); // bottom center
-    // interval A: based on average segment length
-    var intervalA = a && b ? geom.distance2D(a[0], a[1], b[0], b[1]) : Infinity;
-    // interval B: a fraction of avg bbox side length
-    // (added this for bbox densification)
-    var intervalB = c && d ? (geom.distance2D(a[0], a[1], c[0], c[1]) +
+    var interval = a && c && d ? (geom.distance2D(a[0], a[1], c[0], c[1]) +
           geom.distance2D(a[0], a[1], d[0], d[1])) / 5000 : Infinity;
-    var interval = Math.min(intervalA, intervalB);
+    return interval;
+  }
+
+  // Returns an interval in projected units
+  function getDefaultDensifyInterval(arcs, proj) {
+    var xy = getAvgSegment2(arcs),
+        bb = arcs.getBounds(),
+        intervalA = findDensifyInterval(bb, xy, proj),
+        intervalB = findDensifyInterval2(bb, proj),
+        interval = Math.min(intervalA, intervalB);
     if (interval == Infinity) {
       error('Densification error');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.102",
+	"version": "0.5.103",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",

package/www/mapshaper-gui.js

@@ -4053,8 +4053,6 @@
     }
   }
 
-  // import { cloneShape } from '../paths/mapshaper-shape-utils';
-  // import { copyRecord } from '../datatable/mapshaper-data-utils';
   var snapVerticesToPoint = internal.snapVerticesToPoint;
   var cloneShape = internal.cloneShape;
   var copyRecord = internal.copyRecord;
@@ -8133,12 +8131,12 @@
   var darkStroke = "#334",
       lightStroke = "#b7d9ea",
       violet = "#cc6acc",
-      violetFill = "rgba(249, 170, 249, 0.32)",
+      violetFill = "rgba(249, 120, 249, 0.20)",
       gold = "#efc100",
       black = "black",
       grey = "#888",
       selectionFill = "rgba(237, 214, 0, 0.12)",
-      hoverFill = "rgba(255, 180, 255, 0.2)",
+      hoverFill = "rgba(255, 120, 255, 0.12)",
       activeStyle = { // outline style for the active layer
         type: 'outline',
         strokeColors: [lightStroke, darkStroke],
@@ -10238,11 +10236,16 @@
       });
     }
 
+    function drawLayers(action) {
+      // This seems to smooth out navigation and keep overlay and basemap in sync.
+      requestAnimationFrame(function() {drawLayers2(action);});
+    }
+
     // action:
     //   'nav'      map was panned/zoomed -- only map extent has changed
     //   'hover'    highlight has changed -- only draw overlay
     //   (default)  anything could have changed
-    function drawLayers(action) {
+    function drawLayers2(action) {
       var layersMayHaveChanged = !action;
       var contentLayers = getDrawableContentLayers();
       var furnitureLayers = getDrawableFurnitureLayers();

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.102";
+  var VERSION = "0.5.103";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -33173,7 +33173,6 @@ ${svg}
     return coords;
   }
 
-
   function appendArr(dest, src) {
     for (var i=0; i<src.length; i++) dest.push(src[i]);
   }
@@ -33213,20 +33212,46 @@ ${svg}
     }
   }
 
-  function getDefaultDensifyInterval(arcs, proj) {
-    var xy = getAvgSegment2(arcs),
-        bb = arcs.getBounds(),
-        a = proj(bb.centerX(), bb.centerY()),
-        b = proj(bb.centerX() + xy[0], bb.centerY() + xy[1]),
+  // Use the median of intervals computed by projecting segments.
+  // We're probing a number of points, because @proj might only be valid in
+  // a sub-region of the dataset bbox (e.g. +proj=tpers)
+  function findDensifyInterval(bounds, xy, proj) {
+    var steps = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9];
+    var points = [];
+    for (var i=0; i<steps.length; i++) {
+      for (var j=0; j<steps.length; j++) {
+        points.push([steps[i], steps[j]]);
+      }
+    }
+    var intervals = points.map(function(pos) {
+      var x = bounds.xmin + bounds.width() * pos[0];
+      var y = bounds.ymin + bounds.height() * pos[1];
+      var a = proj(x, y);
+      var b = proj(x + xy[0], y + xy[1]);
+      return a && b ? geom.distance2D(a[0], a[1], b[0], b[1]) : Infinity;
+    }).filter(function(int) {return int < Infinity;});
+    return intervals.length > 0 ? utils.findMedian(intervals) : Infinity;
+  }
+
+  // Kludgy way to get a useful interval for densifying a bounding box.
+  // Uses a fraction of average bbox side length)
+  // TODO: improve
+  function findDensifyInterval2(bb, proj) {
+    var a = proj(bb.centerX(), bb.centerY()),
         c = proj(bb.centerX(), bb.ymin), // right center
         d = proj(bb.xmax, bb.centerY()); // bottom center
-    // interval A: based on average segment length
-    var intervalA = a && b ? geom.distance2D(a[0], a[1], b[0], b[1]) : Infinity;
-    // interval B: a fraction of avg bbox side length
-    // (added this for bbox densification)
-    var intervalB = c && d ? (geom.distance2D(a[0], a[1], c[0], c[1]) +
+    var interval = a && c && d ? (geom.distance2D(a[0], a[1], c[0], c[1]) +
           geom.distance2D(a[0], a[1], d[0], d[1])) / 5000 : Infinity;
-    var interval = Math.min(intervalA, intervalB);
+    return interval;
+  }
+
+  // Returns an interval in projected units
+  function getDefaultDensifyInterval(arcs, proj) {
+    var xy = getAvgSegment2(arcs),
+        bb = arcs.getBounds(),
+        intervalA = findDensifyInterval(bb, xy, proj),
+        intervalB = findDensifyInterval2(bb, proj),
+        interval = Math.min(intervalA, intervalB);
     if (interval == Infinity) {
       error('Densification error');
     }