mapshaper 0.6.41 → 0.6.42

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.41";
+  var VERSION = "0.6.42";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1267,6 +1267,26 @@
     _stop = stop;
   }
 
+  // get detailed error information from error stack (if available)
+  // Example stack string (Node.js):
+  /*
+  /Users/someuser/somescript.js:226
+      opacity: Math.round(weight * 5 / 5 // 0.2 0.4 0.6 etc
+                                       ^
+
+  SyntaxError: missing ) after argument list
+      at internalCompileFunction (node:internal/vm:73:18)
+      at wrapSafe (node:internal/modules/cjs/loader:1149:20)
+      at Module._compile (node:internal/modules/cjs/loader:1190:27)
+      ...
+  */
+  function getErrorDetail(e) {
+    var parts = (typeof e.stack == 'string') ? e.stack.split(/\n\s*\n/) : [];
+    if (parts.length > 1 || true) {
+      return '\nError details:\n' + parts[0];
+    }
+    return '';
+  }
 
   // print a message to stdout
   function print() {
@@ -1389,6 +1409,7 @@
     interrupt: interrupt,
     message: message,
     setLoggingFunctions: setLoggingFunctions,
+    getErrorDetail: getErrorDetail,
     print: print,
     verbose: verbose,
     debug: debug,
@@ -6359,9 +6380,10 @@
   function mergeDatasets(arr) {
     var arcSources = [],
         arcCount = 0,
-        mergedLayers = [],
-        mergedInfo = {},
-        mergedArcs;
+        merged = {
+          info: {},
+          layers: []
+        };
 
     // Error if incompatible CRS
     requireDatasetsHaveCompatibleCRS(arr);
@@ -6372,38 +6394,35 @@
         arcSources.push(dataset.arcs);
       }
 
-      mergeDatasetInfo(mergedInfo, dataset);
+      mergeDatasetInfo$1(merged, dataset);
       dataset.layers.forEach(function(lyr) {
         if (lyr.geometry_type == 'polygon' || lyr.geometry_type == 'polyline') {
           forEachArcId(lyr.shapes, function(id) {
             return id < 0 ? id - arcCount : id + arcCount;
           });
         }
-        mergedLayers.push(lyr);
+        merged.layers.push(lyr);
       });
       arcCount += n;
     });
 
     if (arcSources.length > 0) {
-      mergedArcs = mergeArcs(arcSources);
-      if (mergedArcs.size() != arcCount) {
+      merged.arcs = mergeArcs(arcSources);
+      if (merged.arcs.size() != arcCount) {
         error("[mergeDatasets()] Arc indexing error");
       }
     }
 
-    return {
-      info: mergedInfo,
-      arcs: mergedArcs,
-      layers: mergedLayers
-    };
+    return merged;
   }
 
-  function mergeDatasetInfo(merged, dataset) {
-    var info = dataset.info || {};
-    merged.input_files = utils.uniq((merged.input_files || []).concat(info.input_files || []));
-    merged.input_formats = utils.uniq((merged.input_formats || []).concat(info.input_formats || []));
+  function mergeDatasetInfo$1(merged, dataset) {
+    var src = dataset.info || {};
+    var dest = merged.info || (merged.info = {});
+    dest.input_files = utils.uniq((dest.input_files || []).concat(src.input_files || []));
+    dest.input_formats = utils.uniq((dest.input_formats || []).concat(src.input_formats || []));
     // merge other info properties (e.g. input_geojson_crs, input_delimiter, prj, crs)
-    utils.defaults(merged, info);
+    utils.defaults(dest, src);
   }
 
   function mergeArcs(arr) {
@@ -6450,6 +6469,7 @@
     mergeDatasetsForExport: mergeDatasetsForExport,
     mergeCommandTargets: mergeCommandTargets,
     mergeDatasets: mergeDatasets,
+    mergeDatasetInfo: mergeDatasetInfo$1,
     mergeArcs: mergeArcs
   });
 
@@ -6900,6 +6920,18 @@
     });
   }
 
