mapshaper 0.5.104 → 0.5.107

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+v0.5.107
+* Bug fixes
+* Added file_exists() to -if/-elif expressions
+
+v0.5.106
+* More basemap fixes.
+
+v0.5.105
+* More basemap improvements.
+
 v0.5.104
 * Improvements to the basemap feature.
 

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.104";
+  var VERSION = "0.5.103";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1737,6 +1737,16 @@
 
   // Iterate over each [x,y] point in a layer
   // shapes: one layer's "shapes" array
+  function forEachPoint_(shapes, cb) {
+    var i, n, j, m, shp;
+    for (i=0, n=shapes.length; i<n; i++) {
+      shp = shapes[i];
+      for (j=0, m=shp ? shp.length : 0; j<m; j++) {
+        cb(shp[j], i);
+      }
+    }
+  }
+
   function forEachPoint(shapes, cb) {
     var i, n, j, m, shp;
     for (i=0, n=shapes.length; i<n; i++) {
@@ -1753,6 +1763,7 @@
     getPointBounds: getPointBounds$1,
     getPointFeatureBounds: getPointFeatureBounds,
     getPointsInLayer: getPointsInLayer,
+    forEachPoint_: forEachPoint_,
     forEachPoint: forEachPoint
   });
 
@@ -7813,10 +7824,24 @@
   // a, b: two ring data objects (from getPathMetadata);
   function testRingInRing(a, b, arcs) {
     if (b.bounds.contains(a.bounds) === false) return false;
-    var p = arcs.getVertex(a.ids[0], 0); // test with first point in the ring
+    // Don't test with first point -- this may return false if a hole intersects
+    // the containing ring at the first vertex.
+    // Instead, use the midpoint of the first segment
+    var p = getFirstMidpoint(a.ids[0], arcs);
+    //// test with first point in the ring
+    // var p = arcs.getVertex(a.ids[0], 0);
     return geom.testPointInRing(p.x, p.y, b.ids, arcs) == 1;
   }
 
+  function getFirstMidpoint(arcId, arcs) {
+    var p1 = arcs.getVertex(arcId, 0);
+    var p2 = arcs.getVertex(arcId, 1);
+    return {
+      x: (p1.x + p2.x) / 2,
+      y: (p1.y + p2.y) / 2
+    };
+  }
+
   // Bundle holes with their containing rings for Topo/GeoJSON polygon export.
   // Assumes outer rings are CW and inner (hole) rings are CCW, unless
   //   the reverseWinding flag is set.
@@ -9525,9 +9550,6 @@
         return rec && (rec[name] === val);
       });
     };
-    obj.file_exists = function(name) {
-      return cli.isFile(name);
-    };
     return obj;
   }
 
@@ -9935,6 +9957,11 @@
       ctx.$ = i >= 0 ? getFeatureById(i) : layerOnlyProxy;
       ctx._ = ctx; // provide access to functions when masked by variable names
       ctx.d = rec || null; // expose data properties a la d3 (also exposed as this.properties)
+      if (opts.record_alias) {
+        // this is used to expose source table record as "source" in -join calc=
+        // expresions.
+        ctx[opts.record_alias] = ctx.d;
+      }
       try {
         val = func.call(ctx.$, rec, ctx);
       } catch(e) {
@@ -18954,6 +18981,10 @@ ${svg}
       .option('json-path', {
         old_alias: 'json-subtree',
         describe: '[JSON] path to JSON input data; separator is /'
+      })
+      .option('single-part', {
+        type: 'flag',
+        // describe: '[GeoJSON] split multi-part features into single-part features'
       });
 
     parser.command('o')
@@ -22119,6 +22150,8 @@ ${svg}
       // TODO: improve so geometry_type option skips features instead of creating null geometries
       if (geom && geom.type == 'GeometryCollection') {
         GeoJSON.importComplexFeature(importer, geom, rec, opts);
+      } else if (opts.single_part && isMultiPartGeometry(geom)) {
+        GeoJSON.importMultiAsSingles(importer, geom, rec, opts);
       } else {
         GeoJSON.importSimpleFeature(importer, geom, rec, opts);
       }
@@ -22160,11 +22193,27 @@ ${svg}
     return Object.values(index);
   }
 
