mapshaper 0.6.40 → 0.6.41

package/bin/mapshaper-gui

@@ -9,7 +9,7 @@ var defaultPort = 5555,
       .option('-q, --quick-view', 'load files with default options, bypassing import dialog')
       .option('-s, --direct-save', 'save files outside the browser\'s download folder')
       .option('-f, --force-save', 'allow overwriting input files with output files')
-      .option('-a, --display-all', 'turn on visibility of all layers')
+      .option('-a, --display-all', 'turn on initial visibility of all layers')
       .option('-n, --name <name(s)>', 'rename input layer or layers')
       .option('-c, --commands <string>', 'console commands to run initially')
       .option('-t, --target <name>', 'name of layer to select initially')

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.40";
+  var VERSION = "0.6.41";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -10877,7 +10877,8 @@
     pack: pack,
     exportDatasetsToPack: exportDatasetsToPack,
     applyCompression: applyCompression,
-    exportDataset: exportDataset
+    exportDataset: exportDataset,
+    exportInfo: exportInfo
   });
 
   // Guess the type of a data file from file extension, or return null if not sure
@@ -23386,6 +23387,10 @@ ${svg}
         describe: '[TopoJSON] export coordinates without quantization',
         type: 'flag'
       })
+      .option('metadata', {
+        // describe: '[TopoJSON] Add a metadata object containing CRS information',
+        type: 'flag'
+      })
       .option('no-point-quantization', {
         // describe: '[TopoJSON] export point coordinates without quantization',
         type: 'flag'
@@ -27562,6 +27567,7 @@ ${svg}
     var separator = path.indexOf('/') > 0 ? '/' : '.';
     var parts = path.split(separator);
     var subpath, array, match;
+
     while (parts.length > 0) {
       subpath = parts.shift();
       match = arrayRxp.exec(subpath);
@@ -36244,31 +36250,6 @@ ${svg}
 
   var externalCommands = {};
 
-  cmd.external = function(opts) {
-    // TODO: remove duplication with -require command
-    var _module, moduleFile, moduleName;
-    if (!opts.module) {
-      stop('Missing required "module" parameter');
-    }
-    if (cli.isFile(opts.module)) {
-      moduleFile = opts.module;
-    } else if (cli.isFile(opts.module + '.js')) {
-      moduleFile = opts.module + '.js';
-    } else {
-      moduleName = opts.module;
-    }
-    if (moduleFile) {
-      moduleFile = require$1('path').join(process.cwd(), moduleFile);
-    }
-    try {
-      _module = require$1(moduleFile || moduleName);
-      _module(coreAPI);
-    } catch(e) {
-      // stop(e);
-      stop('Unable to load external module:', e.message);
-    }
-  };
-
   cmd.registerCommand = function(name, params) {
     var defn = {name: name, options: params.options || []};
     // Add definitions of options common to all commands (TODO: remove duplication)
@@ -36278,13 +36259,25 @@ ${svg}
     externalCommands[name] = defn;
   };
 
+  function isValidExternalCommand(defn) {
+    try {
+      validateExternalCommand(defn);
+      return true;
+    } catch(e) {}
+    return false;
+  }
+
   function validateExternalCommand(defn) {
+    var targetTypes = ['layer', 'layers'];
     if (typeof defn.command != 'function') {
       stop('Expected "command" parameter function');
     }
     if (!defn.target) {
       stop('Missing required "target" parameter');
     }
+    if (!targetTypes.includes(defn.target)) {
+      stop('Unrecognized command target type:', defn.target);
+    }
   }
 
   cmd.runExternalCommand = function(cmdOpts, catalog) {
@@ -40624,6 +40617,7 @@ ${svg}
     return outputLayers;
   };
 
+
   function getPolygonDataset(pointLyr, gridBBox, opts) {
     var points = getPointsInLayer(pointLyr);
     var cellSize = opts.interval;
@@ -40729,6 +40723,8 @@ ${svg}
     return getPointBufferCoordinates(center, radius, 20, getPlanarSegmentEndpoint);
   }
 
+  // Returns a function that receives a cell index and returns indices of points
+  //   within a given distance of the cell.
   function getPointIndex(points, grid, radius) {
     var Flatbush = require$1('flatbush');
     var gridIndex = new IdTestIndex(grid.cells());
@@ -40860,12 +40856,26 @@ ${svg}
         xmin + (c + 1) * interval, ymin + (r + 1) * interval
       ];
     }
+
     return {
       size, cells, pointToCol, pointToRow, colRowToIdx, pointToIdx,
       idxToCol, idxToRow, idxToBBox, idxToPoint
     };
   }
 
+  var PointToGrid = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    getPointCircleRadius: getPointCircleRadius,
+    calcCellProperties: calcCellProperties,
+    calcWeights: calcWeights,
+    twoCircleIntersection: twoCircleIntersection,
+    makeCellPolygon: makeCellPolygon,
+    getPointIndex: getPointIndex,
+    getAlignedGridBounds: getAlignedGridBounds,
+    getCenteredGridBounds: getCenteredGridBounds,
+    getGridData: getGridData
+  });
+
   function closeUndershoots(lyr, dataset, opts) {
     var maxGapLen = opts.gap_tolerance ? convertIntervalParam(opts.gap_tolerance, getDatasetCRS(dataset)) : 0;
     var arcs = dataset.arcs;
@@ -41180,8 +41190,16 @@ ${svg}
     }
     try {
       mod = require$1(moduleFile || moduleName);
+      if (typeof mod == 'function') {
+        // -require now includes the functionality of the old -external command
+        var retn = mod(api);
+        if (retn && isValidExternalCommand(retn)) {
+          cmd.registerCommand(retn.name, retn);
+        }
+      }
     } catch(e) {
-      stop(e);
+      // stop(e);
+      stop('Unable to load external module:', e.message);
     }
     if (moduleName || opts.alias) {
       defs[opts.alias || moduleName] = mod;
@@ -43347,7 +43365,7 @@ ${svg}
   }
 
   function commandAcceptsMultipleTargetDatasets(name) {
-    return name == 'rotate' || name == 'info' || name == 'proj' ||
+    return name == 'rotate' || name == 'info' || name == 'proj' || name == 'require' ||
       name == 'drop' || name == 'target' || name == 'if' || name == 'elif' ||
       name == 'else' || name == 'endif' || name == 'run' || name == 'i';
   }