+  // dest: destination dataset
+  // src: source dataset
+  function mergeDatasetInfo(dest, src) {
+    var srcInfo = src.info || {};
+    var destInfo = dest.info || (dest.info = {});
+    destInfo.input_files = utils.uniq((destInfo.input_files || []).concat(srcInfo.input_files || []));
+    destInfo.input_formats = utils.uniq((destInfo.input_formats || []).concat(srcInfo.input_formats || []));
+    // merge other info properties (e.g. input_geojson_crs, input_delimiter, prj, crs)
+    utils.defaults(destInfo, srcInfo);
+  }
+
+
   function splitApartLayers(dataset, layers) {
     var datasets = [];
     dataset.layers = dataset.layers.filter(function(lyr) {
@@ -7064,6 +7096,7 @@
   var DatasetUtils = /*#__PURE__*/Object.freeze({
     __proto__: null,
     splitDataset: splitDataset,
+    mergeDatasetInfo: mergeDatasetInfo,
     splitApartLayers: splitApartLayers,
     copyDataset: copyDataset,
     copyDatasetForExport: copyDatasetForExport,
@@ -11205,20 +11238,43 @@
     return dest;
   };
 
+  // Receives a directory path, in which the final subdirectory may include the
+  //   "*" wildcard, e.g. '.' 'data' '*' 'data/*' '2023-*'
+  // Returns an array of expanded directory names
+  // TODO: add support for wildcards in other subdirectories
+  cli.expandDirectoryName = function(name) {
+    var info = parseLocalPath(name);
+    // final directory name is parsed as info.filename
+    if (!info.filename.includes('*')) {
+      return [name];
+    }
+    var rxp = utils.wildcardToRegExp(info.filename);
+    var dirs = [];
+    require$1('fs').readdirSync(info.directory || '.').forEach(function(item) {
+      var path = info.directory ? require$1('path').join(info.directory, item) : item;
+      if (rxp.test(item) && cli.isDirectory(path)) {
+        dirs.push(path);
+      }
+    });
+    return dirs;
+  };
+
   // Expand any "*" wild cards in file name
   // (For the Windows command line; unix shells do this automatically)
   cli.expandFileName = function(name) {
     var info = parseLocalPath(name),
         rxp = utils.wildcardToRegExp(info.filename),
-        dir = info.directory || '.',
+        dirs = cli.expandDirectoryName(info.directory || '.'),
         files = [];
 
     try {
-      require$1('fs').readdirSync(dir).forEach(function(item) {
-        var path = require$1('path').join(dir, item);
-        if (rxp.test(item) && cli.isFile(path)) {
-          files.push(path);
-        }
+      dirs.forEach(function(dir) {
+        require$1('fs').readdirSync(dir).forEach(function(item) {
+          var path = require$1('path').join(dir, item);
+          if (rxp.test(item) && cli.isFile(path)) {
+            files.push(path);
+          }
+        });
       });
     } catch(e) {}
 
@@ -28239,20 +28295,23 @@ ${svg}
     };
 
     this.setDefaultTarget = function(layers, dataset) {
-      if (datasets.indexOf(dataset) == -1) {
-        datasets.push(dataset);
-      }
-      defaultTargets = [{
+      this.setDefaultTargets([{
         // Copy layers array, in case layers is a reference to dataset.layers.
         // This prevents layers that are added to the dataset inside a command from
         //  being added to the next command's target, e.g. debugging layers added
         //  by '-join unmatched unjoined'.
         layers: layers.concat(),
         dataset: dataset
-      }];
+      }]);
     };
 
+    // arr: array of target objects {layers:[], dataset:{}}
     this.setDefaultTargets = function(arr) {
+      arr.forEach(function(target) {
+        if (datasets.indexOf(target.dataset) == -1) {
+          datasets.push(target.dataset);
+        }
+      });
       defaultTargets = arr;
     };
 
@@ -28345,6 +28404,30 @@ ${svg}
     stashVar('input_files', job.input_files);
   }
 
+  // Apply a command to an array of target layers
+  function applyCommandToEachLayer(func, targetLayers) {
+    var args = utils.toArray(arguments).slice(2);
+    return targetLayers.reduce(function(memo, lyr) {
+      var result = func.apply(null, [lyr].concat(args));
+      if (utils.isArray(result)) { // some commands return an array of layers
+        memo = memo.concat(result);
+      } else if (result) { // assuming result is a layer
+        memo.push(result);
+      }
+      return memo;
+    }, []);
+  }
+
+  function applyCommandToEachTarget(func, targets) {
+    var args = utils.toArray(arguments).slice(2);
+    targets.forEach(function(target) {
+      var result = func.apply(null, [target].concat(args));
+      if (result) {
+        error('Unexpected output from command');
+      }
+    });
+  }
+
   cmd.addShape = addShape;
 
   function addShape(targetLayers, targetDataset, opts) {
@@ -36290,6 +36373,7 @@ ${svg}
     var opts = parseExternalCommand(name, cmdDefn, cmdOpts._);
     var targets = catalog.findCommandTargets(opts.target || '*');
     var target = targets[0];
+    var output;
     if (!target) {
       stop('Missing a target');
     }
@@ -36300,12 +36384,34 @@ ${svg}
       stop("Targetting layers from multiple datasets is not supported");
     }
     if (targetType == 'layer') {
-      cmdDefn.command(target.layers[0], target.dataset, opts.options);
+      output = cmdDefn.command(target.layers[0], target.dataset, opts.options);
     } else if (targetType == 'layers') {
-      cmdDefn.command(target.layers, target.dataset, opts.options);
+      output = cmdDefn.command(target.layers, target.dataset, opts.options);
+    }
+    if (output) {
+      integrateOutput(output, target, catalog, opts);
     }
   };
 
+  // TODO: remove restrictions on output data
+  function integrateOutput(output, input, catalog, opts) {
+    if (!output.dataset || !output.layers || output.layers.length > 0 === false) {
+      stop('Invalid command output');
+    }
+    if (output.dataset == input.dataset) {
+      stop('External commands are not currently allowed to modify input datasets');
+    }
+    if (output.dataset.layers.length != output.layers.length) {
+      stop('Currently not supported: targetting a subset of output layers');
+    }
+    if (!opts.no_replace) {
+      input.layers.forEach(function(lyr) {
+        catalog.deleteLayer(lyr, input.dataset);
+      });
+    }
+    catalog.addDataset(output.dataset);
+  }
+
   function parseExternalCommand(name, cmdDefn, tokens) {
     var parser = new CommandParser();
     var cmd = parser.command(name);
@@ -40720,7 +40826,8 @@ ${svg}
   function makeCircleCoords(center, opts) {
     var margin = opts.cell_margin > 0 ? opts.cell_margin : 1e-6;
     var radius = opts.interval / 2 * (1 - margin);
-    return getPointBufferCoordinates(center, radius, 20, getPlanarSegmentEndpoint);
+    var vertices = opts.vertices || 20;
+    return getPointBufferCoordinates(center, radius, vertices, getPlanarSegmentEndpoint);
   }
 
   // Returns a function that receives a cell index and returns indices of points
@@ -40731,12 +40838,15 @@ ${svg}
     var bboxIndex = new Flatbush(points.length);
     var empty = [];
     points.forEach(function(p) {
+      var bbox = getPointBounds(p, radius);
       addPointToGridIndex(p, gridIndex, grid);
-      bboxIndex.add.apply(bboxIndex, getPointBounds(p, radius));
+      bboxIndex.add.apply(bboxIndex, bbox);
     });
     bboxIndex.finish();
     return function(i) {
-      if (!gridIndex.hasId(i)) return empty;
+      if (!gridIndex.hasId(i)) {
+        return empty;
+      }
       var bbox = grid.idxToBBox(i);
       var indices = bboxIndex.search.apply(bboxIndex, bbox);
       return indices;
@@ -40870,6 +40980,7 @@ ${svg}
     calcWeights: calcWeights,
     twoCircleIntersection: twoCircleIntersection,
     makeCellPolygon: makeCellPolygon,
+    makeCircleCoords: makeCircleCoords,
     getPointIndex: getPointIndex,
     getAlignedGridBounds: getAlignedGridBounds,
     getCenteredGridBounds: getCenteredGridBounds,
@@ -41198,8 +41309,7 @@ ${svg}
         }
       }
     } catch(e) {
-      // stop(e);
-      stop('Unable to load external module:', e.message);
+      stop('Unable to load external module:', e.message, getErrorDetail(e));
     }
     if (moduleName || opts.alias) {
       defs[opts.alias || moduleName] = mod;
@@ -42230,9 +42340,10 @@ ${svg}
     }
   };
 
-  cmd.snap = function(dataset, opts) {
+  cmd.snap = function(target, opts) {
     var interval = 0;
     var snapCount = 0;
+    var dataset = target.dataset;
     var arcs = dataset.arcs;
     var arcBounds = arcs && arcs.getBounds();
     if (!arcBounds || !arcBounds.hasBounds()) {
@@ -43367,7 +43478,7 @@ ${svg}
   function commandAcceptsMultipleTargetDatasets(name) {
     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';
+      name == 'else' || name == 'endif' || name == 'run' || name == 'i' || name == 'snap';
   }
 
   function commandAcceptsEmptyTarget(name) {
@@ -43449,6 +43560,10 @@ ${svg}
         source = findCommandSource(convertSourceName(opts.source, targets), job.catalog, opts);
       }
 
+      // identify command target/input (for postprocessing)
+      // TODO: support commands with multiple target datasets
+      // target = name == 'i' ? null : targets[0];
+
       if (name == 'add-shape') {
         if (!targetDataset) {
           targetDataset = {info: {}, layers: []};
@@ -43556,6 +43671,9 @@ ${svg}
       } else if (name == 'graticule') {
         job.catalog.addDataset(cmd.graticule(targetDataset, opts));
 
+      } else if (name == 'grid') {
+        outputDataset = cmd.polygonGrid(targetLayers, targetDataset, opts);
+
       } else if (name == 'help') {
         // placing help command here to handle errors from invalid command names
         cmd.printHelp(command.options);
@@ -43627,9 +43745,6 @@ ${svg}
       } else if (name == 'point-to-grid') {
         outputLayers = cmd.pointToGrid(targetLayers, targetDataset, opts);
 
-      } else if (name == 'grid') {
-        outputDataset = cmd.polygonGrid(targetLayers, targetDataset, opts);
-
       } else if (name == 'points') {
         outputLayers = applyCommandToEachLayer(cmd.createPointLayer, targetLayers, targetDataset, opts);
 
@@ -43693,7 +43808,8 @@ ${svg}
         outputLayers = cmd.sliceLayers(targetLayers, source, targetDataset, opts);
 
       } else if (name == 'snap') {
-        cmd.snap(targetDataset, opts);
+        // cmd.snap(targetDataset, opts);
+        applyCommandToEachTarget(targets, opts);
 
       } else if (name == 'sort') {
         applyCommandToEachLayer(cmd.sortFeatures, targetLayers, arcs, opts);
@@ -43784,9 +43900,12 @@ ${svg}
 
       // delete arcs if no longer needed (e.g. after -points command)
       // (after output layers have been integrated)
+      // TODO: be more selective (e.g. -i command doesn't need cleanup)
+      //   or: detect if arcs have been changed
       if (targetDataset) {
         cleanupArcs(targetDataset);
       }
+
     } catch(e) {
       return done(e);
     }
@@ -43808,20 +43927,6 @@ ${svg}
     });
   }
 
-  // Apply a command to an array of target layers
-  function applyCommandToEachLayer(func, targetLayers) {
-    var args = utils.toArray(arguments).slice(2);
-    return targetLayers.reduce(function(memo, lyr) {
-      var result = func.apply(null, [lyr].concat(args));
-      if (utils.isArray(result)) { // some commands return an array of layers
-        memo = memo.concat(result);
-      } else if (result) { // assuming result is a layer
-        memo.push(result);
-      }
-      return memo;
-    }, []);
-  }
-
   // 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.
   //   function(argv[, input], callback)
@@ -44465,6 +44570,7 @@ ${svg}
     editArcs,
     GeoJSONReader,
     Heap,
+    IdLookupIndex,
     NodeCollection,
     parseDMS,
     formatDMS,

package/package.json

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

package/www/index.html

@@ -172,7 +172,7 @@ precision=0.001. Click to see all options.</div></div></div></a>
 
 		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
 		<div class="save-btn btn dialog-btn">Export</div>
-		<span id="save-preference"><input type="checkbox"/>choose directory</span>
+		<span id="save-preference" class="inline-checkbox" style="display: none;"><input type="checkbox"/>choose directory</span>
 
 	</div>
 </div>

package/www/mapshaper-gui.js

@@ -1125,21 +1125,26 @@
     var self = {}, html = '';
     var _cancel, _close;
     var warningRxp = /^Warning: /;
-    var el = El('div').appendTo('body').addClass('error-wrapper');
-    var infoBox = El('div').appendTo(el).addClass('error-box info-box selectable');
+    var el = El('div').appendTo('body').addClass('alert-wrapper');
+    var infoBox = El('div').appendTo(el).addClass('alert-box info-box selectable');
+    El('div').appendTo(infoBox).addClass('close2-btn').on('click', function() {
+      if (_cancel) _cancel();
+      self.close();
+    });
+    var container = El('div').appendTo(infoBox);
     if (!title && warningRxp.test(msg)) {
       title = 'Warning';
       msg = msg.replace(warningRxp, '');
     }
     if (title) {
-      html += `<div class="error-title">${title}</div>`;
+      El('div').addClass('alert-title').text(title).appendTo(container);
     }
-    html += `<p class="error-message">${msg}</p>`;
-    El('div').appendTo(infoBox).addClass('close2-btn').on('click', function() {
-      if (_cancel) _cancel();
-      self.close();
-    });
-    El('div').appendTo(infoBox).addClass('error-content').html(html);
+    var content = El('div').appendTo(infoBox);
+    if (msg) {
+      content.html(`<p class="error-message">${msg}</p>`);
+    }
+
+    self.container = function() { return content; };
 
     self.onCancel = function(cb) {
       _cancel = cb;
@@ -4023,10 +4028,10 @@
 
     function render() {
       renderLayerList();
-      renderFileList();
+      renderSourceFileList();
     }
 
-    function renderFileList() {
+    function renderSourceFileList() {
       var list = el.findChild('.file-list');
       var files = [];
       list.empty();
@@ -5064,6 +5069,26 @@
     _stop = stop;
   }
 
+  // get detailed error information from error stack (if available)
+  // Example stack string (Node.js):
+  /*
+  /Users/someuser/somescript.js:226
+      opacity: Math.round(weight * 5 / 5 // 0.2 0.4 0.6 etc
+                                       ^
+
+  SyntaxError: missing ) after argument list
+      at internalCompileFunction (node:internal/vm:73:18)
+      at wrapSafe (node:internal/modules/cjs/loader:1149:20)
+      at Module._compile (node:internal/modules/cjs/loader:1190:27)
+      ...
+  */
+  function getErrorDetail(e) {
+    var parts = (typeof e.stack == 'string') ? e.stack.split(/\n\s*\n/) : [];
+    if (parts.length > 1 || true) {
+      return '\nError details:\n' + parts[0];
+    }
+    return '';
+  }
 
   // print a message to stdout
   function print() {
@@ -7993,8 +8018,7 @@
       // stash a function for refreshing the current popup when data changes
       // while the popup is being displayed (e.g. while dragging a label)
       refresh = function() {
-        var rec = table && (editable ? table.getRecordAt(id) : table.getReadOnlyRecordAt(id)) || {};
-        render(content, rec, table, editable);
+        render(content, id, table, editable);
       };
       refresh();
       if (ids && ids.length > 1) {
@@ -8033,7 +8057,8 @@
       tab.show();
     }
 
-    function render(el, rec, table, editable) {
+    function render(el, recId, table, editable) {
+      var rec = table && (editable ? table.getRecordAt(recId) : table.getReadOnlyRecordAt(recId)) || {};
       var tableEl = El('table').addClass('selectable'),
           rows = 0;
       // self.hide(); // clean up if panel is already open
@@ -8048,11 +8073,6 @@
         }
       });
 
-      // add new field form
-      if (editable) {
-        renderNewRow(tableEl, rec, table);
-      }
-
       tableEl.appendTo(el);
       if (rows > 0) {
         // tableEl.appendTo(el);
@@ -8077,15 +8097,58 @@
       }
 
       if (editable) {
+        // render "add field" button
         var line = El('div').appendTo(el);
         El('span').addClass('save-menu-btn').appendTo(line).on('click', async function(e) {
+          // show "add field" dialog
+          renderAddFieldPopup(recId, table);
+        }).text('+ add field');
+      }
+    }
+
+    function renderAddFieldPopup(recId, table) {
+      var popup = showPopupAlert('', 'Add field');
+      var el = popup.container();
+      el.addClass('option-menu');
+      var html = `<input type="text" class="field-name text-input" placeholder="field name"><br>
+    <input type="text" class="field-value text-input" placeholder="value"><br>
+    <div class="btn dialog-btn">Apply</div> <span class="inline-checkbox"><input type="checkbox" class="all" />assign value to all records</span>`;
+      el.html(html);
+
+      var name = el.findChild('.field-name');
+      name.node().focus();
+      var val = el.findChild('.field-value');
+      var box = el.findChild('.all');
+      var btn = el.findChild('.btn').on('click', function() {
+        var all = box.node().checked;
+        var nameStr = name.node().value.trim();
+        if (!nameStr) return;
+        if (table.fieldExists(nameStr)) {
+          name.node().value = '';
+          return;
+        }
+        var valStr = val.node().value.trim();
+        var value = parseUnknownType(valStr);
+        // table.addField(nameStr, function(d) {
+        //   // parse each time to avoid multiple references to objects
+        //   return (all || d == rec) ? parseUnknownType(valStr) : null;
+        // });
 
-        }).text('add field');
-      }
-    }
-
-    function renderNewRow(el, rec, table) {
+        var cmdStr = `-each "d['${nameStr}'] = `;
+        if (!all) {
+          cmdStr += `this.id != ${recId} ? null : `;
+        }
+        valStr = JSON.stringify(JSON.stringify(value));
+        cmdStr = valStr.replace('"', cmdStr);
 
+        gui.console.runMapshaperCommands(cmdStr, function(err) {
+          if (!err) {
+            popup.close();
+          } else {
+            console.error(err);
+          }
+        });
+      });
     }
 
     function renderRow(table, rec, key, type, editable) {
@@ -8121,12 +8184,10 @@
       input.on('change', function(e) {
         var val2 = parser(input.value()),
             strval2 = formatInspectorValue(val2, type);
-        if (strval == strval2) {
-          // contents unchanged
-        } else if (val2 === null && type != 'object') { // allow null objects
+        if (val2 === null && type != 'object') { // allow null objects
           // invalid value; revert to previous value
           input.value(strval);
-        } else {
+        } else if (strval != strval2) {
           // field content has changed
           strval = strval2;
           gui.dispatchEvent('data_preupdate', {FID: currId}); // for undo/redo
@@ -8191,6 +8252,14 @@
     }
   };
 
+  function parseUnknownType(str) {
+    var val = inputParsers.number(str);
+    if (val !== null) return val;
+    val = inputParsers.object(str);
+    if (val !== null) return val;
+    return str;
+  }
+
   function getInputParser(type) {
     return inputParsers[type || 'multiple'];
   }

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.41";
+  var VERSION = "0.6.42";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1267,6 +1267,26 @@
     _stop = stop;
   }
 
+  // get detailed error information from error stack (if available)
+  // Example stack string (Node.js):
+  /*
+  /Users/someuser/somescript.js:226
+      opacity: Math.round(weight * 5 / 5 // 0.2 0.4 0.6 etc
+                                       ^
+
+  SyntaxError: missing ) after argument list
+      at internalCompileFunction (node:internal/vm:73:18)
+      at wrapSafe (node:internal/modules/cjs/loader:1149:20)
+      at Module._compile (node:internal/modules/cjs/loader:1190:27)
+      ...
+  */
+  function getErrorDetail(e) {
+    var parts = (typeof e.stack == 'string') ? e.stack.split(/\n\s*\n/) : [];
+    if (parts.length > 1 || true) {
+      return '\nError details:\n' + parts[0];
+    }
+    return '';
+  }
 
   // print a message to stdout
   function print() {
@@ -1389,6 +1409,7 @@
     interrupt: interrupt,
     message: message,
     setLoggingFunctions: setLoggingFunctions,
+    getErrorDetail: getErrorDetail,
     print: print,
     verbose: verbose,
     debug: debug,
@@ -6359,9 +6380,10 @@
   function mergeDatasets(arr) {
     var arcSources = [],
         arcCount = 0,
-        mergedLayers = [],
-        mergedInfo = {},
-        mergedArcs;
+        merged = {
+          info: {},
+          layers: []
+        };
 
     // Error if incompatible CRS
     requireDatasetsHaveCompatibleCRS(arr);
@@ -6372,38 +6394,35 @@
         arcSources.push(dataset.arcs);
       }
 
-      mergeDatasetInfo(mergedInfo, dataset);
+      mergeDatasetInfo$1(merged, dataset);
       dataset.layers.forEach(function(lyr) {
         if (lyr.geometry_type == 'polygon' || lyr.geometry_type == 'polyline') {
           forEachArcId(lyr.shapes, function(id) {
             return id < 0 ? id - arcCount : id + arcCount;
           });
         }
-        mergedLayers.push(lyr);
+        merged.layers.push(lyr);
       });
       arcCount += n;
     });
 
     if (arcSources.length > 0) {
-      mergedArcs = mergeArcs(arcSources);
-      if (mergedArcs.size() != arcCount) {
+      merged.arcs = mergeArcs(arcSources);
+      if (merged.arcs.size() != arcCount) {
         error("[mergeDatasets()] Arc indexing error");
       }
     }
 
-    return {
-      info: mergedInfo,
-      arcs: mergedArcs,
-      layers: mergedLayers
-    };
+    return merged;
   }
 
-  function mergeDatasetInfo(merged, dataset) {
-    var info = dataset.info || {};
-    merged.input_files = utils.uniq((merged.input_files || []).concat(info.input_files || []));
-    merged.input_formats = utils.uniq((merged.input_formats || []).concat(info.input_formats || []));
+  function mergeDatasetInfo$1(merged, dataset) {
+    var src = dataset.info || {};
+    var dest = merged.info || (merged.info = {});
+    dest.input_files = utils.uniq((dest.input_files || []).concat(src.input_files || []));
+    dest.input_formats = utils.uniq((dest.input_formats || []).concat(src.input_formats || []));
     // merge other info properties (e.g. input_geojson_crs, input_delimiter, prj, crs)
-    utils.defaults(merged, info);
+    utils.defaults(dest, src);
   }
 
   function mergeArcs(arr) {
@@ -6450,6 +6469,7 @@
     mergeDatasetsForExport: mergeDatasetsForExport,
     mergeCommandTargets: mergeCommandTargets,
     mergeDatasets: mergeDatasets,
+    mergeDatasetInfo: mergeDatasetInfo$1,
     mergeArcs: mergeArcs
   });
 
@@ -6900,6 +6920,18 @@
     });
   }
 