+  function isMultiPartGeometry(geom) {
+    return geom && geom.type && geom.type.indexOf('Multi') === 0;
+  }
+
   GeoJSON.importSimpleFeature = function(importer, geom, rec, opts) {
     importer.startShape(rec);
     GeoJSON.importSimpleGeometry(importer, geom, opts);
   };
 
+  // Split a multi-part feature into several single features
+  GeoJSON.importMultiAsSingles = function(importer, geom, rec, opts) {
+    geom.coordinates.forEach(function(coords, i) {
+      var geom2 = {
+        type: geom.type.substr(5),
+        coordinates: coords
+      };
+      var rec2 = i === 0 ? rec : copyRecord(rec);
+      GeoJSON.importSimpleFeature(importer, geom2, rec2, opts);
+    });
+  };
+
   GeoJSON.importSimpleGeometry = function(importer, geom, opts) {
     var type = geom ? geom.type : null;
     if (type === null) {
@@ -34614,19 +34663,33 @@ ${svg}
     return o;
   }
 
-  function compileLayerExpression(expr, lyr, dataset, opts) {
-    var proxy = getLayerProxy(lyr, dataset.arcs, opts);
+  function compileIfCommandExpression(expr, catalog, target, opts) {
+    var ctx = {};
+
+    if (target && target.layer) {
+      ctx = getLayerProxy(target.layer, target.dataset.arcs, opts);
+    }
+
+    ctx.file_exists = function(name) {
+      return cli.isFile(name);
+    };
+
+    ctx.layer_exists = function(name) {
+      var lyr = catalog.findSingleLayer(name);
+      return !!lyr;
+    };
+
     var exprOpts = Object.assign({returns: true}, opts);
     var func = compileExpressionToFunction(expr, exprOpts);
-    var ctx = proxy;
     return function() {
       try {
-        return func.call(proxy, {}, ctx);
+        return func.call(ctx, {}, ctx);
       } catch(e) {
         // if (opts.quiet) throw e;
         stop(e.name, "in expression [" + expr + "]:", e.message);
       }
     };
+
   }
 
   function skipCommand(cmdName) {
@@ -34674,7 +34737,7 @@ ${svg}
   function testLayer(catalog, opts) {
     var targ = getTargetLayer(catalog, opts);
     if (opts.expression) {
-      return compileLayerExpression(opts.expression, targ.layer, targ.dataset, opts)();
+      return compileIfCommandExpression(opts.expression, catalog, targ, opts)();
     }
     if (opts.empty) {
       return layerIsEmpty(targ.layer);

package/package.json

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

package/www/mapshaper-gui.js

@@ -6442,10 +6442,13 @@
 
   function CoordinatesDisplay(gui, ext, mouse) {
     var readout = gui.container.findChild('.coordinate-info').hide();
-    var enabled = false;
 
-    gui.model.on('select', function(e) {
-      enabled = !!e.layer.geometry_type; // no display on tabular layers
+    function enabled() {
+      var lyr = gui.map.getActiveLayer();
+      return !!(lyr && lyr.layer.geometry_type);
+    }
+
+    gui.model.on('update', function(e) {
       readout.hide();
     });
 
@@ -6466,7 +6469,7 @@
     mouse.on('leave', clearCoords);
 
     mouse.on('click', function(e) {
-      if (!enabled) return;
+      if (!enabled()) return;
       GUI.selectElement(readout.node());
     });
 
@@ -6474,7 +6477,7 @@
     mouse.on('drag', onMouseChange, null, 10); // high priority so editor doesn't block propagation
 
     function onMouseChange(e) {
-      if (!enabled) return;
+      if (!enabled()) return;
       if (isOverMap(e)) {
         displayCoords(gui.map.translatePixelCoords(e.x, e.y));
       } else {
@@ -6998,6 +7001,15 @@
       ext.zoomByPct(delta, e.x / ext.width(), e.y / ext.height());
     });
 
+    function fixBounds(bbox) {
+      if (bbox[0] > bbox[2]) {
+        swapElements(bbox, 0, 2);
+      }
+      if (bbox[1] > bbox[3]) {
+        swapElements(bbox, 1, 3);
+      }
+    }
+
     function swapElements(arr, i, j) {
       var tmp = arr[i];
       arr[i] = arr[j];
@@ -7007,21 +7019,28 @@
     function getBoxData(e) {
       var pageBox = [e.pageX, e.pageY, dragStartEvt.pageX, dragStartEvt.pageY];
       var mapBox = [e.x, e.y, dragStartEvt.x, dragStartEvt.y];
-      var tmp;
-      if (pageBox[0] > pageBox[2]) {
-        swapElements(pageBox, 0, 2);
-        swapElements(mapBox, 0, 2);
-      }
-      if (pageBox[1] > pageBox[3]) {
-        swapElements(pageBox, 1, 3);
-        swapElements(mapBox, 1, 3);
-      }
+      var displayBox = pixToCoords(mapBox);
+      var dataBox = getBBoxCoords(gui.map.getActiveLayer(), displayBox);
+      fixBounds(pageBox);
+      fixBounds(mapBox);
+      fixBounds(displayBox);
+      fixBounds(dataBox);
       return {
         map_bbox: mapBox,
-        page_bbox: pageBox
+        page_bbox: pageBox,
+        // round coords, for nicer 'info' display
+        // (rounded precision should be sub-pixel)
+        map_display_bbox: internal.getRoundedCoords(displayBox, internal.getBoundsPrecisionForDisplay(displayBox)),
+        map_data_bbox: internal.getRoundedCoords(dataBox, internal.getBoundsPrecisionForDisplay(dataBox))
       };
     }
 
+    function pixToCoords(bbox) {
+      var a = ext.translatePixelCoords(bbox[0], bbox[1]);
+      var b = ext.translatePixelCoords(bbox[2], bbox[3]);
+      return [a[0], b[1], b[0], a[1]];
+    }
+
     function disabled() {
       return !!gui.options.disableNavigation;
     }
@@ -7104,17 +7123,16 @@
       if (!_on) return;
       var b = e.page_bbox;
       box.show(b[0], b[1], b[2], b[3]);
-      updateSelection(e.map_bbox, true);
+      updateSelection(e.map_data_bbox, true);
     });
 
     gui.on('box_drag_end', function(e) {
       if (!_on) return;
       box.hide();
-      updateSelection(e.map_bbox);
+      updateSelection(e.map_data_bbox);
     });
 
-    function updateSelection(bboxPixels, transient) {
-      var bbox = bboxToCoords(bboxPixels);
+    function updateSelection(bbox, transient) {
       var active = gui.model.getActiveLayer();
       var ids = internal.findShapesIntersectingBBox(bbox, active.layer, active.dataset.arcs);
       if (transient) {
@@ -7128,12 +7146,6 @@
       _on = true;
     }
 
-    function bboxToCoords(bbox) {
-      var a = ext.translatePixelCoords(bbox[0], bbox[1]);
-      var b = ext.translatePixelCoords(bbox[2], bbox[3]);
-      return [a[0], b[1], b[0], a[1]];
-    }
-
     function turnOff() {
       reset();
       _on = false;
@@ -8386,24 +8398,32 @@
     function recenter(cx, cy, scale, data) {
       scale = scale ? limitScale(scale) : _scale;
       if (cx == _cx && cy == _cy && scale == _scale) return;
+      navigate(cx, cy, scale);
+      onChange(data);
+    }
+
+    function navigate(cx, cy, scale) {
       if (_strictBounds) {
-        scale = Math.max(1, scale);
+        var full = fillOut(_contentBounds);
+        var minScale = full.height() / _strictBounds.height();
+        if (scale < minScale) {
+          var dx = cx - _cx;
+          cx = _cx + dx * (minScale - _scale) / (scale - _scale);
+          scale = minScale;
+        }
+        var dist = full.height() / 2 / scale;
+        var ymax = _strictBounds.ymax - dist;
+        var ymin = _strictBounds.ymin + dist;
+        if (cy > ymax ) {
+          cy = ymax;
+        }
+        if (cy < ymin) {
+          cy = ymin;
+        }
       }
       _cx = cx;
       _cy = cy;
       _scale = scale;
-      limitExtent();
-      onChange(data);
-    }
-
-    function limitExtent() {
-      if (!_strictBounds) return;
-      if (_scale < 1) _scale = 1;
-      var dist = _strictBounds.height() / 2 / _scale;
-      var ymax = _strictBounds.ymax - dist;
-      var ymin = _strictBounds.ymin + dist;
-      if (_cy > ymax) _cy = ymax;
-      if (_cy < ymin) _cy = ymin;
     }
 
     function onChange(data) {
@@ -8473,7 +8493,6 @@
     function fitIn(b, b2) {
       // only fitting vertical extent
       // (currently only used in basemap view to enforce Mapbox's vertical limits)
-
       if (b.height() > b2.height()) {
         b.scale(b2.height() / b.height());
       }
@@ -9330,7 +9349,7 @@
     var popup = gui.container.findChild('.box-tool-options');
     var coords = popup.findChild('.box-coords');
     var _on = false;
-    var bboxDisplayCoords, bboxPixels, bboxDataCoords;
+    var bboxData;
 
     var infoBtn = new SimpleButton(popup.findChild('.info-btn')).on('click', function() {
       if (coords.visible()) hideCoords(); else showCoords();
@@ -9357,11 +9376,11 @@
       gui.enterMode('selection_tool');
       gui.interaction.setMode('selection');
       // kludge to pass bbox to the selection tool
-      gui.dispatchEvent('box_drag_end', {map_bbox: bboxPixels});
+      gui.dispatchEvent('box_drag_end', bboxData);
     });
 
     new SimpleButton(popup.findChild('.clip-btn')).on('click', function() {
-      runCommand('-clip bbox2=' + bboxDataCoords.join(','));
+      runCommand('-clip bbox=' + bboxData.map_data_bbox.join(','));
     });
 
     gui.addMode('box_tool', turnOn, turnOff);
@@ -9377,8 +9396,8 @@
     // Update the visible rectangle when the map view changes
     // (e.g. during zooming or panning)
     ext.on('change', function() {
-      if (!_on || !box.visible() || !bboxDisplayCoords) return;
-      var b = coordsToPix(bboxDisplayCoords);
+      if (!_on || !box.visible() || !bboxData) return;
+      var b = coordsToPix(bboxData.map_display_bbox);
       var pos = ext.position();
       var dx = pos.pageX,
           dy = pos.pageY;
@@ -9392,20 +9411,17 @@
 
     gui.on('box_drag', function(e) {
       var b = e.page_bbox;
-      bboxPixels = e.map_bbox;
-      bboxDisplayCoords = pixToCoords(bboxPixels);
+      bboxData = e.data;
       if (_on || inZoomMode()) {
         box.show(b[0], b[1], b[2], b[3]);
       }
     });
 
     gui.on('box_drag_end', function(e) {
-      bboxPixels = e.map_bbox;
-      bboxDisplayCoords = pixToCoords(bboxPixels);
-      bboxDataCoords = getBBoxCoords(gui.map.getActiveLayer(), bboxDisplayCoords);
+      bboxData = e.data;
       if (inZoomMode()) {
         box.hide();
-        nav.zoomToBbox(bboxPixels);
+        nav.zoomToBbox(e.map_bbox);
       } else if (_on) {
         popup.show();
       }
@@ -9426,7 +9442,7 @@
 
     function showCoords() {
       El(infoBtn.node()).addClass('selected-btn');
-      coords.text(bboxDataCoords.join(','));
+      coords.text(bboxData.map_data_bbox.join(','));
       coords.show();
       GUI.selectElement(coords.node());
     }
@@ -9455,15 +9471,6 @@
       hideCoords();
     }
 
-    function pixToCoords(bbox) {
-      var a = ext.translatePixelCoords(bbox[0], bbox[1]);
-      var b = ext.translatePixelCoords(bbox[2], bbox[3]);
-      var bbox2 = [a[0], b[1], b[0], a[1]];
-      // round coords, for nicer 'info' display
-      // (rounded precision should be sub-pixel)
-      return internal.getRoundedCoords(bbox2, internal.getBoundsPrecisionForDisplay(bbox2));
-    }
-
     function coordsToPix(bbox) {
       var a = ext.translateCoords(bbox[0], bbox[1]);
       var b = ext.translateCoords(bbox[2], bbox[3]);

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.104";
+  var VERSION = "0.5.103";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1737,6 +1737,16 @@
 
   // Iterate over each [x,y] point in a layer
   // shapes: one layer's "shapes" array
+  function forEachPoint_(shapes, cb) {
+    var i, n, j, m, shp;
+    for (i=0, n=shapes.length; i<n; i++) {
+      shp = shapes[i];
+      for (j=0, m=shp ? shp.length : 0; j<m; j++) {
+        cb(shp[j], i);
+      }
+    }
+  }
+
   function forEachPoint(shapes, cb) {
     var i, n, j, m, shp;
     for (i=0, n=shapes.length; i<n; i++) {
@@ -1753,6 +1763,7 @@
     getPointBounds: getPointBounds$1,
     getPointFeatureBounds: getPointFeatureBounds,
     getPointsInLayer: getPointsInLayer,
+    forEachPoint_: forEachPoint_,
     forEachPoint: forEachPoint
   });
 
@@ -7813,10 +7824,24 @@
   // a, b: two ring data objects (from getPathMetadata);
   function testRingInRing(a, b, arcs) {
     if (b.bounds.contains(a.bounds) === false) return false;
-    var p = arcs.getVertex(a.ids[0], 0); // test with first point in the ring
+    // Don't test with first point -- this may return false if a hole intersects
+    // the containing ring at the first vertex.
+    // Instead, use the midpoint of the first segment
+    var p = getFirstMidpoint(a.ids[0], arcs);
+    //// test with first point in the ring
+    // var p = arcs.getVertex(a.ids[0], 0);
     return geom.testPointInRing(p.x, p.y, b.ids, arcs) == 1;
   }
 
+  function getFirstMidpoint(arcId, arcs) {
+    var p1 = arcs.getVertex(arcId, 0);
+    var p2 = arcs.getVertex(arcId, 1);
+    return {
+      x: (p1.x + p2.x) / 2,
+      y: (p1.y + p2.y) / 2
+    };
+  }
+
   // Bundle holes with their containing rings for Topo/GeoJSON polygon export.
   // Assumes outer rings are CW and inner (hole) rings are CCW, unless
   //   the reverseWinding flag is set.
@@ -9525,9 +9550,6 @@
         return rec && (rec[name] === val);
       });
     };
-    obj.file_exists = function(name) {
-      return cli.isFile(name);
-    };
     return obj;
   }
 
@@ -9935,6 +9957,11 @@
       ctx.$ = i >= 0 ? getFeatureById(i) : layerOnlyProxy;
       ctx._ = ctx; // provide access to functions when masked by variable names
       ctx.d = rec || null; // expose data properties a la d3 (also exposed as this.properties)
+      if (opts.record_alias) {
+        // this is used to expose source table record as "source" in -join calc=
+        // expresions.
+        ctx[opts.record_alias] = ctx.d;
+      }
       try {
         val = func.call(ctx.$, rec, ctx);
       } catch(e) {
@@ -18954,6 +18981,10 @@ ${svg}
       .option('json-path', {
         old_alias: 'json-subtree',
         describe: '[JSON] path to JSON input data; separator is /'
+      })
+      .option('single-part', {
+        type: 'flag',
+        // describe: '[GeoJSON] split multi-part features into single-part features'
       });
 
     parser.command('o')
@@ -22119,6 +22150,8 @@ ${svg}
       // TODO: improve so geometry_type option skips features instead of creating null geometries
       if (geom && geom.type == 'GeometryCollection') {
         GeoJSON.importComplexFeature(importer, geom, rec, opts);
+      } else if (opts.single_part && isMultiPartGeometry(geom)) {
+        GeoJSON.importMultiAsSingles(importer, geom, rec, opts);
       } else {
         GeoJSON.importSimpleFeature(importer, geom, rec, opts);
       }
@@ -22160,11 +22193,27 @@ ${svg}
     return Object.values(index);
   }
 
+  function isMultiPartGeometry(geom) {
+    return geom && geom.type && geom.type.indexOf('Multi') === 0;
+  }
+
   GeoJSON.importSimpleFeature = function(importer, geom, rec, opts) {
     importer.startShape(rec);
     GeoJSON.importSimpleGeometry(importer, geom, opts);
   };
 
+  // Split a multi-part feature into several single features
+  GeoJSON.importMultiAsSingles = function(importer, geom, rec, opts) {
+    geom.coordinates.forEach(function(coords, i) {
+      var geom2 = {
+        type: geom.type.substr(5),
+        coordinates: coords
+      };
+      var rec2 = i === 0 ? rec : copyRecord(rec);
+      GeoJSON.importSimpleFeature(importer, geom2, rec2, opts);
+    });
+  };
+
   GeoJSON.importSimpleGeometry = function(importer, geom, opts) {
     var type = geom ? geom.type : null;
     if (type === null) {
@@ -34614,19 +34663,33 @@ ${svg}
     return o;
   }
 
-  function compileLayerExpression(expr, lyr, dataset, opts) {
-    var proxy = getLayerProxy(lyr, dataset.arcs, opts);
+  function compileIfCommandExpression(expr, catalog, target, opts) {
+    var ctx = {};
+
+    if (target && target.layer) {
+      ctx = getLayerProxy(target.layer, target.dataset.arcs, opts);
+    }
+
+    ctx.file_exists = function(name) {
+      return cli.isFile(name);
+    };
+
+    ctx.layer_exists = function(name) {
+      var lyr = catalog.findSingleLayer(name);
+      return !!lyr;
+    };
+
     var exprOpts = Object.assign({returns: true}, opts);
     var func = compileExpressionToFunction(expr, exprOpts);
-    var ctx = proxy;
     return function() {
       try {
-        return func.call(proxy, {}, ctx);
+        return func.call(ctx, {}, ctx);
       } catch(e) {
         // if (opts.quiet) throw e;
         stop(e.name, "in expression [" + expr + "]:", e.message);
       }
     };
+
   }
 
   function skipCommand(cmdName) {
@@ -34674,7 +34737,7 @@ ${svg}
   function testLayer(catalog, opts) {
     var targ = getTargetLayer(catalog, opts);
     if (opts.expression) {
-      return compileLayerExpression(opts.expression, targ.layer, targ.dataset, opts)();
+      return compileIfCommandExpression(opts.expression, catalog, targ, opts)();
     }
     if (opts.empty) {
       return layerIsEmpty(targ.layer);

package/www/page.css

@@ -210,7 +210,7 @@ body {
 	max-height: 160px;
 	overflow: hidden;
 	overflow-y: auto;
-	margin-right: -13px;
+	margin-right: -3px;
 }
 
 .export-layer-list > div {
@@ -420,8 +420,8 @@ body.dragover #import-options-drop-area .drop-area {
 	background: rgba(255, 255, 255, 0.4);
 	border: 1px solid #999;
 	padding: 0 3px;
-	height: 17px;
-	font-size: 12px;
+	height: 18px;
+	font-size: 13px;
 }
 
 #mshp-not-supported {
@@ -436,10 +436,10 @@ body.dragover #import-options-drop-area .drop-area {
 	overflow-y: auto;
 }
 
-.dropped-file-list p {
+#import-options .dropped-file-list p {
 	line-height: 1;
 	margin-bottom: 5px;
-	font-size: 15px;
+	font-size: 14px;
 	font-weight: bold;
 }
 
@@ -484,7 +484,7 @@ body.dragover #import-options-drop-area .drop-area {
 }
 
 .option-menu {
-	padding: 0 0 7px 0;
+	padding: 0 0 9px 0;
 }
 
 .option-menu input {