@@ -43505,7 +43523,8 @@ ${svg}
         outputLayers = applyCommandToEachLayer(cmd.explodeFeatures, targetLayers, arcs, opts);
 
       } else if (name == 'external') {
-        cmd.external(opts);
+        // -require now incorporates -external
+        cmd.require(targets, opts);
 
       } else if (name == 'filter') {
         outputLayers = applyCommandToEachLayer(cmd.filterFeatures, targetLayers, arcs, opts);
@@ -44130,14 +44149,6 @@ ${svg}
     runAndRemoveInfoCommands: runAndRemoveInfoCommands
   });
 
-  // the mapshaper public api only has 4 functions
-  var coreAPI = {
-    runCommands,
-    applyCommands,
-    runCommandsXL,
-    enableLogging
-  };
-
   // Return an array containing points from a path iterator, clipped to a bounding box
   // Currently using this function for clipping styled polygons in the GUI to speed up layer rendering.
   // Artifacts along the edges make this unsuitable for clipping datasets
@@ -44534,6 +44545,7 @@ ${svg}
     PixelTransform,
     PointPolygonJoin,
     Points,
+    PointToGrid,
     PointUtils,
     PolygonDissolve,
     PolygonDissolve2,
@@ -44581,16 +44593,26 @@ ${svg}
     Zip
   );
 
-  // The entry point for the core mapshaper module
+  // the mapshaper public api only has 4 functions
+  var api = {
+    runCommands,
+    applyCommands,
+    runCommandsXL,
+    enableLogging
+  };
 
-  var moduleAPI = Object.assign({
+  // Add some namespaces, for easier testability and
+  // to expose internal functions to the web UI
+  Object.assign(api, {
     cli, cmd, geom, utils, internal,
-  }, coreAPI);
+  });
+
+  // The entry point for the core mapshaper module
 
   if (typeof module === "object" && module.exports) {
-    module.exports = moduleAPI;
+    module.exports = api;
   } else if (typeof window === "object" && window) {
-    window.mapshaper = moduleAPI;
+    window.mapshaper = api;
   }
 
 })();

package/package.json

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

package/www/mapshaper-gui.js

@@ -1979,7 +1979,7 @@
       var names = getFileNames(files);
       var expanded = [];
       if (files.length === 0) return;
-      useQuickView = importCount === 0 && (opts.quick_view || overQuickView);
+      useQuickView = importTotal === 0 && (opts.quick_view || overQuickView);
       try {
         expanded = await expandFiles(files);
       } catch(e) {
@@ -9171,6 +9171,10 @@
       return calcBounds(_cx, _cy, _scale / (k || 1));
     };
 
