mapshaper 0.6.52 → 0.6.54

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.52";
+  var VERSION = "0.6.54";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -11075,7 +11075,7 @@
   }
 
   function isGzipFile(file) {
-    return /\.gz/i.test(file);
+    return /\.gz$/i.test(file);
   }
 
   function isSupportedOutputFormat(fmt) {
@@ -23703,14 +23703,14 @@ ${svg}
       .option('geojson-type', {
         describe: '[GeoJSON] FeatureCollection, GeometryCollection or Feature'
       })
-      .option('ndjson', {
-        describe: '[GeoJSON/JSON] output newline-delimited features or records',
-        type: 'flag'
-      })
       .option('hoist', {
         describe: '[GeoJSON] move properties to the root level of each Feature',
         type: 'strings'
       })
+      .option('ndjson', {
+        describe: '[GeoJSON/JSON] output newline-delimited features or records',
+        type: 'flag'
+      })
       .option('width', {
         describe: '[SVG/TopoJSON] pixel width of output (SVG default is 800)',
         type: 'number'
@@ -23865,10 +23865,6 @@ ${svg}
         describe: 'a pair of values (0-100) for limiting a color ramp',
         type: 'numbers'
       })
-      .option('range', {
-        // describe: 'a pair of numbers defining the effective data range',
-        type: 'numbers'
-      })
       .option('null-value', {
         describe: 'value (or color) to use for invalid or missing data'
       })
@@ -23895,6 +23891,11 @@ ${svg}
         describe: 'user-defined sequential class breaks',
         type: 'numbers'
       })
