mapshaper 0.5.102 → 0.5.105

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+v0.5.105
+* More basemap improvements.
+
+v0.5.104
+* Improvements to the basemap feature.
+
+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.105";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1191,24 +1191,37 @@
 
   var LOGGING = false;
   var STDOUT = false; // use stdout for status messages
-
-  // These three functions can be reset by GUI using setLoggingFunctions();
-  var _error = function() {
-    var msg = utils.toArray(arguments).join(' ');
-    throw new Error(msg);
-  };
-
-  var _stop = function() {
-    throw new UserError(formatLogArgs(arguments));
-  };
+  var _error, _stop, _message;
 
   var _interrupt = function() {
     throw new NonFatalError(formatLogArgs(arguments));
   };
 
-  var _message = function() {
-    logArgs(arguments);
-  };
+  setLoggingForCLI();
+
+  function getLoggingSetter() {
+    var e = _error, s = _stop, m = _message;
+    return function() {
+      setLoggingFunctions(m, e, s);
+    };
+  }
+
+  function setLoggingForCLI() {
+    function stop() {
+      throw new UserError(formatLogArgs(arguments));
+    }
+
+    function error() {
+      var msg = utils.toArray(arguments).join(' ');
+      throw new Error(msg);
+    }
+
+    function message() {
+      logArgs(arguments);
+    }
+
+    setLoggingFunctions(message, error, stop);
+  }
 
   function enableLogging() {
     LOGGING = true;
@@ -1357,6 +1370,8 @@
 
   var Logging = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    getLoggingSetter: getLoggingSetter,
+    setLoggingForCLI: setLoggingForCLI,
     enableLogging: enableLogging,
     loggingEnabled: loggingEnabled,
     error: error,
@@ -4782,7 +4797,7 @@
     var info = dataset.info || {},
         P = info.crs;
     if (!P && info.prj) {
-      P = parsePrj(info.prj);
+      P = getCRS(translatePrj(info.prj));
     }
     if (!P && probablyDecimalDegreeBounds(getDatasetBounds(dataset))) {
       // use wgs84 for probable latlong datasets with unknown datums
@@ -33173,7 +33188,6 @@ ${svg}
     return coords;
   }
 
-
   function appendArr(dest, src) {
     for (var i=0; i<src.length; i++) dest.push(src[i]);
   }
@@ -33213,20 +33227,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');
     }
@@ -34857,8 +34897,6 @@ ${svg}
     return table + sepLine;
   }
 
-
-
   function maxChars(arr) {
     return arr.reduce(function(memo, str) {
       var w = stringDisplayWidth(str);
@@ -34899,6 +34937,12 @@ ${svg}
     } else {
       str = String(val);
     }
+
+    if (typeof str != 'string') {
+      // e.g. JSON.stringify converts functions to undefined
+      str = '[' + (typeof val) + ']';
+    }
+
     return str;
   }
 

package/package.json

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