+    this.getFullBounds = function() {
+      return _fullBounds;
+    };
+
     // Update the extent of 'full' zoom without navigating the current view
     //
     this.setFullBounds = function(fullBounds, strictBounds) {
@@ -9506,6 +9510,7 @@
         canv.drawVertices(layer.shapes, arcs, style, filter);
       }
     }
+    canv.clearStyles();
   }
 
 
@@ -9566,6 +9571,11 @@
         _pixelColor = getPixelColorFunction(),
         _ext;
 
+    _self.clearStyles = function() {
+      _ctx.fillStyle = null;
+      _ctx.strokeStyle = null;
+    };
+
     _self.prep = function(extent) {
       var w = extent.width(),
           h = extent.height(),
@@ -10551,25 +10561,11 @@
 
 
   function getDisplayBounds(lyr, arcs) {
-    var arcBounds = arcs ? arcs.getBounds() : new Bounds(),
-        bounds = arcBounds, // default display extent: all arcs in the dataset
-        lyrBounds;
-
-    if (lyr.geometry_type == 'point') {
-      lyrBounds = internal.getLayerBounds(lyr);
-      if (lyrBounds && lyrBounds.hasBounds()) {
-        if (lyrBounds.area() > 0 || !arcBounds.hasBounds()) {
-          bounds = lyrBounds;
-        } else {
-          // if a point layer has no extent (e.g. contains only a single point),
-          // then merge with arc bounds, to place the point in context.
-          bounds = arcBounds.mergeBounds(lyrBounds);
-        }
-      }
-    }
-
-    if (!bounds || !bounds.hasBounds()) { // empty layer
-      bounds = new Bounds();
+    var bounds = internal.getLayerBounds(lyr, arcs) || new Bounds();
+    if (lyr.geometry_type == 'point' && arcs && bounds.hasBounds() && bounds.area() > 0 === false) {
+      // if a point layer has no extent (e.g. contains only a single point),
+      // then merge with arc bounds, to place the point in context.
+      bounds = bounds.mergeBounds(arcs.getBounds());
     }
     return bounds;
   }
@@ -10843,7 +10839,6 @@
         _ext = new MapExtent(position),
         _nav = new MapNav(gui, _ext, _mouse),
         _visibleLayers = [], // cached visible map layers
-        _fullBounds = null,
         _hit,
         _basemap,
         _intersectionLyr, _activeLyr, _overlayLyr,
@@ -10951,8 +10946,8 @@
       updateLayerStyles(getDrawableContentLayers()); // kludge to make sure all layers have styles
 
       // Update map extent (also triggers redraw)
-      projectMapExtent(_ext, oldCRS, this.getDisplayCRS(), getFullBounds());
-      _fullBounds = getFullBounds(); // update this so map extent doesn't get reset after next update
+      projectMapExtent(_ext, oldCRS, this.getDisplayCRS(), calcFullBounds());
+      updateFullBounds();
     };
 
     // Refresh map display in response to data changes, layer selection, etc.
@@ -10995,28 +10990,27 @@
         gui.dispatchEvent('popup-needs-refresh');
       } else if (_hit) {
         _hit.clearSelection();
-        _hit.setLayer(_activeLyr);
       }
+      _hit.setLayer(_activeLyr); // need this every time, to support dynamic reprojection
 
       updateVisibleMapLayers();
-      fullBounds = getFullBounds();
+      fullBounds = calcFullBounds();
 
-      if (!prevLyr || !_fullBounds || prevLyr.tabular || _activeLyr.tabular || isFrameView()) {
+      if (!prevLyr || prevLyr.tabular || _activeLyr.tabular || isFrameView()) {
         needReset = true;
       } else {
-        needReset = mapNeedsReset(fullBounds, _fullBounds, _ext.getBounds(), e.flags);
+        needReset = mapNeedsReset(fullBounds, _ext.getFullBounds(), _ext.getBounds(), e.flags);
       }
 
       if (isFrameView()) {
         _nav.setZoomFactor(0.05); // slow zooming way down to allow fine-tuning frame placement // 0.03
-        _ext.setFrame(getFullBounds()); // TODO: remove redundancy with drawLayers()
+        _ext.setFrame(calcFullBounds()); // TODO: remove redundancy with drawLayers()
         needReset = true; // snap to frame extent
       } else {
         _nav.setZoomFactor(1);
       }
       _ext.setFullBounds(fullBounds, getStrictBounds()); // update 'home' button extent
 
-      _fullBounds = fullBounds;
       if (needReset) {
         _ext.reset();
       }
@@ -11117,12 +11111,17 @@
       return null;
     }
 