+  // dest: destination dataset
+  // src: source dataset
+  function mergeDatasetInfo(dest, src) {
+    var srcInfo = src.info || {};
+    var destInfo = dest.info || (dest.info = {});
+    destInfo.input_files = utils.uniq((destInfo.input_files || []).concat(srcInfo.input_files || []));
+    destInfo.input_formats = utils.uniq((destInfo.input_formats || []).concat(srcInfo.input_formats || []));
+    // merge other info properties (e.g. input_geojson_crs, input_delimiter, prj, crs)
+    utils.defaults(destInfo, srcInfo);
+  }
+
+
   function splitApartLayers(dataset, layers) {
     var datasets = [];
     dataset.layers = dataset.layers.filter(function(lyr) {
@@ -7064,6 +7096,7 @@
   var DatasetUtils = /*#__PURE__*/Object.freeze({
     __proto__: null,
     splitDataset: splitDataset,
+    mergeDatasetInfo: mergeDatasetInfo,
     splitApartLayers: splitApartLayers,
     copyDataset: copyDataset,
     copyDatasetForExport: copyDatasetForExport,
@@ -11205,20 +11238,43 @@
     return dest;
   };
 
+  // Receives a directory path, in which the final subdirectory may include the
+  //   "*" wildcard, e.g. '.' 'data' '*' 'data/*' '2023-*'
+  // Returns an array of expanded directory names
+  // TODO: add support for wildcards in other subdirectories
+  cli.expandDirectoryName = function(name) {
+    var info = parseLocalPath(name);
+    // final directory name is parsed as info.filename
+    if (!info.filename.includes('*')) {
+      return [name];
+    }
+    var rxp = utils.wildcardToRegExp(info.filename);
+    var dirs = [];
+    require$1('fs').readdirSync(info.directory || '.').forEach(function(item) {
+      var path = info.directory ? require$1('path').join(info.directory, item) : item;
+      if (rxp.test(item) && cli.isDirectory(path)) {
+        dirs.push(path);
+      }
+    });
+    return dirs;
+  };
+
   // Expand any "*" wild cards in file name
   // (For the Windows command line; unix shells do this automatically)
   cli.expandFileName = function(name) {
     var info = parseLocalPath(name),
         rxp = utils.wildcardToRegExp(info.filename),
-        dir = info.directory || '.',
+        dirs = cli.expandDirectoryName(info.directory || '.'),
         files = [];
 
     try {
-      require$1('fs').readdirSync(dir).forEach(function(item) {
-        var path = require$1('path').join(dir, item);
-        if (rxp.test(item) && cli.isFile(path)) {
-          files.push(path);
-        }
+      dirs.forEach(function(dir) {
+        require$1('fs').readdirSync(dir).forEach(function(item) {
+          var path = require$1('path').join(dir, item);
+          if (rxp.test(item) && cli.isFile(path)) {
+            files.push(path);
+          }
+        });
       });
     } catch(e) {}
 
@@ -28239,20 +28295,23 @@ ${svg}
     };
 
     this.setDefaultTarget = function(layers, dataset) {
-      if (datasets.indexOf(dataset) == -1) {
-        datasets.push(dataset);
-      }
-      defaultTargets = [{
+      this.setDefaultTargets([{
         // Copy layers array, in case layers is a reference to dataset.layers.
         // This prevents layers that are added to the dataset inside a command from
         //  being added to the next command's target, e.g. debugging layers added
         //  by '-join unmatched unjoined'.
         layers: layers.concat(),
         dataset: dataset
-      }];
+      }]);
     };
 
+    // arr: array of target objects {layers:[], dataset:{}}
     this.setDefaultTargets = function(arr) {
+      arr.forEach(function(target) {
+        if (datasets.indexOf(target.dataset) == -1) {
+          datasets.push(target.dataset);
+        }
+      });
       defaultTargets = arr;
     };
 
@@ -28345,6 +28404,30 @@ ${svg}
     stashVar('input_files', job.input_files);
   }
 
+  // Apply a command to an array of target layers
+  function applyCommandToEachLayer(func, targetLayers) {
+    var args = utils.toArray(arguments).slice(2);
+    return targetLayers.reduce(function(memo, lyr) {
+      var result = func.apply(null, [lyr].concat(args));
+      if (utils.isArray(result)) { // some commands return an array of layers
+        memo = memo.concat(result);
+      } else if (result) { // assuming result is a layer
+        memo.push(result);
+      }
+      return memo;
+    }, []);
+  }
+
+  function applyCommandToEachTarget(func, targets) {
+    var args = utils.toArray(arguments).slice(2);
+    targets.forEach(function(target) {
+      var result = func.apply(null, [target].concat(args));
+      if (result) {
+        error('Unexpected output from command');
+      }
+    });
+  }
+
   cmd.addShape = addShape;
 
   function addShape(targetLayers, targetDataset, opts) {
@@ -36290,6 +36373,7 @@ ${svg}
     var opts = parseExternalCommand(name, cmdDefn, cmdOpts._);
     var targets = catalog.findCommandTargets(opts.target || '*');
     var target = targets[0];
+    var output;
     if (!target) {
       stop('Missing a target');
     }
@@ -36300,12 +36384,34 @@ ${svg}
       stop("Targetting layers from multiple datasets is not supported");
     }
     if (targetType == 'layer') {
-      cmdDefn.command(target.layers[0], target.dataset, opts.options);
+      output = cmdDefn.command(target.layers[0], target.dataset, opts.options);
     } else if (targetType == 'layers') {
-      cmdDefn.command(target.layers, target.dataset, opts.options);
+      output = cmdDefn.command(target.layers, target.dataset, opts.options);
+    }
+    if (output) {
+      integrateOutput(output, target, catalog, opts);
     }
   };
 
+  // TODO: remove restrictions on output data
+  function integrateOutput(output, input, catalog, opts) {
+    if (!output.dataset || !output.layers || output.layers.length > 0 === false) {
+      stop('Invalid command output');
+    }
+    if (output.dataset == input.dataset) {
+      stop('External commands are not currently allowed to modify input datasets');
+    }
+    if (output.dataset.layers.length != output.layers.length) {
+      stop('Currently not supported: targetting a subset of output layers');
+    }
+    if (!opts.no_replace) {
+      input.layers.forEach(function(lyr) {
+        catalog.deleteLayer(lyr, input.dataset);
+      });
+    }
+    catalog.addDataset(output.dataset);
+  }
+
   function parseExternalCommand(name, cmdDefn, tokens) {
     var parser = new CommandParser();
     var cmd = parser.command(name);
@@ -40720,7 +40826,8 @@ ${svg}
   function makeCircleCoords(center, opts) {
     var margin = opts.cell_margin > 0 ? opts.cell_margin : 1e-6;
     var radius = opts.interval / 2 * (1 - margin);
-    return getPointBufferCoordinates(center, radius, 20, getPlanarSegmentEndpoint);
+    var vertices = opts.vertices || 20;
+    return getPointBufferCoordinates(center, radius, vertices, getPlanarSegmentEndpoint);
   }
 
   // Returns a function that receives a cell index and returns indices of points
@@ -40731,12 +40838,15 @@ ${svg}
     var bboxIndex = new Flatbush(points.length);
     var empty = [];
     points.forEach(function(p) {
+      var bbox = getPointBounds(p, radius);
       addPointToGridIndex(p, gridIndex, grid);
-      bboxIndex.add.apply(bboxIndex, getPointBounds(p, radius));
+      bboxIndex.add.apply(bboxIndex, bbox);
     });
     bboxIndex.finish();
     return function(i) {
-      if (!gridIndex.hasId(i)) return empty;
+      if (!gridIndex.hasId(i)) {
+        return empty;
+      }
       var bbox = grid.idxToBBox(i);
       var indices = bboxIndex.search.apply(bboxIndex, bbox);
       return indices;
@@ -40870,6 +40980,7 @@ ${svg}
     calcWeights: calcWeights,
     twoCircleIntersection: twoCircleIntersection,
     makeCellPolygon: makeCellPolygon,
+    makeCircleCoords: makeCircleCoords,
     getPointIndex: getPointIndex,
     getAlignedGridBounds: getAlignedGridBounds,
     getCenteredGridBounds: getCenteredGridBounds,
@@ -41198,8 +41309,7 @@ ${svg}
         }
       }
     } catch(e) {
-      // stop(e);
-      stop('Unable to load external module:', e.message);
+      stop('Unable to load external module:', e.message, getErrorDetail(e));
     }
     if (moduleName || opts.alias) {
       defs[opts.alias || moduleName] = mod;
@@ -42230,9 +42340,10 @@ ${svg}
     }
   };
 
-  cmd.snap = function(dataset, opts) {
+  cmd.snap = function(target, opts) {
     var interval = 0;
     var snapCount = 0;
+    var dataset = target.dataset;
     var arcs = dataset.arcs;
     var arcBounds = arcs && arcs.getBounds();
     if (!arcBounds || !arcBounds.hasBounds()) {
@@ -43367,7 +43478,7 @@ ${svg}
   function commandAcceptsMultipleTargetDatasets(name) {
     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';
+      name == 'else' || name == 'endif' || name == 'run' || name == 'i' || name == 'snap';
   }
 
   function commandAcceptsEmptyTarget(name) {
@@ -43449,6 +43560,10 @@ ${svg}
         source = findCommandSource(convertSourceName(opts.source, targets), job.catalog, opts);
       }
 
+      // identify command target/input (for postprocessing)
+      // TODO: support commands with multiple target datasets
+      // target = name == 'i' ? null : targets[0];
+
       if (name == 'add-shape') {
         if (!targetDataset) {
           targetDataset = {info: {}, layers: []};
@@ -43556,6 +43671,9 @@ ${svg}
       } else if (name == 'graticule') {
         job.catalog.addDataset(cmd.graticule(targetDataset, opts));
 
+      } else if (name == 'grid') {
+        outputDataset = cmd.polygonGrid(targetLayers, targetDataset, opts);
+
       } else if (name == 'help') {
         // placing help command here to handle errors from invalid command names
         cmd.printHelp(command.options);
@@ -43627,9 +43745,6 @@ ${svg}
       } else if (name == 'point-to-grid') {
         outputLayers = cmd.pointToGrid(targetLayers, targetDataset, opts);
 
-      } else if (name == 'grid') {
-        outputDataset = cmd.polygonGrid(targetLayers, targetDataset, opts);
-
       } else if (name == 'points') {
         outputLayers = applyCommandToEachLayer(cmd.createPointLayer, targetLayers, targetDataset, opts);
 
@@ -43693,7 +43808,8 @@ ${svg}
         outputLayers = cmd.sliceLayers(targetLayers, source, targetDataset, opts);
 
       } else if (name == 'snap') {
-        cmd.snap(targetDataset, opts);
+        // cmd.snap(targetDataset, opts);
+        applyCommandToEachTarget(targets, opts);
 
       } else if (name == 'sort') {
         applyCommandToEachLayer(cmd.sortFeatures, targetLayers, arcs, opts);
@@ -43784,9 +43900,12 @@ ${svg}
 
       // delete arcs if no longer needed (e.g. after -points command)
       // (after output layers have been integrated)
+      // TODO: be more selective (e.g. -i command doesn't need cleanup)
+      //   or: detect if arcs have been changed
       if (targetDataset) {
         cleanupArcs(targetDataset);
       }
+
     } catch(e) {
       return done(e);
     }
@@ -43808,20 +43927,6 @@ ${svg}
     });
   }
 
-  // Apply a command to an array of target layers
-  function applyCommandToEachLayer(func, targetLayers) {
-    var args = utils.toArray(arguments).slice(2);
-    return targetLayers.reduce(function(memo, lyr) {
-      var result = func.apply(null, [lyr].concat(args));
-      if (utils.isArray(result)) { // some commands return an array of layers
-        memo = memo.concat(result);
-      } else if (result) { // assuming result is a layer
-        memo.push(result);
-      }
-      return memo;
-    }, []);
-  }
-
   // 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.
   //   function(argv[, input], callback)
@@ -44465,6 +44570,7 @@ ${svg}
     editArcs,
     GeoJSONReader,
     Heap,
+    IdLookupIndex,
     NodeCollection,
     parseDMS,
     formatDMS,

package/www/page.css

@@ -256,7 +256,7 @@ body {
 
 /* --- Error message ---------- */
 
-.error-wrapper {
+.alert-wrapper {
 	z-index: 120;
 	text-align: center;
 	position: absolute;
@@ -266,29 +266,33 @@ body {
 	left: 0;
 }
 
-.error-wrapper p.error-message {
+.alert-wrapper p.error-message {
 	margin: 1px 0 0 0;
 }
 
-.error-wrapper .dialog-btn {
-	margin-top: 8px;
-}
-
-.error-title {
+.alert-title {
 	line-height: 1.1;
 	font-weight: bold;
 	margin-bottom: 5px;
 }
 
-div.error-box {
+div.alert-title, div.error-message {
+	font-size: 16px;
+}
+
+.alert-wrapper .alert-btn {
+	margin-top: 8px;
+}
+
+div.alert-box {
 	margin-top: 42px; /* 55px; */
 	overflow: auto;
 	max-height: 70%;
 	max-width: 400px;
-	font-size: 16px;
 }
 
 
+
 /* --- Splash screen -------------- */
 
 .splash-screen #splash-screen {
@@ -513,7 +517,7 @@ body.dragover #import-options-drop-area .drop-area {
 	text-align: left;
 	margin-top: 12px;
 	margin-right: 20px;
-	padding: 12px 16px 12px 18px;
+	padding: 11px 16px 12px 18px;
 	vertical-align: top;
 	display: inline-block;
 	/* border: 1px solid #aaa; */
@@ -553,6 +557,7 @@ body.dragover #import-options-drop-area .drop-area {
 	top: 1px;
 	width: 12px;
 	height: 12px;
+	cursor: pointer;
 }
 
 .info-box .tip-button {
@@ -800,7 +805,7 @@ img.close-btn {
 	float: right;
 	height:  18px;
 	width:  18px;
-	margin-top: 1px;
+	/* margin-top: 1px; */
 	margin-right: -3px;
 	cursor: pointer;
 	border-radius: 4px;
@@ -1227,13 +1232,16 @@ div.basemap-style-btn.active img {
 	top: 23px;
 }
 
-#save-preference {
-	display: none;
+.inline-checkbox {
 	position: relative;
 	top: 1px;
 	left: 5px;
 }
 
+#save-preference {
+	/* display: none; */
+}
+
 .nav-sub-menu {
 	position: absolute;
 	z-index: -1; 
@@ -1316,25 +1324,32 @@ div.basemap-style-btn.active img {
 	background: white;
 }
 
-.save-menu-btn {
+/*.save-menu-btn {
 	display: inline-block;
 	border-radius: 4px;
 	border: 1px solid #aaa;
 	font-size: 12px;
 	margin-left: 2px;
 	padding: 1px 2px 3px 2px;
-}
+}*/
 
-.save-menu-link,
 .save-menu-btn {
-	cursor: pointer;
+	display: inline-block;
+	font-size: 12px;
+	margin-top: 2px;
 }
 
 .save-menu-btn:hover {
-	background: #e6f7ff;
 	color: black;
 }
 
+.save-menu-link,
+.save-menu-btn {
+	cursor: pointer;
+}
+
+
+
 .save-menu-link:hover {
 	/* background: #e6f7ff; */
 	font-weight: bold;