+      .option('outer-breaks', {
+        describe: 'min,max breakpoints, to limit the effect of outliers',
+        old_alias: 'range',
+        type: 'numbers'
+      })
       .option('classes', {
         describe: 'number of classes (can be inferred from other options)',
         type: 'integer'
@@ -23904,7 +23905,7 @@ ${svg}
         type: 'flag'
       })
       .option('continuous', {
-        describe: 'output continuous interpolated values (experimental)',
+        describe: 'output interpolated values, for unclassed colors',
         type: 'flag'
       })
       .option('index-field', {
@@ -25337,7 +25338,7 @@ ${svg}
       .describe('create commands on-the-fly and run them')
       .option('expression', {
         DEFAULT: true,
-        describe: 'JS expression to generate command(s)'
+        describe: 'JS expression or template to generate command(s)'
       })
       // deprecated
       .option('commands', {alias_to: 'expression'})
@@ -32134,23 +32135,22 @@ ${svg}
     }
 
     var ascending = getAscendingNumbers(dataValues);
-    if (opts.range) {
-      ascending = applyDataRange(ascending, opts.range);
+    if (opts.outer_breaks) {
+      ascending = applyDataRange(ascending, opts.outer_breaks);
     }
     var nullCount = dataValues.length - ascending.length;
     var minVal = ascending[0];
     var maxVal = ascending[ascending.length - 1];
 
-    // kludge
-    var clamp = opts.range ? function(val) {
-      if (val < opts.range[0]) val = opts.range[0];
-      if (val > opts.range[1]) val = opts.range[1];
+    var clamp = opts.outer_breaks ? function(val) {
+      if (val < opts.outer_breaks[0]) val = opts.outer_breaks[0];
+      if (val > opts.outer_breaks[1]) val = opts.outer_breaks[1];
       return val;
     } : null;
 
-    if (opts.range) {
-      minVal = opts.range[0];
-      maxVal = opts.range[1];
+    if (opts.outer_breaks) {
+      minVal = opts.outer_breaks[0];
+      maxVal = opts.outer_breaks[1];
     }
 
     if (numBreaks === 0) {
@@ -41842,6 +41842,185 @@ ${svg}
     }, {});
   }
 
+  // import { importGeoJSON } from '../geojson/geojson-import';
+
+  function getTargetProxy(target) {
+    var lyr = target.layers[0];
+    var data = getLayerInfo(lyr, target.dataset); // layer_name, feature_count etc
+    data.layer = lyr;
+    data.dataset = target.dataset;
+    addGetters(data, {
+      // export as an object, not a string or buffer
+      geojson: getGeoJSON
+    });
+
+    function getGeoJSON() {
+      var features = exportLayerAsGeoJSON(lyr, target.dataset, {rfc7946: true}, true);
+      return {
+        type: 'FeatureCollection',
+        features: features
+      };
+    }
+
+    return data;
+  }
+
+  // Support for evaluating expressions embedded in curly-brace templates
+
+  // Returns: a string (e.g. a command string used by the -run command)
+  async function evalTemplateExpression(expression, targets, ctx) {
+    ctx = ctx || getBaseContext();
+    // TODO: throw an error if target is used when there are multiple targets
+    if (targets && targets.length == 1) {
+      Object.defineProperty(ctx, 'target', {value: getTargetProxy(targets[0])});
+    }
+    // Add global functions and data to the expression context
+    // (e.g. functions imported via the -require command)
+    var globals = getStashedVar('defs') || {};
+    ctx.global = globals;
+    utils.extend(ctx, ctx.global);
+
+    var output = await compileTemplate(expression, ctx);
+    if (hasFunctionCall(output, ctx)) {
+      // also evaluate function calls that are not enclosed in curly braces
+      // (convenience syntax)
+      output = await evalExpression(output, ctx);
+    }
+    return output;
+  }
+
+  async function compileTemplate(template, ctx) {
+    var subExpressions = parseTemplate(template);
+    var promises = subExpressions.map(expr => evalExpression(expr, ctx));
+    var replacements = await Promise.all(promises);
+    return applyReplacements(template, replacements);
+  }
+
+  async function evalExpression(expression, ctx) {
+    var output;
+    try {
+      output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
+    } catch(e) {
+      stop(e.name, 'in JS source:', e.message);
+    }
+    return output;
+  }
+
+  // Returns array of 0 or more embedded curly-brace expressions
+  function parseTemplate(str) {
+    var arr = [];
+    parseTemplateParts(str).forEach(function(s, i) {
+      if (i % 2 == 1) {
+        arr.push(s.substring(1, s.length-1)); // remove braces
+      }
+    });
+    return arr;
+  }
+
+  // template: template string
+  // replacements: array of strings or values that can be coerced to strings
+  function applyReplacements(template, replacements) {
+    var parts = parseTemplateParts(template);
+    return parts.reduce(function(memo, s, i) {
+      return i % 2 == 1 ? memo + (replacements.shift() || '') : memo + s;
+    }, '');
+  }
+
+  // Divides a string into substrings; even-index strings contain literal strings,
+  // Odd-indexed strings contain curly-brace-delimited template expressions.
+  // JSON objects are treated as literal strings; other top-level curly braces are
+  //    assumed to be embedded expressions.
+  // For example:  parseTemplateParts('{"hello"}, world!') => ['', '{"hello"}', ', world!']
+  //
+  function parseTemplateParts(str) {
+    // TODO: consider adding \ escapes
+    var depth=0;
+    var parts = [];
+    var part = '';
+    var c;
+
+    for (var i=0, n=str.length; i<n; i++) {
+      c = str.charAt(i);
+      if (c == '{') {
+        if (depth == 0) {
+          parts.push(part);
+          part = '';
+        }
+        depth++;
+      }
+      part += c;
+      if (c == '}') {
+        depth--;
+        if (depth < 0) {
+          // unexpected... throw an error?
+          depth++;
+        } else if (depth == 0 && isValidJSON(part)) {
+          // embedded JSON objects are not template parts -- undo
+          part = parts.pop() + part;
+        } else if (depth == 0) {
+          parts.push(part);
+          part = '';
+        }
+      }
+    }
+    parts.push(part);
+    return parts;
+  }
+
+  // Tests if an expression string contains a call to an indexed function
+  // defs: Object containing functions indexed by function name
+  function hasFunctionCall(str, defs) {
+    var rxp = /([$_a-z][$_a-z0-9]*)\(/ig;
+    return Array.from(str.matchAll(rxp)).some(match => match[1] in defs);
+  }
+
+  function isValidJSON(str) {
+    try {
+      JSON.parse(str);
+    } catch(e) {
+      return false;
+    }
+    return true;
+  }
+
+  cmd.require = async function(targets, opts) {
+    var defs = getStashedVar('defs');
+    var moduleFile, moduleName, mod;
+    if (!opts.module) {
+      stop("Missing module name or path to module");
+    }
+    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 && !require$1('path').isAbsolute(moduleFile)) {
+      moduleFile = require$1('path').join(process.cwd(), moduleFile);
+    }
+    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('Unable to load external module:', e.message, getErrorDetail(e));
+    }
+    if (moduleName || opts.alias) {
+      defs[opts.alias || moduleName] = mod;
+    } else {
+      Object.assign(defs, mod);
+    }
+    if (opts.init) {
+      await evalTemplateExpression(opts.init, targets);
+    }
+  };
+
   // Parse an array or a string of command line tokens into an array of
   // command objects.
   function parseCommands(tokens) {
@@ -41894,29 +42073,6 @@ ${svg}
     parseConsoleCommands: parseConsoleCommands
   });
 