-    function getFullBounds() {
+    function updateFullBounds() {
+      _ext.setFullBounds(calcFullBounds(), getStrictBounds());
+    }
+
+    function calcFullBounds() {
       if (isPreviewView()) {
         return internal.getFrameLayerBounds(internal.findFrameLayer(model));
       }
       var b = new Bounds();
-      getDrawableContentLayers().forEach(function(lyr) {
+      var layers = getDrawableContentLayers();
+      layers.forEach(function(lyr) {
         b.mergeBounds(lyr.bounds);
       });
 
@@ -11267,6 +11266,7 @@
     //   (default)  anything could have changed
     function drawLayers2(action) {
       var layersMayHaveChanged = !action;
+      var fullBounds;
       var contentLayers = getDrawableContentLayers();
       var furnitureLayers = getDrawableFurnitureLayers();
       if (!(_ext.width() > 0 && _ext.height() > 0)) {
@@ -11277,7 +11277,7 @@
       if (layersMayHaveChanged) {
         // kludge to handle layer visibility toggling
         _ext.setFrame(isPreviewView() ? getFrameData() : null);
-        _ext.setFullBounds(getFullBounds(), getStrictBounds());
+        updateFullBounds();
         updateLayerStyles(contentLayers);
         updateLayerStackOrder(model.getLayers());// update menu_order property of all layers
       }

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.40";
+  var VERSION = "0.6.41";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -10877,7 +10877,8 @@
     pack: pack,
     exportDatasetsToPack: exportDatasetsToPack,
     applyCompression: applyCompression,
-    exportDataset: exportDataset
+    exportDataset: exportDataset,
+    exportInfo: exportInfo
   });
 
   // Guess the type of a data file from file extension, or return null if not sure
@@ -23386,6 +23387,10 @@ ${svg}
         describe: '[TopoJSON] export coordinates without quantization',
         type: 'flag'
       })
+      .option('metadata', {
+        // describe: '[TopoJSON] Add a metadata object containing CRS information',
+        type: 'flag'
+      })
       .option('no-point-quantization', {
         // describe: '[TopoJSON] export point coordinates without quantization',
         type: 'flag'
@@ -27562,6 +27567,7 @@ ${svg}
     var separator = path.indexOf('/') > 0 ? '/' : '.';
     var parts = path.split(separator);
     var subpath, array, match;
+
     while (parts.length > 0) {
       subpath = parts.shift();
       match = arrayRxp.exec(subpath);
@@ -36244,31 +36250,6 @@ ${svg}
 
   var externalCommands = {};
 
-  cmd.external = function(opts) {
-    // TODO: remove duplication with -require command
-    var _module, moduleFile, moduleName;
-    if (!opts.module) {
-      stop('Missing required "module" parameter');
-    }
-    if (cli.isFile(opts.module)) {
-      moduleFile = opts.module;
-    } else if (cli.isFile(opts.module + '.js')) {
-      moduleFile = opts.module + '.js';
-    } else {
-      moduleName = opts.module;
-    }
-    if (moduleFile) {
-      moduleFile = require$1('path').join(process.cwd(), moduleFile);
-    }
-    try {
-      _module = require$1(moduleFile || moduleName);
-      _module(coreAPI);
-    } catch(e) {
-      // stop(e);
-      stop('Unable to load external module:', e.message);
-    }
-  };
-
   cmd.registerCommand = function(name, params) {
     var defn = {name: name, options: params.options || []};
     // Add definitions of options common to all commands (TODO: remove duplication)
@@ -36278,13 +36259,25 @@ ${svg}
     externalCommands[name] = defn;
   };
 
+  function isValidExternalCommand(defn) {
+    try {
+      validateExternalCommand(defn);
+      return true;
+    } catch(e) {}
+    return false;
+  }
+
   function validateExternalCommand(defn) {
+    var targetTypes = ['layer', 'layers'];
     if (typeof defn.command != 'function') {
       stop('Expected "command" parameter function');
     }
     if (!defn.target) {
       stop('Missing required "target" parameter');
     }
+    if (!targetTypes.includes(defn.target)) {
+      stop('Unrecognized command target type:', defn.target);
+    }
   }
 
   cmd.runExternalCommand = function(cmdOpts, catalog) {
@@ -40624,6 +40617,7 @@ ${svg}
     return outputLayers;
   };
 
+
   function getPolygonDataset(pointLyr, gridBBox, opts) {
     var points = getPointsInLayer(pointLyr);
     var cellSize = opts.interval;
@@ -40729,6 +40723,8 @@ ${svg}
     return getPointBufferCoordinates(center, radius, 20, getPlanarSegmentEndpoint);
   }
 
+  // Returns a function that receives a cell index and returns indices of points
+  //   within a given distance of the cell.
   function getPointIndex(points, grid, radius) {
     var Flatbush = require$1('flatbush');
     var gridIndex = new IdTestIndex(grid.cells());
@@ -40860,12 +40856,26 @@ ${svg}
         xmin + (c + 1) * interval, ymin + (r + 1) * interval
       ];
     }
+
     return {
       size, cells, pointToCol, pointToRow, colRowToIdx, pointToIdx,
       idxToCol, idxToRow, idxToBBox, idxToPoint
     };
   }
 
+  var PointToGrid = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    getPointCircleRadius: getPointCircleRadius,
+    calcCellProperties: calcCellProperties,
+    calcWeights: calcWeights,
+    twoCircleIntersection: twoCircleIntersection,
+    makeCellPolygon: makeCellPolygon,
+    getPointIndex: getPointIndex,
+    getAlignedGridBounds: getAlignedGridBounds,
+    getCenteredGridBounds: getCenteredGridBounds,
+    getGridData: getGridData
+  });
+
   function closeUndershoots(lyr, dataset, opts) {
     var maxGapLen = opts.gap_tolerance ? convertIntervalParam(opts.gap_tolerance, getDatasetCRS(dataset)) : 0;
     var arcs = dataset.arcs;
@@ -41180,8 +41190,16 @@ ${svg}
     }
     try {
       mod = require$1(moduleFile || moduleName);
+      if (typeof mod == 'function') {
+        // -require now includes the functionality of the old -external command
+        var retn = mod(api);
+        if (retn && isValidExternalCommand(retn)) {
+          cmd.registerCommand(retn.name, retn);
+        }
+      }
     } catch(e) {
-      stop(e);
+      // stop(e);
+      stop('Unable to load external module:', e.message);
     }
     if (moduleName || opts.alias) {
       defs[opts.alias || moduleName] = mod;
@@ -43347,7 +43365,7 @@ ${svg}
   }
 
   function commandAcceptsMultipleTargetDatasets(name) {
-    return name == 'rotate' || name == 'info' || name == 'proj' ||
+    return name == 'rotate' || name == 'info' || name == 'proj' || name == 'require' ||
       name == 'drop' || name == 'target' || name == 'if' || name == 'elif' ||
       name == 'else' || name == 'endif' || name == 'run' || name == 'i';
   }
@@ -43505,7 +43523,8 @@ ${svg}
         outputLayers = applyCommandToEachLayer(cmd.explodeFeatures, targetLayers, arcs, opts);
 
       } else if (name == 'external') {
-        cmd.external(opts);
+        // -require now incorporates -external
+        cmd.require(targets, opts);
 
       } else if (name == 'filter') {
         outputLayers = applyCommandToEachLayer(cmd.filterFeatures, targetLayers, arcs, opts);
@@ -44130,14 +44149,6 @@ ${svg}
     runAndRemoveInfoCommands: runAndRemoveInfoCommands
   });
 