-  // import { importGeoJSON } from '../geojson/geojson-import';
-
-  function getTargetProxy(target) {
-    var lyr = target.layers[0];
-    var data = getLayerInfo(lyr, target.dataset); // layer_name, feature_count etc
-    data.layer = lyr;
-    data.dataset = target.dataset;
-    addGetters(data, {
-      // export as an object, not a string or buffer
-      geojson: getGeoJSON
-    });
-
-    function getGeoJSON() {
-      var features = exportLayerAsGeoJSON(lyr, target.dataset, {rfc7946: true}, true);
-      return {
-        type: 'FeatureCollection',
-        features: features
-      };
-    }
-
-    return data;
-  }
-
   function getIOProxy(job) {
     var obj = {
       _cache: {}
@@ -41955,20 +42111,14 @@ ${svg}
   // }
 
   cmd.run = async function(job, targets, opts) {
-    var tmp, commands;
+    var tmp, commands, ctx;
     if (!opts.expression) {
       stop("Missing expression parameter");
     }
-
+    ctx = getBaseContext();
     // io proxy adds ability to add datasets dynamically in a required function
-    var ctx = getBaseContext();
     ctx.io = getIOProxy();
-    tmp = runGlobalExpression(opts.expression, targets, ctx);
-
-    // Support async functions as expressions
-    if (utils.isPromise(tmp)) {
-      tmp = await tmp;
-    }
+    tmp = await evalTemplateExpression(opts.expression, targets, ctx);
     if (tmp && !utils.isString(tmp)) {
       stop('Expected a string containing mapshaper commands; received:', tmp);
     }
@@ -41987,63 +42137,6 @@ ${svg}
     }
   };
 
-  // This could return a Promise or a value or nothing
-  function runGlobalExpression(expression, targets, ctx) {
-    ctx = ctx || getBaseContext();
-    var output;
-    // TODO: throw an informative error if target is used when there are multiple targets
-    if (targets && targets.length == 1) {
-      Object.defineProperty(ctx, 'target', {value: getTargetProxy(targets[0])});
-    }
-    // Add defined functions and data to the expression context
-    // (Such as functions imported via the -require command)
-    utils.extend(ctx, getStashedVar('defs'));
-    try {
-      output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
-    } catch(e) {
-      stop(e.name, 'in JS source:', e.message);
-    }
-    return output;
-  }
-
-  cmd.require = function(targets, opts) {
-    var defs = getStashedVar('defs');
-    var moduleFile, moduleName, mod;
-    if (!opts.module) {
-      stop("Missing module name or path to module");
-    }
-    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 && !require$1('path').isAbsolute(moduleFile)) {
-      moduleFile = require$1('path').join(process.cwd(), moduleFile);
-    }
-    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('Unable to load external module:', e.message, getErrorDetail(e));
-    }
-    if (moduleName || opts.alias) {
-      defs[opts.alias || moduleName] = mod;
-    } else {
-      Object.assign(defs, mod);
-    }
-    if (opts.init) {
-      runGlobalExpression(opts.init, targets);
-    }
-  };
-
   cmd.shape = function(targetDataset, opts) {
     var geojson, dataset;
     if (opts.coordinates) {

package/package.json

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

package/www/index.html

@@ -276,27 +276,11 @@ a smoother appearance.</div></div></div></div>
 		
 		<div class="option-menu">
 
-			<div id="path-import-options">
-				<h4>Options</h4>
-
-				<div><label for="repair-intersections-opt"><input type="checkbox" checked class="checkbox" id="repair-intersections-opt"/>detect line intersections</label>
-				<div class="tip-button">?<div class="tip-anchor">
-
-<div class="tip">Detect line intersections, including
-self-intersections, to help identify
-topological errors in a dataset.</div></div></div></div>
-
-				<!-- <div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
-				<div class="tip-button">?<div class="tip-anchor">
-<div class="tip">Fix topology errors by snapping
-together points with nearly identical
-coordinates. This option does not
-apply to TopoJSON files.</div></div></div></div> -->
-<div style="height:5px"></div>
-
+		<div id="path-import-options">
+			<h4>Options</h4>
 		</div>
 
-		<div><input type="text" class="text-input advanced-options" placeholder="import options" />
+		<div><input type="text" class="text-input advanced-options" placeholder="command line import options" />
 			<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-i-input" target="_mapshaper_import_docs">
 			<div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Enter options from the command line
@@ -324,6 +308,7 @@ encoding=big5</span>. Click to see all options.</div></div></div></div>
 	<div class="mshp-main-map main-area map-area">
 		<div class="coordinate-info colored-text selectable"></div>
 		<div class="intersection-display">
+			<div class="intersection-check text-btn colored-text">Check line intersections</div>
 			<div class="intersection-count">0 line intersections</div>
 			<div class="repair-btn text-btn colored-text">Repair</div>
 		</div>

package/www/mapshaper-gui.js

@@ -2101,8 +2101,6 @@
       } else {
         var freeform = El('#import-options .advanced-options').node().value;
         importOpts = GUI.parseFreeformOptions(freeform, 'i');
-        importOpts.no_repair = !El("#repair-intersections-opt").node().checked;
-        // importOpts.snap = !!El("#snap-points-opt").node().checked;
       }
       return importOpts;
     }
@@ -3495,117 +3493,208 @@
 
   }
 