-  // the mapshaper public api only has 4 functions
-  var coreAPI = {
-    runCommands,
-    applyCommands,
-    runCommandsXL,
-    enableLogging
-  };
-
   // Return an array containing points from a path iterator, clipped to a bounding box
   // Currently using this function for clipping styled polygons in the GUI to speed up layer rendering.
   // Artifacts along the edges make this unsuitable for clipping datasets
@@ -44534,6 +44545,7 @@ ${svg}
     PixelTransform,
     PointPolygonJoin,
     Points,
+    PointToGrid,
     PointUtils,
     PolygonDissolve,
     PolygonDissolve2,
@@ -44581,16 +44593,26 @@ ${svg}
     Zip
   );
 
-  // The entry point for the core mapshaper module
+  // the mapshaper public api only has 4 functions
+  var api = {
+    runCommands,
+    applyCommands,
+    runCommandsXL,
+    enableLogging
+  };
 
-  var moduleAPI = Object.assign({
+  // Add some namespaces, for easier testability and
+  // to expose internal functions to the web UI
+  Object.assign(api, {
     cli, cmd, geom, utils, internal,
-  }, coreAPI);
+  });
+
+  // The entry point for the core mapshaper module
 
   if (typeof module === "object" && module.exports) {
-    module.exports = moduleAPI;
+    module.exports = api;
   } else if (typeof window === "object" && window) {
-    window.mapshaper = moduleAPI;
+    window.mapshaper = api;
   }
 
 })();