+  // Test if map should be re-framed to show updated layer
+  function mapNeedsReset(newBounds, prevBounds, viewportBounds, flags) {
+    var viewportPct = getIntersectionPct(newBounds, viewportBounds);
+    var contentPct = getIntersectionPct(viewportBounds, newBounds);
+    var boundsChanged = !prevBounds.equals(newBounds);
+    var inView = newBounds.intersects(viewportBounds);
+    var areaChg = newBounds.area() / prevBounds.area();
+    var chgThreshold = flags.proj ? 1e3 : 1e8;
+    // don't reset if layer extent hasn't changed
+    if (!boundsChanged) return false;
+    // reset if layer is out-of-view
+    if (!inView) return true;
+    // reset if content is mostly offscreen
+    if (viewportPct < 0.3 && contentPct < 0.9) return true;
+    // reset if content bounds have changed a lot (e.g. after projection)
+    if (areaChg > chgThreshold || areaChg < 1/chgThreshold) return true;
+    return false;
+  }
+
+  // Test if an update may have affected the visible shape of arcs
+  // @flags Flags from update event
+  function arcsMayHaveChanged(flags) {
+    return flags.simplify_method || flags.simplify || flags.proj ||
+      flags.arc_count || flags.repair || flags.clip || flags.erase ||
+      flags.slice || flags.affine || flags.rectangle || flags.buffer ||
+      flags.union || flags.mosaic || flags.snap || flags.clean || flags.drop || false;
+  }
+
+  // check for operations that may change the number of self intersections in the
+  // target layer.
+  function intersectionsMayHaveChanged(flags) {
+    return arcsMayHaveChanged(flags) || flags.select || flags['merge-layers'] ||
+    flags.filter || flags.dissolve || flags.dissolve2;
+  }
+
+  // Test if an update allows hover popup to stay open
+  function popupCanStayOpen(flags) {
+    // keeping popup open after -drop geometry causes problems...
+    // // if (arcsMayHaveChanged(flags)) return false;
+    if (arcsMayHaveChanged(flags)) return false;
+    if (flags.points || flags.proj) return false;
+    if (!flags.same_table) return false;
+    return true;
+  }
+
+  // Returns proportion of bb2 occupied by bb1
+  function getIntersectionPct(bb1, bb2) {
+    return getBoundsIntersection(bb1, bb2).area() / bb2.area() || 0;
+  }
+
+  function getBoundsIntersection(a, b) {
+    var c = new Bounds();
+    if (a.intersects(b)) {
+      c.setBounds(Math.max(a.xmin, b.xmin), Math.max(a.ymin, b.ymin),
+      Math.min(a.xmax, b.xmax), Math.min(a.ymax, b.ymax));
+    }
+    return c;
+  }
+
   function RepairControl(gui) {
     var map = gui.map,
         model = gui.model,
         el = gui.container.findChild(".intersection-display"),
         readout = el.findChild(".intersection-count"),
+        checkBtn = el.findChild(".intersection-check"),
         repairBtn = el.findChild(".repair-btn"),
-        // keeping a reference to current arcs and intersections, so intersections
-        // don't need to be recalculated when 'repair' button is pressed.
-        _currArcs,
-        _currLayer,
-        _currXX;
+        _simplifiedXX, // saved simplified intersections, for repair
+        _unsimplifiedXX, // saved unsimplified intersection data, for performance
+        _disabled = false;
 
-    gui.on('simplify_drag_start', hide);
-    gui.on('simplify_drag_end', updateAsync);
-
-    model.on('update', function(e) {
-      var flags = e.flags;
-      var intersectionsMayHaveChanged = flags.simplify || flags.proj ||
-          flags.arc_count || flags.snap || flags.affine || flags.points || flags['merge-layers'];
-      if (intersectionsMayHaveChanged) {
-        // delete any cached intersection data, to trigger re-calculation
-        e.dataset._intersections = null;
-        updateAsync();
-      } else if (flags.select) {
-        // new active layer, but no editing commands were run -- use cached intersections (if available)
-        updateAsync();
+    gui.on('simplify_drag_start', function() {
+      if (intersectionsAreOn()) {
+        hide();
       }
     });
 
+    gui.on('simplify_drag_end', function() {
+      updateAsync();
+    });
+
+    checkBtn.on('click', function() {
+      checkBtn.hide();
+      refreshSync();
+    });
+
     repairBtn.on('click', function() {
-      _currXX = internal.repairIntersections(_currArcs, _currXX);
-      showIntersections();
-      repairBtn.addClass('disabled');
+      var e = model.getActiveLayer();
+      if (!_simplifiedXX || !e.dataset.arcs) return;
+      var xx = _simplifiedXX = internal.repairIntersections(e.dataset.arcs, _simplifiedXX);
+      showIntersections(xx, e.layer, e.dataset.arcs);
+      repairBtn.hide();
       model.updated({repair: true});
       gui.session.simplificationRepair();
     });
 
-    function hide() {
-      el.hide();
-      map.setIntersectionLayer(null);
+    model.on('update', function(e) {
+      if (!intersectionsAreOn()) {
+        reset(); // need this?
+        return;
+      }
+      var needRefresh = e.flags.simplify_method || e.flags.simplify || e.flags.repair;
+      if (needRefresh) {
+        updateAsync();
+      } else if (e.flags.simplify_amount) {
+        // slider is being dragged - hide readout and dots, retain data
+        hide();
+      } else if (intersectionsMayHaveChanged(e.flags)) {
+        // intersections may have changed -- reset the display
+        reset();
+      } else {
+        // keep displaying the current intersections
+      }
+    });
+
+    function intersectionsAreOn() {
+      return !!(_simplifiedXX || _unsimplifiedXX);
     }
 
-    function enabledForDataset(dataset) {
-      var info = dataset.info || {};
-      var opts = info.import_options || {};
-      return !opts.no_repair && !info.no_intersections;
+    function clearSavedData() {
+      _simplifiedXX = null;
+      _unsimplifiedXX = null;
     }
 
-    // Delay intersection calculation, so map can redraw after previous
-    // operation (e.g. layer load, simplification change)
+    function reset() {
+      clearSavedData();
+      hide();
+      if (_disabled) {
+        return;
+      }
+      var e = model.getActiveLayer();
+      if (internal.layerHasPaths(e.layer)) {
+        el.show();
+        checkBtn.show();
+        readout.hide();
+        repairBtn.hide();
+      }
+    }
+
+    function dismissForever() {
+      _disabled = true;
+      clearSavedData();
+      hide();
+    }
+
+    function hide() {
+      map.setIntersectionLayer(null);
+      el.hide();
+    }
+
+    // Update intersection display, after a short delay so map can redraw after previous
+    // operation (e.g. simplification change)
     function updateAsync() {
-      reset();
-      setTimeout(updateSync, 10);
+      if (intersectionsAreOn()) {
+        setTimeout(refreshSync, 10);
+      }
     }
 
-    function updateSync() {
+    function refreshSync() {
       var e = model.getActiveLayer();
-      var dataset = e.dataset;
-      var arcs = dataset && dataset.arcs;
-      var XX, showBtn;
-      var opts = {
+      var arcs = e.dataset && e.dataset.arcs;
+      var intersectionOpts = {
         unique: true,
         tolerance: 0
       };
-      if (!arcs || !internal.layerHasPaths(e.layer) || !enabledForDataset(dataset)) return;
+      if (!arcs || !internal.layerHasPaths(e.layer)) {
+        return;
+      }
       if (arcs.getRetainedInterval() > 0) {
-        // TODO: cache these intersections
-        XX = internal.findSegmentIntersections(arcs, opts);
-        showBtn = XX.length > 0;
-      } else { // no simplification
-        XX = dataset._intersections;
-        if (!XX) {
-          // cache intersections at 0 simplification, to avoid recalculating
+        _simplifiedXX = internal.findSegmentIntersections(arcs, intersectionOpts);
+      } else {
+        // no simplification
+        _simplifiedXX = null; // clear old simplified XX
+        if (!_unsimplifiedXX) {
+          // save intersections at 0 simplification, to avoid recalculating
           // every time the simplification slider is set to 100% or the layer is selected at 100%
-          XX = dataset._intersections = internal.findSegmentIntersections(arcs, opts);
+          _unsimplifiedXX = internal.findSegmentIntersections(arcs, intersectionOpts);
         }
-        showBtn = false;
       }
-      el.show();
-      _currLayer = e.layer;
-      _currArcs = arcs;
-      _currXX = XX;
-      showIntersections();
-      repairBtn.classed('disabled', !showBtn);
+      showIntersections(_simplifiedXX || _unsimplifiedXX, e.layer, arcs);
     }
 
-    function reset() {
-      _currArcs = null;
-      _currXX = null;
-      _currLayer = null;
-      hide();
-    }
-
-    function dismiss() {
-      var dataset = model.getActiveLayer().dataset;
-      dataset._intersections = null;
-      dataset.info.no_intersections = true;
-      reset();
-    }
-
-    function showIntersections() {
-      var n = _currXX.length, pointLyr;
-      if (n > 0) {
-        // console.log("first intersection:", internal.getIntersectionDebugData(XX[0], arcs));
-        pointLyr = internal.getIntersectionLayer(_currXX, _currLayer, _currArcs);
+    function showIntersections(xx, lyr, arcs) {
+      var pointLyr, count = 0;
+      el.show();
+      readout.show();
+      checkBtn.hide();
+      if (xx.length > 0) {
+        pointLyr = internal.getIntersectionLayer(xx, lyr, arcs);
+        count = internal.countPointsInLayer(pointLyr);
+      }
+      if (count == 0) {
+        map.setIntersectionLayer(null);
+        readout.html('<span class="icon black"></span>No self-intersections');
+      } else {
         map.setIntersectionLayer(pointLyr, {layers:[pointLyr]});
-        readout.html(utils$1.format('<span class="icon"></span>%s line intersection%s <img class="close-btn" src="images/close.png">', n, utils$1.pluralSuffix(n)));
-        readout.findChild('.close-btn').on('click', dismiss);
+        readout.html(utils$1.format('<span class="icon"></span>%s line intersection%s <img class="close-btn" src="images/close.png">', count, utils$1.pluralSuffix(count)));
+        readout.findChild('.close-btn').on('click', dismissForever);
+      }
+      if (_simplifiedXX && count > 0) {
+        repairBtn.show();
       } else {
-        map.setIntersectionLayer(null);
-        readout.html('');
+        repairBtn.hide();
       }
     }
   }
@@ -8472,39 +8561,6 @@
     return _self;
   }
 
-  // Test if map should be re-framed to show updated layer
-  function mapNeedsReset(newBounds, prevBounds, viewportBounds, flags) {
-    var viewportPct = getIntersectionPct(newBounds, viewportBounds);
-    var contentPct = getIntersectionPct(viewportBounds, newBounds);
-    var boundsChanged = !prevBounds.equals(newBounds);
-    var inView = newBounds.intersects(viewportBounds);
-    var areaChg = newBounds.area() / prevBounds.area();
-    var chgThreshold = flags.proj ? 1e3 : 1e8;
-    // don't reset if layer extent hasn't changed
-    if (!boundsChanged) return false;
-    // reset if layer is out-of-view
-    if (!inView) return true;
-    // reset if content is mostly offscreen
-    if (viewportPct < 0.3 && contentPct < 0.9) return true;
-    // reset if content bounds have changed a lot (e.g. after projection)
-    if (areaChg > chgThreshold || areaChg < 1/chgThreshold) return true;
-    return false;
-  }
-
-  // Returns proportion of bb2 occupied by bb1
-  function getIntersectionPct(bb1, bb2) {
-    return getBoundsIntersection(bb1, bb2).area() / bb2.area() || 0;
-  }
-
-  function getBoundsIntersection(a, b) {
-    var c = new Bounds();
-    if (a.intersects(b)) {
-      c.setBounds(Math.max(a.xmin, b.xmin), Math.max(a.ymin, b.ymin),
-      Math.min(a.xmax, b.xmax), Math.min(a.ymax, b.ymax));
-    }
-    return c;
-  }
-
   function isMultilineLabel(textNode) {
     return textNode.childNodes.length > 1;
   }
@@ -11297,25 +11353,6 @@
       };
     }
 
-    // Test if an update may have affected the visible shape of arcs
-    // @flags Flags from update event
-    function arcsMayHaveChanged(flags) {
-      return flags.simplify_method || flags.simplify || flags.proj ||
-        flags.arc_count || flags.repair || flags.clip || flags.erase ||
-        flags.slice || flags.affine || flags.rectangle || flags.buffer ||
-        flags.union || flags.mosaic || flags.snap || flags.clean || flags.drop || false;
-    }
-
-    // Test if an update allows hover popup to stay open
-    function popupCanStayOpen(flags) {
-      // keeping popup open after -drop geometry causes problems...
-      // // if (arcsMayHaveChanged(flags)) return false;
-      if (arcsMayHaveChanged(flags)) return false;
-      if (flags.points || flags.proj) return false;
-      if (!flags.same_table) return false;
-      return true;
-    }
-
 
     // Update map frame after user navigates the map in frame edit mode
     function updateFrameExtent() {

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.52";
+  var VERSION = "0.6.54";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -11075,7 +11075,7 @@
   }
 
   function isGzipFile(file) {
-    return /\.gz/i.test(file);
+    return /\.gz$/i.test(file);
   }
 
   function isSupportedOutputFormat(fmt) {
@@ -23703,14 +23703,14 @@ ${svg}
       .option('geojson-type', {
         describe: '[GeoJSON] FeatureCollection, GeometryCollection or Feature'
       })
-      .option('ndjson', {
-        describe: '[GeoJSON/JSON] output newline-delimited features or records',
-        type: 'flag'
-      })
       .option('hoist', {
         describe: '[GeoJSON] move properties to the root level of each Feature',
         type: 'strings'
       })
+      .option('ndjson', {
+        describe: '[GeoJSON/JSON] output newline-delimited features or records',
+        type: 'flag'
+      })
       .option('width', {
         describe: '[SVG/TopoJSON] pixel width of output (SVG default is 800)',
         type: 'number'
@@ -23865,10 +23865,6 @@ ${svg}
         describe: 'a pair of values (0-100) for limiting a color ramp',
         type: 'numbers'
       })
-      .option('range', {
-        // describe: 'a pair of numbers defining the effective data range',
-        type: 'numbers'
-      })
       .option('null-value', {
         describe: 'value (or color) to use for invalid or missing data'
       })
@@ -23895,6 +23891,11 @@ ${svg}
         describe: 'user-defined sequential class breaks',
         type: 'numbers'
       })
+      .option('outer-breaks', {
+        describe: 'min,max breakpoints, to limit the effect of outliers',
+        old_alias: 'range',
+        type: 'numbers'
+      })
       .option('classes', {
         describe: 'number of classes (can be inferred from other options)',
         type: 'integer'
@@ -23904,7 +23905,7 @@ ${svg}
         type: 'flag'
       })
       .option('continuous', {
-        describe: 'output continuous interpolated values (experimental)',
+        describe: 'output interpolated values, for unclassed colors',
         type: 'flag'
       })
       .option('index-field', {
@@ -25337,7 +25338,7 @@ ${svg}
       .describe('create commands on-the-fly and run them')
       .option('expression', {
         DEFAULT: true,
-        describe: 'JS expression to generate command(s)'
+        describe: 'JS expression or template to generate command(s)'
       })
       // deprecated
       .option('commands', {alias_to: 'expression'})
@@ -32134,23 +32135,22 @@ ${svg}
     }
 
     var ascending = getAscendingNumbers(dataValues);
-    if (opts.range) {
-      ascending = applyDataRange(ascending, opts.range);
+    if (opts.outer_breaks) {
+      ascending = applyDataRange(ascending, opts.outer_breaks);
     }
     var nullCount = dataValues.length - ascending.length;
     var minVal = ascending[0];
     var maxVal = ascending[ascending.length - 1];
 
-    // kludge
-    var clamp = opts.range ? function(val) {
-      if (val < opts.range[0]) val = opts.range[0];
-      if (val > opts.range[1]) val = opts.range[1];
+    var clamp = opts.outer_breaks ? function(val) {
+      if (val < opts.outer_breaks[0]) val = opts.outer_breaks[0];
+      if (val > opts.outer_breaks[1]) val = opts.outer_breaks[1];
       return val;
     } : null;
 
-    if (opts.range) {
-      minVal = opts.range[0];
-      maxVal = opts.range[1];
+    if (opts.outer_breaks) {
+      minVal = opts.outer_breaks[0];
+      maxVal = opts.outer_breaks[1];
     }
 
     if (numBreaks === 0) {
@@ -41842,6 +41842,185 @@ ${svg}
     }, {});
   }
 
+  // import { importGeoJSON } from '../geojson/geojson-import';
+
+  function getTargetProxy(target) {
+    var lyr = target.layers[0];
+    var data = getLayerInfo(lyr, target.dataset); // layer_name, feature_count etc
+    data.layer = lyr;
+    data.dataset = target.dataset;
+    addGetters(data, {
+      // export as an object, not a string or buffer
+      geojson: getGeoJSON
+    });
+
+    function getGeoJSON() {
+      var features = exportLayerAsGeoJSON(lyr, target.dataset, {rfc7946: true}, true);
+      return {
+        type: 'FeatureCollection',
+        features: features
+      };
+    }
+
+    return data;
+  }
+
+  // Support for evaluating expressions embedded in curly-brace templates
+
+  // Returns: a string (e.g. a command string used by the -run command)
+  async function evalTemplateExpression(expression, targets, ctx) {
+    ctx = ctx || getBaseContext();
+    // TODO: throw an error if target is used when there are multiple targets
+    if (targets && targets.length == 1) {
+      Object.defineProperty(ctx, 'target', {value: getTargetProxy(targets[0])});
+    }
+    // Add global functions and data to the expression context
+    // (e.g. functions imported via the -require command)
+    var globals = getStashedVar('defs') || {};
+    ctx.global = globals;
+    utils.extend(ctx, ctx.global);
+
+    var output = await compileTemplate(expression, ctx);
+    if (hasFunctionCall(output, ctx)) {
+      // also evaluate function calls that are not enclosed in curly braces
+      // (convenience syntax)
+      output = await evalExpression(output, ctx);
+    }
+    return output;
+  }
+
+  async function compileTemplate(template, ctx) {
+    var subExpressions = parseTemplate(template);
+    var promises = subExpressions.map(expr => evalExpression(expr, ctx));
+    var replacements = await Promise.all(promises);
+    return applyReplacements(template, replacements);
+  }
+
+  async function evalExpression(expression, ctx) {
+    var output;
+    try {
+      output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
+    } catch(e) {
+      stop(e.name, 'in JS source:', e.message);
+    }
+    return output;
+  }
+
+  // Returns array of 0 or more embedded curly-brace expressions
+  function parseTemplate(str) {
+    var arr = [];
+    parseTemplateParts(str).forEach(function(s, i) {
+      if (i % 2 == 1) {
+        arr.push(s.substring(1, s.length-1)); // remove braces
+      }
+    });
+    return arr;
+  }
+
+  // template: template string
+  // replacements: array of strings or values that can be coerced to strings
+  function applyReplacements(template, replacements) {
+    var parts = parseTemplateParts(template);
+    return parts.reduce(function(memo, s, i) {
+      return i % 2 == 1 ? memo + (replacements.shift() || '') : memo + s;
+    }, '');
+  }
+
+  // Divides a string into substrings; even-index strings contain literal strings,
+  // Odd-indexed strings contain curly-brace-delimited template expressions.
+  // JSON objects are treated as literal strings; other top-level curly braces are
+  //    assumed to be embedded expressions.
+  // For example:  parseTemplateParts('{"hello"}, world!') => ['', '{"hello"}', ', world!']
+  //
+  function parseTemplateParts(str) {
+    // TODO: consider adding \ escapes
+    var depth=0;
+    var parts = [];
+    var part = '';
+    var c;
+
+    for (var i=0, n=str.length; i<n; i++) {
+      c = str.charAt(i);
+      if (c == '{') {
+        if (depth == 0) {
+          parts.push(part);
+          part = '';
+        }
+        depth++;
+      }
+      part += c;
+      if (c == '}') {
+        depth--;
+        if (depth < 0) {
+          // unexpected... throw an error?
+          depth++;
+        } else if (depth == 0 && isValidJSON(part)) {
+          // embedded JSON objects are not template parts -- undo
+          part = parts.pop() + part;
+        } else if (depth == 0) {
+          parts.push(part);
+          part = '';
+        }
+      }
+    }
+    parts.push(part);
+    return parts;
+  }
+
+  // Tests if an expression string contains a call to an indexed function
+  // defs: Object containing functions indexed by function name
+  function hasFunctionCall(str, defs) {
+    var rxp = /([$_a-z][$_a-z0-9]*)\(/ig;
+    return Array.from(str.matchAll(rxp)).some(match => match[1] in defs);
+  }
+
+  function isValidJSON(str) {
+    try {
+      JSON.parse(str);
+    } catch(e) {
+      return false;
+    }
+    return true;
+  }
+
+  cmd.require = async function(targets, opts) {
+    var defs = getStashedVar('defs');
+    var moduleFile, moduleName, mod;
+    if (!opts.module) {
+      stop("Missing module name or path to module");
+    }
+    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 && !require$1('path').isAbsolute(moduleFile)) {
+      moduleFile = require$1('path').join(process.cwd(), moduleFile);
+    }
+    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('Unable to load external module:', e.message, getErrorDetail(e));
+    }
+    if (moduleName || opts.alias) {
+      defs[opts.alias || moduleName] = mod;
+    } else {
+      Object.assign(defs, mod);
+    }
+    if (opts.init) {
+      await evalTemplateExpression(opts.init, targets);
+    }
+  };
+
   // Parse an array or a string of command line tokens into an array of
   // command objects.
   function parseCommands(tokens) {
@@ -41894,29 +42073,6 @@ ${svg}
     parseConsoleCommands: parseConsoleCommands
   });
 
-  // import { importGeoJSON } from '../geojson/geojson-import';
-
-  function getTargetProxy(target) {
-    var lyr = target.layers[0];
-    var data = getLayerInfo(lyr, target.dataset); // layer_name, feature_count etc
-    data.layer = lyr;
-    data.dataset = target.dataset;
-    addGetters(data, {
-      // export as an object, not a string or buffer
-      geojson: getGeoJSON
-    });
-
-    function getGeoJSON() {
-      var features = exportLayerAsGeoJSON(lyr, target.dataset, {rfc7946: true}, true);
-      return {
-        type: 'FeatureCollection',
-        features: features
-      };
-    }
-
-    return data;
-  }
-
   function getIOProxy(job) {
     var obj = {
       _cache: {}
@@ -41955,20 +42111,14 @@ ${svg}
   // }
 
   cmd.run = async function(job, targets, opts) {
-    var tmp, commands;
+    var tmp, commands, ctx;
     if (!opts.expression) {
       stop("Missing expression parameter");
     }
-
+    ctx = getBaseContext();
     // io proxy adds ability to add datasets dynamically in a required function
-    var ctx = getBaseContext();
     ctx.io = getIOProxy();
-    tmp = runGlobalExpression(opts.expression, targets, ctx);
-
-    // Support async functions as expressions
-    if (utils.isPromise(tmp)) {
-      tmp = await tmp;
-    }
+    tmp = await evalTemplateExpression(opts.expression, targets, ctx);
     if (tmp && !utils.isString(tmp)) {
       stop('Expected a string containing mapshaper commands; received:', tmp);
     }
@@ -41987,63 +42137,6 @@ ${svg}
     }
   };
 
-  // This could return a Promise or a value or nothing
-  function runGlobalExpression(expression, targets, ctx) {
-    ctx = ctx || getBaseContext();
-    var output;
-    // TODO: throw an informative error if target is used when there are multiple targets
-    if (targets && targets.length == 1) {
-      Object.defineProperty(ctx, 'target', {value: getTargetProxy(targets[0])});
-    }
-    // Add defined functions and data to the expression context
-    // (Such as functions imported via the -require command)
-    utils.extend(ctx, getStashedVar('defs'));
-    try {
-      output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
-    } catch(e) {
-      stop(e.name, 'in JS source:', e.message);
-    }
-    return output;
-  }
-
-  cmd.require = function(targets, opts) {
-    var defs = getStashedVar('defs');
-    var moduleFile, moduleName, mod;
-    if (!opts.module) {
-      stop("Missing module name or path to module");
-    }
-    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 && !require$1('path').isAbsolute(moduleFile)) {
-      moduleFile = require$1('path').join(process.cwd(), moduleFile);
-    }
-    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('Unable to load external module:', e.message, getErrorDetail(e));
-    }
-    if (moduleName || opts.alias) {
-      defs[opts.alias || moduleName] = mod;
-    } else {
-      Object.assign(defs, mod);
-    }
-    if (opts.init) {
-      runGlobalExpression(opts.init, targets);
-    }
-  };
-
   cmd.shape = function(targetDataset, opts) {
     var geojson, dataset;
     if (opts.coordinates) {

package/www/page.css

@@ -468,6 +468,11 @@ body.dragover #import-options-drop-area .drop-area {
 	margin: 0 0 5px 0;
 }
 
+::placeholder {
+	color: #aaa;
+	opacity: 1;
+}
+
 
 #mshp-not-supported {
 	display: none;
@@ -958,6 +963,10 @@ img.close-btn:hover,
 	vertical-align: middle;
 }
 
+.intersection-check {
+	display: none;
+}
+
 .intersection-count .icon {
 	background-color: #F24400;
 	display: inline-block;
@@ -966,6 +975,10 @@ img.close-btn:hover,
 	margin: 0 5px 2px 0;
 }
 
+.intersection-count .icon.black {
+	background-color: black;
+}
+
 .intersection-count .close-btn {
 	width: 16px;
 	height: 16px;
@@ -975,9 +988,9 @@ img.close-btn:hover,
 	margin-left: 2px;
 }
 
-.intersection-display .text-btn.disabled {
+/*.intersection-display .text-btn.disabled {
 	visibility: hidden;
-}
+}*/
 
 /* --- Popup -------------------- */