mapshaper 0.6.119 → 0.6.121

package/README.md

@@ -98,7 +98,7 @@ Run `npm test` to run mapshaper's tests.
 
 Mapshaper is free and open source. If it's useful to you or your organization, please consider supporting its continued development:
 
-* [Ko-fi](https://ko-fi.com/mapshaper) — one-time or recurring donations, no account required.
+* [Ko-fi](https://ko-fi.com/mapshaper) — one-time or recurring contributions, no account required.
 * [GitHub Sponsors](https://github.com/sponsors/mbloch) — recurring sponsorship.
 
 You can also help by [reporting bugs](https://github.com/mbloch/mapshaper/issues) or [telling me what you'd like to see improved](https://tally.so/r/44Njok).

package/mapshaper.js

@@ -11723,7 +11723,11 @@
     version: 1,
     created: 'YYYY-MM-DDTHH:mm:ss.sssZ', // ISO string
     datasets: [],
-    gui: {} // see gui-session-snapshot-control.mjs
+    gui: {}, // see gui-session-snapshot-control.mjs
+    history: { // optional; only present in snapshots created by the GUI
+      commands: ['-i foo.shp', '-simplify 10%', ...],
+      savedAtIndex: 0 // index of the first command after the last save boundary
+    }
   }
   */
 
@@ -11747,12 +11751,16 @@
   //    exporting from command line: { compact: true, file: 'tmp.msx', final: true }
   //    exporting from gui export menu: {compact: true, format: 'msx'}
   //    saving gui temp snapshot: {compact: false}
+  // opts.history: optional GUI session history captured by SessionHistory#getHistorySnapshot
   async function exportDatasetsToPack(datasets, opts) {
     var obj = {
       version: 1,
       created: (new Date).toISOString(),
       datasets: await Promise.all(datasets.map(dataset => exportDataset(dataset, opts)))
     };
+    if (opts.history) {
+      obj.history = opts.history;
+    }
     return obj;
   }
 
@@ -51131,7 +51139,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.119";
+  var version = "0.6.121";
 
   // 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.

package/package.json

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

package/www/CNAME

@@ -0,0 +1 @@
+mapshaper.org

package/www/index.html

@@ -63,7 +63,7 @@
 		<span class="console-btn header-btn btn">Console</span><span class="display-btn header-btn btn">Display</span><span class="separator"></span><span class="separator"></span></span><span class="simplify-btn header-btn btn">Simplify</span><span class="separator"></span><span class="export-btn header-btn btn">Export</span>
 	</div>
 	<div id="splash-buttons" class="page-header-buttons">
-		<a href="https://github.com/mbloch/mapshaper/wiki"><span id="wiki-btn" class="header-btn btn">Wiki</span></a><span class="separator"></span><a href="https://github.com/mbloch/mapshaper"><span id="github-btn" class="header-btn btn">GitHub</span></a><span class="separator"></span><a href="donate.html"><span id="donate-btn" class="header-btn btn">Donate</span></a>
+		<a href="https://github.com/mbloch/mapshaper/wiki"><span id="wiki-btn" class="header-btn btn">Wiki</span></a><span class="separator"></span><a href="https://github.com/mbloch/mapshaper"><span id="github-btn" class="header-btn btn">GitHub</span></a><span class="separator"></span><a href="sponsor.html"><span id="sponsor-btn" class="header-btn btn"><svg viewBox="0 0 24 24" aria-hidden="true"><path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/></svg> Become a sponsor</span></a>
 	</div>
 </div>
 

package/www/mapshaper-gui.js

@@ -1580,6 +1580,19 @@
         action: saveSnapshot
       });
 
+      if (!gui.session.isEmpty()) {
+        // Surface the console "history" command via the snapshot menu so users
+        // can browse the session's command history without knowing about the
+        // console keyword. Hidden when there's nothing to show.
+        addMenuLink({
+          slug: 'history',
+          label: 'view session history',
+          action: function(gui) {
+            gui.console.runCommand('history');
+          }
+        });
+      }
+
       // var available = await getAvailableStorage();
       // if (available) {
       //   El('div').addClass('save-menu-entry').text(available + ' available').appendTo(menu);
@@ -1703,10 +1716,24 @@
     }
     gui.model.clear();
     importDatasets(data.datasets, gui);
+    // Reinstate the session history (including its saved/unsaved boundary) that
+    // was in effect when the snapshot was taken. If the snapshot has no history
+    // field (e.g. older snapshots), this resets to a clean state.
+    gui.session.restoreHistorySnapshot(data.history);
     gui.clearMode();
   }
 
-  // Add datasets to the current project
+  // Import datasets from a packed .msx buffer.
+  // Behavior depends on whether the current session contains data:
+  //   - empty session: full project restore -- datasets and any embedded session
+  //     history are loaded as if continuing the original session.
+  //   - non-empty session: merge -- datasets are added to the current project,
+  //     but any embedded session history is discarded (the imported commands
+  //     assume different layer indices and a different starting state, so
+  //     merging them into the current session would produce a misleading history).
+  // Returns true if a full restore occurred, false if a merge occurred. The
+  // caller uses this to decide whether to record an additional -i command in
+  // the current session's history (see gui-import-control.mjs).
   // TODO: figure out if interface data should be imported (e.g. should
   //   visibility flag of imported layers be imported)
   async function importSessionData(buf, gui) {
@@ -1714,7 +1741,12 @@
       buf = new Uint8Array(buf);
     }
     var data = await internal.unpackSessionData(buf);
+    var fullRestore = gui.model.isEmpty();
     importDatasets(data.datasets, gui);
+    if (fullRestore) {
+      gui.session.restoreHistorySnapshot(data.history);
+    }
+    return fullRestore;
   }
 
   function importDatasets(datasets, gui) {
@@ -1730,7 +1762,13 @@
     if (!lyr) return null; // no data -- no snapshot
     // compact: true applies compression to vector coordinates, for ~30% reduction
     //   in file size in a typical polygon or polyline file, but longer processing time
-    var opts = {compact: false, active_layer: lyr};
+    // history: capture session commands + saved/unsaved boundary so the history
+    //   can be reinstated if this snapshot is restored or re-imported later.
+    var opts = {
+      compact: false,
+      active_layer: lyr,
+      history: gui.session.getHistorySnapshot()
+    };
     var datasets = gui.model.getDatasets();
     var obj = await internal.exportDatasetsToPack(datasets, opts);
     obj.gui = getGuiState(gui);
@@ -2348,7 +2386,16 @@
           await wait(35);
         }
         if (group[internal.PACKAGE_EXT]) {
-          await importSessionData(group[internal.PACKAGE_EXT].content, gui);
+          var fullRestore = await importSessionData(group[internal.PACKAGE_EXT].content, gui);
+          importCount++;
+          // Skip recording an -i command if the .msx import was a full project
+          // restore: the previous session's history (including the original -i)
+          // has already been reinstated, so adding another entry here would be
+          // misleading. For the merge case, record the import as a regular -i
+          // so the snapshot contributes a CLI-replayable entry to the session.
+          if (!fullRestore) {
+            gui.session.fileImported(group[internal.PACKAGE_EXT].filename, optStr);
+          }
         } else if (await importDataset(group, groupImportOpts)) {
           importCount++;
           gui.session.fileImported(group.filename, optStr);
@@ -3079,13 +3126,12 @@
           throw Error('Internal error');
         }
       }
+      // switch to filtered version of arcs at small scales
+      var useFiltering = filteredArcs && 1/ext.getTransform().mx > filteredSegLen * 1.5;
       if (filteredArcs) {
         // match simplification of unfiltered arcs
         filteredArcs.setRetainedInterval(unfilteredArcs.getRetainedInterval());
       }
-      // switch to filtered version of arcs at small scales
-      var unitsPerPixel = 1/ext.getTransform().mx,
-          useFiltering = filteredArcs && unitsPerPixel > filteredSegLen * 1.5;
       return useFiltering ? filteredArcs : unfilteredArcs;
     };
   }
@@ -3959,13 +4005,18 @@
     // expose this function, so other components can run commands (e.g. box tool)
     this.runMapshaperCommands = runMapshaperCommands;
 
-    this.runInitialCommands = function(str) {
+    // Open the console (if closed) and run a command, as if the user had
+    // typed it. Used by UI controls that surface console functionality, e.g.
+    // the "view command history" link in the snapshot menu.
+    this.runCommand = function(str) {
       str = str.trim();
       if (!str) return;
       turnOn();
       submit(str);
     };
 
+    this.runInitialCommands = this.runCommand;
+
     consoleMessage(PROMPT);
     gui.keyboard.on('keydown', onKeyDown);
     window.addEventListener('beforeunload', saveHistory); // save history if console is open on refresh
@@ -4784,6 +4835,17 @@
         await loadGeopackageLib();
       }
       opts.active_layer = gui.model.getActiveLayer().layer; // kludge to support restoring active layer in gui
+      if (opts.format == internal.PACKAGE_EXT) {
+        // Embed the session history in .msx exports so that re-importing the
+        // file into a fresh session restores the original command history.
+        // The .msx file itself is a durable artifact, so mark every captured
+        // command as "saved" -- a user reloading the file shouldn't see an
+        // unsaved-changes warning for work that lives in the file they just
+        // opened.
+        var snapshot = gui.session.getHistorySnapshot();
+        snapshot.savedAtIndex = snapshot.commands.length;
+        opts.history = snapshot;
+      }
       try {
         var files = await internal.exportTargetLayers(model, targets, opts);
       } catch(e) {
@@ -5593,20 +5655,54 @@
 
   function SessionHistory(gui) {
     var commands = [];
+    // index of first command after the last "save" boundary; commands at indices
+    // [savedAtIndex .. commands.length) are considered unsaved
+    var savedAtIndex = 0;
     // commands that can be ignored when checking for unsaved changes
-    var nonEditingCommands = 'i,target,info,version,verbose,projections,inspect,help,h,encodings,calc'.split(',');
+    var nonEditingCommands = 'i,target,info,version,verbose,projections,inspect,help,h,encodings,calc,comment'.split(',');
 
     this.unsavedChanges = function() {
-      var cmd, cmdName;
-      for (var i=commands.length - 1; i >= 0; i--) {
-        cmdName = getCommandName(commands[i]);
-        if (cmdName == 'o') break;
+      for (var i = commands.length - 1; i >= savedAtIndex; i--) {
+        var cmdName = getCommandName(commands[i]);
         if (nonEditingCommands.includes(cmdName)) continue;
         return true;
       }
       return false;
     };
 
+    this.isEmpty = function() {
+      return commands.length === 0;
+    };
+
+    // Mark the current end of the history as a "saved" boundary -- called after
+    // data has been written somewhere durable (e.g. an -o export). Snapshots
+    // are session-scoped and are NOT durable, so creating one does not mark saved.
+    this.markSaved = function() {
+      savedAtIndex = commands.length;
+    };
+
+    // Capture a serializable copy of the history for inclusion in a snapshot.
+    this.getHistorySnapshot = function() {
+      return {
+        commands: commands.slice(),
+        savedAtIndex: savedAtIndex
+      };
+    };
+
+    // Replace the current history with one captured by getHistorySnapshot().
+    // Used when restoring an in-session snapshot. If the snapshot has no history
+    // (e.g. older snapshots, or external .msx files), starts from a clean state.
+    this.restoreHistorySnapshot = function(obj) {
+      if (obj && Array.isArray(obj.commands)) {
+        commands = obj.commands.slice();
+        savedAtIndex = typeof obj.savedAtIndex == 'number' ?
+          Math.min(obj.savedAtIndex, commands.length) : commands.length;
+      } else {
+        commands = [];
+        savedAtIndex = 0;
+      }
+    };
+
     this.fileImported = function(file, optStr) {
       var cmd = '-i ' + file;
       if (optStr) {
@@ -5666,6 +5762,8 @@
         cmd += ' ' + optStr;
       }
       commands.push(cmd);
+      // -o writes data to a durable location, so treat this as a save boundary
+      savedAtIndex = commands.length;
     };
 
     this.setTargetLayer = function(lyr) {
@@ -8931,6 +9029,9 @@
       var pct = ease ? ease(e.pct) : e.pct,
           val = end * pct + start * (1 - pct);
       self.dispatchEvent('change', {value: val});
+      if (e.done) {
+        self.dispatchEvent('done');
+      }
     }
   }
 
@@ -9095,6 +9196,7 @@
       }
       if (evt.done) {
         active = false;
+        self.dispatchEvent('mousewheelend');
       } else {
         if (fadeFactor > 0) {
           // Decelerate towards the end of the sustain interval (for smoother zooming)
@@ -9688,12 +9790,26 @@
 
     gui.on('map_reset', function() {
       ext.reset(true);
+      // ext.reset() synchronously triggers a 'nav' draw; signal end-of-
+      // interaction so the LayerRenderer settles on a sharp frame
+      // immediately instead of waiting on the fallback timer.
+      gui.dispatchEvent('map_interaction_end');
     });
 
     zoomTween.on('change', function(e) {
       ext.zoomToExtent(e.value, _fx, _fy);
     });
 
+    // Signal end-of-interaction so downstream modules (e.g. LayerRenderer) can
+    // trigger a settle/redraw immediately, instead of waiting on a debounce.
+    zoomTween.on('done', function() {
+      gui.dispatchEvent('map_interaction_end');
+    });
+
+    wheel.on('mousewheelend', function() {
+      gui.dispatchEvent('map_interaction_end');
+    });
+
     mouse.on('click', function(e) {
       gui.dispatchEvent('map_click', e);
     });
@@ -9744,6 +9860,7 @@
         zoomBox.turnOff();
       } else {
         El('body').removeClass('panning').removeClass('pan');
+        gui.dispatchEvent('map_interaction_end');
       }
     });
 
@@ -12279,7 +12396,6 @@
   }
 
   function drawStyledLayerToCanvas(lyr, canv, ext) {
-    // TODO: add filter for out-of-view shapes
     var style = lyr.gui.style;
     var layer = lyr.gui.displayLayer;
     var arcs, filter;
@@ -12291,7 +12407,7 @@
       }
     } else {
       arcs = getArcsForRendering(lyr, ext);
-      filter = getShapeFilter(arcs, ext);
+      filter = getShapeFilter(arcs, layer.shapes, ext);
       canv.drawStyledPaths(layer.shapes, arcs, style, filter);
       if (style.vertices) {
         canv.drawVertices(layer.shapes, arcs, style, filter);
@@ -12300,11 +12416,12 @@
     canv.clearStyles();
   }
 
-
   // Return a function for testing if an arc should be drawn in the current view
   function getArcFilter(arcs, ext, usedFlag, arcCounts) {
-    var MIN_PATH_LEN = 0.1;
-    var minPathLen = ext.getPixelSize() * MIN_PATH_LEN, // * 0.5
+    // Arcs whose bbox is smaller than this pixel threshold collapse to a dot
+    // under roundToPix anyway; skipping them saves per-arc iteration.
+    var MIN_PATH_LEN = 0.35;
+    var minPathLen = ext.getPixelSize() * MIN_PATH_LEN,
         geoBounds = ext.getBounds(),
         geoBBox = geoBounds.toArray(),
         allIn = geoBounds.contains(arcs.getBounds()),
@@ -12324,15 +12441,20 @@
       };
     }
 
-  // Return a function for testing if a shape should be drawn in the current view
-  function getShapeFilter(arcs, ext) {
-    var viewBounds = ext.getBounds();
-    var bounds = new Bounds();
-    if (ext.scale() < 1.1) return null; // full or almost-full zoom: no filter
-    return function(shape) {
-      bounds.empty();
-      arcs.getMultiShapeBounds(shape, bounds);
-      return viewBounds.intersects(bounds);
+  // Return a function for testing if a shape should be drawn in the current
+  // view. The filter takes a shape index and tests the shape's bbox against
+  // the viewport. At nearly full extent the test is a no-op, so we return
+  // null to let the caller skip it entirely.
+  function getShapeFilter(arcs, shapes, ext) {
+    if (ext.scale() < 1.1) return null;
+    var view = ext.getBounds();
+    var b = new Bounds();
+    return function(i) {
+      var shp = shapes[i];
+      if (!shp) return false;
+      b.empty();
+      arcs.getMultiShapeBounds(shp, b);
+      return view.intersects(b);
     };
   }
 
@@ -12405,7 +12527,7 @@
       _ctx.fillStyle = color;
       for (i=0; i<shapes.length; i++) {
         var shp = shapes[i];
-        if (!shp || filter && !filter(shp)) continue;
+        if (!shp || filter && !filter(i)) continue;
         for (j=0; j<shp.length; j++) {
           iter.init(shp[j]);
           while (iter.hasNext()) {
@@ -12431,14 +12553,14 @@
     // Optimized to draw paths in same-style batches (faster Canvas drawing)
     _self.drawStyledPaths = function(shapes, arcs, style, filter) {
       var styleIndex = {};
-      var batchSize = 1500;
+      var batchSize = 100;
       var startPath = getPathStart(_ext, getScaledLineScale(_ext, style));
       var draw = getShapePencil(arcs, _ext);
       var key, item, shp;
       var styler = style.styler || null;
       for (var i=0; i<shapes.length; i++) {
         shp = shapes[i];
-        if (!shp || filter && !filter(shp)) continue;
+        if (!shp || filter && !filter(i)) continue;
         if (styler) {
           styler(style, i);
         }
@@ -12606,7 +12728,8 @@
       var startPath = getPathStart(_ext, getLineScale(_ext)),
           t = getScaledTransform(_ext),
           ctx = _ctx,
-          batch = 25, // render paths in batches of this size (an optimization)
+          // Larger batches reduce the number of stroke() flushes.
+          batch = 100,
           count = 0,
           n = arcs.size(),
           i, iter;
@@ -12963,12 +13086,68 @@
         _furniture = new SvgDisplayLayer(gui, ext, null).appendTo(el),
         _ext = ext;
 
+    // Fast-nav config: when the most recent render cycle exceeded SLOW_FRAME_MS,
+    // subsequent 'nav' actions transform the previously rendered bitmap via CSS
+    // instead of re-drawing vector content. This trades visible scaling/edge
+    // artifacts for smoother panning and zooming on large datasets.
+    //
+    // Canvas 2D paint ops are normally rasterized asynchronously, so JS usually
+    // returns long before the pixels are committed to the compositor. We force
+    // a synchronous flush at the end of a full render (see flushCanvas) so that
+    //   (a) the elapsed time reflects the *true* frame cost (JS + rasterization)
+    //       rather than just the JS portion, and
+    //   (b) subsequent fast-nav CSS transforms composite cleanly rather than on
+    //       top of a still-committing bitmap.
+    // We use only the most recent sample because previous renders may have
+    // drawn a different scene (e.g. a simpler layer that is no longer active).
+    var SLOW_FRAME_MS = 100;
+    // Fallback delay before triggering a redraw if no explicit end-of-interaction
+    // event arrives. The primary trigger is gui 'map_interaction_end' (mouse
+    // release, wheel timeout, zoom tween done); this timer only fires if that
+    // signal is somehow missed, so it's set generously.
+    var FAST_SETTLE_FALLBACK_MS = 2000;
+    var _lastFrameMs = 0; // duration of the most recent full render cycle
+    var _snapshot = null; // {bounds, width, height, pixRatio}
+    var _fastActive = false;
+    var _settleTimer = null;
+    var _redrawPending = false;
+    var _settleRequested = false;
+
+    // 'map_interaction_end' may arrive before the in-flight 'nav' draw runs,
+    // because drawLayers() schedules its work via requestAnimationFrame.
+    // We latch the intent so that whichever order things happen in, the
+    // settle fires immediately rather than waiting on the fallback timer.
+    gui.on('map_interaction_end', function() {
+      if (_redrawPending) {
+        settleNow();
+      } else {
+        _settleRequested = true;
+      }
+    });
+
     // don't let furniture container block events to symbol layers
     _furniture.css('pointer-events', 'none');
 
     this.drawMainLayers = function(layers, action) {
-      var needSvgRedraw = action != 'nav' && action != 'hover';
       if (skipMainLayerRedraw(action)) return;
+      if (action == 'nav' && shouldUseFastNav()) {
+        applyFastTransform();
+        // SVG symbol reposition is already cheap; keep labels/symbols accurate
+        // while the canvas is being transformed.
+        layers.forEach(function(lyr) {
+          if (internal.layerHasSvgSymbols(lyr) || internal.layerHasLabels(lyr)) {
+            _svg.reposition(lyr, 'symbol');
+          }
+        });
+        markRedrawPending();
+        return;
+      }
+      var startTime = performance.now();
+      var needSvgRedraw = action != 'nav' && action != 'hover';
+      cancelSettle();
+      _redrawPending = false;
+      _settleRequested = false; // a full render satisfies any pending settle
+      clearFastTransform();
       _mainCanv.prep(_ext);
       if (needSvgRedraw) {
         _svg.clear();
@@ -12983,6 +13162,12 @@
            drawCanvasLayer(lyr, _mainCanv);
         }
       });
+      // Force synchronous rasterization so performance.now() reflects the true
+      // frame cost (including GPU paint-op commit), and so subsequent fast-nav
+      // CSS transforms don't composite over a still-pending canvas commit.
+      flushCanvas(_mainCanv);
+      _lastFrameMs = performance.now() - startTime;
+      captureSnapshot();
     };
 
     // Draw highlight effect for hover and selection
@@ -13034,6 +13219,18 @@
       }
     }
 
+    // Reading back a single pixel forces Chrome/Firefox to synchronously complete
+    // any queued paint operations before returning. This converts an unbounded
+    // deferred "Commit" phase into in-line wall time we can measure, and ensures
+    // the canvas pixels are actually on screen before the caller returns.
+    function flushCanvas(canv) {
+      try {
+        canv.node().getContext('2d').getImageData(0, 0, 1, 1);
+      } catch (e) {
+        // e.g. cross-origin-tainted canvas (shouldn't happen here, but safe)
+      }
+    }
+
     function getSvgLayerType(layer) {
       var type = null;
       if (internal.layerHasSvgSymbols(layer)) {
@@ -13043,6 +13240,87 @@
       }
       return type;
     }
+
+    function captureSnapshot() {
+      _snapshot = {
+        bounds: _ext.getBounds(),
+        width: _ext.width(),
+        height: _ext.height(),
+        pixRatio: GUI.getPixelRatio()
+      };
+    }
+
+    function shouldUseFastNav() {
+      if (!_snapshot) return false;
+      if (_lastFrameMs <= SLOW_FRAME_MS) return false;
+      if (_snapshot.width != _ext.width() || _snapshot.height != _ext.height()) return false;
+      if (_snapshot.pixRatio != GUI.getPixelRatio()) return false;
+      return true;
+    }
+
+    // Apply a CSS transform to the main canvas so its previously rendered
+    // contents line up with the current map extent. The canvas bitmap is not
+    // redrawn.
+    function applyFastTransform() {
+      var t = _ext.getTransform();
+      var b = _snapshot.bounds;
+      var tl = t.transform(b.xmin, b.ymax);
+      var br = t.transform(b.xmax, b.ymin);
+      var sx = (br[0] - tl[0]) / _snapshot.width;
+      var sy = (br[1] - tl[1]) / _snapshot.height;
+      // On retina the canvas bitmap is already scaled down to CSS pixels via a
+      // CSS transform from the .retina class; overriding `transform` here
+      // replaces that rule so we must bake the pixRatio scale back in.
+      var k = 1 / _snapshot.pixRatio;
+      setFastTransform(_mainCanv.node(), tl[0], tl[1], sx * k, sy * k);
+      _fastActive = true;
+    }
+
+    function clearFastTransform() {
+      if (!_fastActive) return;
+      var node = _mainCanv.node();
+      node.style.transform = '';
+      node.style.transformOrigin = '';
+      _fastActive = false;
+    }
+
+    function setFastTransform(node, tx, ty, sx, sy) {
+      node.style.transformOrigin = 'top left';
+      node.style.transform = 'translate(' + tx + 'px,' + ty + 'px) scale(' + sx + ',' + sy + ')';
+    }
+
+    // Record that a fast-nav frame is showing so that the next end-of-interaction
+    // event (or the fallback timer) can trigger a real redraw. Each fast-nav
+    // frame resets the fallback timer so it only fires after the user truly
+    // stops interacting, as a backstop for any interaction path that doesn't
+    // emit 'map_interaction_end'. If 'map_interaction_end' was already
+    // received before this frame ran (e.g. the home button reset, which
+    // dispatches synchronously while the nav draw is still queued in rAF),
+    // settle right now instead of waiting.
+    function markRedrawPending() {
+      _redrawPending = true;
+      cancelSettle();
+      if (_settleRequested) {
+        _settleRequested = false;
+        settleNow();
+      } else {
+        _settleTimer = setTimeout(settleNow, FAST_SETTLE_FALLBACK_MS);
+      }
+    }
+
+    function settleNow() {
+      cancelSettle();
+      if (!_redrawPending) return;
+      _redrawPending = false;
+      gui.dispatchEvent('map-needs-refresh');
+    }
+
+    function cancelSettle() {
+      if (_settleTimer) {
+        clearTimeout(_settleTimer);
+        _settleTimer = null;
+      }
+    }
   }
 
   // Controls the shift-drag box editing tool
@@ -13778,6 +14056,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
       // RENDERING
       // draw main content layers
+
       _renderer.drawMainLayers(contentLayers, action);
 
       // draw hover & selection overlay

package/www/mapshaper.js

@@ -11723,7 +11723,11 @@
     version: 1,
     created: 'YYYY-MM-DDTHH:mm:ss.sssZ', // ISO string
     datasets: [],
-    gui: {} // see gui-session-snapshot-control.mjs
+    gui: {}, // see gui-session-snapshot-control.mjs
+    history: { // optional; only present in snapshots created by the GUI
+      commands: ['-i foo.shp', '-simplify 10%', ...],
+      savedAtIndex: 0 // index of the first command after the last save boundary
+    }
   }
   */
 
@@ -11747,12 +11751,16 @@
   //    exporting from command line: { compact: true, file: 'tmp.msx', final: true }
   //    exporting from gui export menu: {compact: true, format: 'msx'}
   //    saving gui temp snapshot: {compact: false}
+  // opts.history: optional GUI session history captured by SessionHistory#getHistorySnapshot
   async function exportDatasetsToPack(datasets, opts) {
     var obj = {
       version: 1,
       created: (new Date).toISOString(),
       datasets: await Promise.all(datasets.map(dataset => exportDataset(dataset, opts)))
     };
+    if (opts.history) {
+      obj.history = opts.history;
+    }
     return obj;
   }
 
@@ -51131,7 +51139,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.119";
+  var version = "0.6.121";
 
   // 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.

package/www/page.css

@@ -196,10 +196,17 @@ body.map-view {
 	background-color: black;
 }
 
-#donate-btn {
+#sponsor-btn {
 	color: #ffa;
 }
 
+#sponsor-btn svg {
+	width: 12px;
+	height: 12px;
+	fill: currentColor;
+	vertical-align: -1px;
+}
+
 .separator {
 	border-left: 1px solid white;
 	height: 10px;

package/www/privacy.html

@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Privacy Policy &mdash; mapshaper</title>
+<meta name="description" content="Privacy policy for mapshaper, free open-source software for editing geographic data.">
+<link rel="icon" type="image/png" href="images/icon.png">
+
+<style>
+  @font-face {
+    font-family: 'SourceSans3';
+    src: url('assets/SourceSans3-VariableFont_wght.ttf') format('truetype');
+    font-display: swap;
+  }
+
+  html, body {
+    margin: 0;
+    padding: 0;
+    background-color: #f8fdff;
+    font: 16px/1.55 'SourceSans3', Arial, sans-serif;
+    color: #333;
+  }
+
+  a { color: #10699b; }
+  a:hover { color: #1A6A96; }
+
+  .page-header {
+    background-color: #1385B7;
+    color: white;
+    padding: 0 11px;
+    height: 29px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .mapshaper-logo,
+  .mapshaper-logo:hover {
+    font-weight: 600;
+    font-size: 17px;
+    color: white;
+    text-decoration: none;
+  }
+
+  .mapshaper-logo .logo-highlight {
+    color: #ffa;
+  }
+
+  .header-back {
+    color: white;
+    text-decoration: none;
+    font-size: 14px;
+    height: 29px;
+    display: inline-flex;
+    align-items: center;
+    padding: 0 10px;
+  }
+
+  .header-back:hover {
+    background-color: #1A6A96;
+    color: white;
+  }
+
+  main {
+    max-width: 640px;
+    margin: 0 auto;
+    padding: 40px 24px 80px;
+  }
+
+  h1 {
+    font-weight: 600;
+    font-size: 32px;
+    margin: 0 0 8px;
+    color: #222;
+  }
+
+  .updated {
+    color: #888;
+    font-size: 14px;
+    margin: 0 0 28px;
+  }
+
+  h2 {
+    font-weight: 600;
+    font-size: 20px;
+    margin: 32px 0 10px;
+    color: #222;
+  }
+
+  p {
+    margin: 0 0 14px;
+  }
+
+  ul {
+    padding-left: 20px;
+    margin: 8px 0 16px;
+  }
+
+  ul li {
+    margin-bottom: 6px;
+  }
+
+  .footer-note {
+    margin-top: 48px;
+    padding-top: 24px;
+    border-top: 1px solid #e0e8ec;
+    font-size: 14px;
+    color: #777;
+  }
+
+  .footer-note a {
+    color: #777;
+  }
+
+  @media (max-width: 480px) {
+    main { padding: 24px 18px 60px; }
+    h1 { font-size: 26px; }
+  }
+</style>
+</head>
+<body>
+
+<header class="page-header">
+  <a href="." class="mapshaper-logo">map<span class="logo-highlight">shaper</span></a>
+  <a href="." class="header-back">&larr; Back to mapshaper</a>
+</header>
+
+<main>
+
+<h1>Privacy Policy</h1>
+<p class="updated">Last updated: April 2026</p>
+
+<h2>Overview</h2>
+<p>Mapshaper is free, open-source software for editing geographic data, hosted at mapshaper.org. This policy explains what information is collected when you use the site, how it is used, and what choices you have.</p>
+<p>We collect as little information as possible. We do not sell or share your information with advertisers or data brokers.</p>
+
+<h2>Information collected</h2>
+<p><strong>On mapshaper.org:</strong></p>
+<ul>
+  <li><strong>Web analytics</strong> via Google Analytics. This includes pages visited, browser and device type, approximate location (typically city-level, derived from your IP address), and timestamps. The data helps us understand how the site is used.</li>
+  <li><strong>Basemap requests.</strong> When the in-app basemap loads, the application requests assets from Mapbox servers. As with any web request, this transmits your IP address to Mapbox to facilitate data delivery and session accounting.</li>
+  <li><strong>Standard server logs</strong> are kept by GitHub Pages, the hosting provider. As with any web request, this records your IP address, browser user-agent string, and the URL requested. GitHub uses these for traffic analysis, security monitoring, and abuse prevention.</li>
+</ul>
+<p><strong>On the support page:</strong></p>
+<ul>
+  <li><strong>Email address</strong>, if you provide one for a payment receipt. The address is handled by the payment processor (Stripe via Ko-fi, or GitHub Sponsors), not stored by mapshaper.</li>
+  <li><strong>Name and payment information</strong> are handled directly by the payment processor.</li>
+</ul>
+
+<h2>Information not collected</h2>
+<ul>
+  <li>Files you load into mapshaper for editing remain in your browser. They are not uploaded to our servers or to any third party.</li>
+  <li>We do not maintain user accounts or store any user data on our own servers.</li>
+  <li>We do not sell, rent, or share your information with advertisers or data brokers.</li>
+</ul>
+
+<h2>Third parties</h2>
+<p>The following services receive data when you use mapshaper:</p>
+<ul>
+  <li><strong>Google Analytics</strong> &mdash; site usage analytics. <a href="https://policies.google.com/privacy">Privacy Policy</a></li>
+  <li><strong>Mapbox</strong> &mdash; basemap tiles. <a href="https://www.mapbox.com/legal/privacy">Privacy Policy</a></li>
+  <li><strong>GitHub</strong> &mdash; site hosting (GitHub Pages) and sponsorship platform. <a href="https://docs.github.com/site-policy/privacy-policies/github-general-privacy-statement">Privacy Statement</a></li>
+  <li><strong>Ko-fi</strong> &mdash; payment processing. <a href="https://ko-fi.com/manage/privacy">Privacy Policy</a></li>
+  <li><strong>Stripe</strong> &mdash; payment processing for Ko-fi contributions. <a href="https://stripe.com/privacy">Privacy Policy</a></li>
+</ul>
+
+<h2>Cookies</h2>
+<p>Google Analytics sets cookies to track usage. You can opt out by:</p>
+<ul>
+  <li>Adjusting your browser settings to block third-party cookies</li>
+  <li>Sending a Do Not Track signal</li>
+  <li>Installing the Google Analytics opt-out browser extension</li>
+  <li>Using a privacy-focused browser or extension that blocks analytics</li>
+</ul>
+
+<h2>EU and UK users (GDPR)</h2>
+<p>If you are in the European Union or United Kingdom, the General Data Protection Regulation gives you the right to access, correct, delete, or export the personal data we hold about you, and to object to processing. Because we do not maintain a user database, the data we hold about any individual is limited to analytics events and (if you have contributed) records held by the payment processors.</p>
+<p>To exercise these rights, contact us using the information below. The legal basis for processing is legitimate interest (analytics) and contract (payment processing).</p>
+
+<h2>California residents (CCPA)</h2>
+<p>California residents have the right to know what personal information we collect, to request its deletion, and to opt out of any sale of personal information. We do not sell personal information.</p>
+
+<h2>Security</h2>
+<p>All connections to mapshaper.org use TLS encryption (HTTPS). Payment information is handled by PCI-compliant processors (Stripe). We do not store payment information on our own systems.</p>
+
+<h2>Children</h2>
+<p>Mapshaper is not directed at children under 13. We do not knowingly collect personal information from children.</p>
+
+<h2>Changes to this policy</h2>
+<p>This policy may be updated from time to time. The &ldquo;Last updated&rdquo; date at the top reflects the most recent change. We encourage you to review the policy periodically.</p>
+
+<h2>Contact</h2>
+<p>Questions about privacy can be sent to the maintainer via <a href="https://github.com/mbloch/mapshaper/issues">GitHub</a> or <a href="https://ko-fi.com/mapshaper">Ko-fi</a>.</p>
+
+<div class="footer-note">
+  <a href="terms.html">Terms of Service</a> &middot; <a href="sponsor.html">Support mapshaper</a> &middot; <a href=".">Back to mapshaper</a>
+</div>
+
+</main>
+
+</body>
+</html>

package/www/{donate.html → sponsor.html}

@@ -81,7 +81,7 @@
     margin: 0 0 32px;
   }
 
-  .donate-buttons {
+  .sponsor-buttons {
     display: flex;
     gap: 12px;
     flex-wrap: wrap;
@@ -113,7 +113,7 @@
     background-color: #222;
   }
 
-  .donate-note {
+  .sponsor-note {
     font-size: 14px;
     color: #666;
     margin: 0 0 32px;
@@ -156,10 +156,14 @@
     color: #777;
   }
 
+  .footer-note a {
+    color: #777;
+  }
+
   @media (max-width: 480px) {
     main { padding: 24px 18px 60px; }
     h1 { font-size: 26px; }
-    .donate-buttons { flex-direction: column; align-items: stretch; }
+    .sponsor-buttons { flex-direction: column; align-items: stretch; }
     .btn { text-align: center; }
   }
 </style>
@@ -167,8 +171,8 @@
 <body>
 
 <header class="page-header">
-  <a href="index.html" class="mapshaper-logo">map<span class="logo-highlight">shaper</span></a>
-  <a href="index.html" class="header-back">&larr; Back to mapshaper</a>
+  <a href="." class="mapshaper-logo">map<span class="logo-highlight">shaper</span></a>
+  <a href="." class="header-back">&larr; Back to mapshaper</a>
 </header>
 
 <main>
@@ -177,20 +181,20 @@
 
 <p class="tagline">Mapshaper is free, open-source software for editing geographic data &mdash; used worldwide for everything from classroom exercises to professional map work.</p>
 
-<div class="donate-buttons">
-  <a href="https://ko-fi.com/mapshaper" class="btn">Donate via Ko-fi</a>
+<div class="sponsor-buttons">
+  <a href="https://ko-fi.com/mapshaper" class="btn">Support via Ko-fi</a>
   <a href="https://github.com/sponsors/mbloch" class="btn btn-secondary">Sponsor on GitHub</a>
 </div>
 
-<p class="donate-note">Ko-fi accepts one-time or recurring donations &mdash; no account required. GitHub Sponsors offers recurring sponsorship.</p>
+<p class="sponsor-note">Ko-fi accepts one-time or recurring contributions &mdash; no account required. GitHub Sponsors offers recurring sponsorship.</p>
 
-<h2>What your donation supports</h2>
+<h2>What your contribution supports</h2>
 <ul class="support-list">
   <li>Development time &mdash; bug fixes, new features, performance improvements</li>
   <li>Responding to user issues and requests</li>
 </ul>
 
-<h2>Recent improvements</h2>
+<h2>Recent work</h2>
 <ul class="support-list">
   <li><strong>GeoPackage</strong> import and export</li>
   <li><strong>FlatGeobuf</strong> import and export</li>
@@ -207,6 +211,8 @@
 
 <div class="footer-note">
   Mapshaper&rsquo;s basemap services are generously provided by <a href="https://www.mapbox.com">Mapbox</a>.
+  <br>
+  <a href="privacy.html">Privacy Policy</a> &middot; <a href="terms.html">Terms of Service</a>
 </div>
 
 </main>

package/www/terms.html

@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Terms of Service &mdash; mapshaper</title>
+<meta name="description" content="Terms of service for mapshaper, free open-source software for editing geographic data.">
+<link rel="icon" type="image/png" href="images/icon.png">
+
+<style>
+  @font-face {
+    font-family: 'SourceSans3';
+    src: url('assets/SourceSans3-VariableFont_wght.ttf') format('truetype');
+    font-display: swap;
+  }
+
+  html, body {
+    margin: 0;
+    padding: 0;
+    background-color: #f8fdff;
+    font: 16px/1.55 'SourceSans3', Arial, sans-serif;
+    color: #333;
+  }
+
+  a { color: #10699b; }
+  a:hover { color: #1A6A96; }
+
+  .page-header {
+    background-color: #1385B7;
+    color: white;
+    padding: 0 11px;
+    height: 29px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .mapshaper-logo,
+  .mapshaper-logo:hover {
+    font-weight: 600;
+    font-size: 17px;
+    color: white;
+    text-decoration: none;
+  }
+
+  .mapshaper-logo .logo-highlight {
+    color: #ffa;
+  }
+
+  .header-back {
+    color: white;
+    text-decoration: none;
+    font-size: 14px;
+    height: 29px;
+    display: inline-flex;
+    align-items: center;
+    padding: 0 10px;
+  }
+
+  .header-back:hover {
+    background-color: #1A6A96;
+    color: white;
+  }
+
+  main {
+    max-width: 640px;
+    margin: 0 auto;
+    padding: 40px 24px 80px;
+  }
+
+  h1 {
+    font-weight: 600;
+    font-size: 32px;
+    margin: 0 0 8px;
+    color: #222;
+  }
+
+  .updated {
+    color: #888;
+    font-size: 14px;
+    margin: 0 0 28px;
+  }
+
+  h2 {
+    font-weight: 600;
+    font-size: 20px;
+    margin: 32px 0 10px;
+    color: #222;
+  }
+
+  p {
+    margin: 0 0 14px;
+  }
+
+  ul {
+    padding-left: 20px;
+    margin: 8px 0 16px;
+  }
+
+  ul li {
+    margin-bottom: 6px;
+  }
+
+  .footer-note {
+    margin-top: 48px;
+    padding-top: 24px;
+    border-top: 1px solid #e0e8ec;
+    font-size: 14px;
+    color: #777;
+  }
+
+  .footer-note a {
+    color: #777;
+  }
+
+  @media (max-width: 480px) {
+    main { padding: 24px 18px 60px; }
+    h1 { font-size: 26px; }
+  }
+</style>
+</head>
+<body>
+
+<header class="page-header">
+  <a href="." class="mapshaper-logo">map<span class="logo-highlight">shaper</span></a>
+  <a href="." class="header-back">&larr; Back to mapshaper</a>
+</header>
+
+<main>
+
+<h1>Terms of Service</h1>
+<p class="updated">Last updated: April 2026</p>
+
+<h2>Acceptance</h2>
+<p>By using mapshaper.org or related services (collectively, &ldquo;the service&rdquo;), you agree to these terms. If you do not agree, please do not use the service.</p>
+
+<h2>About mapshaper</h2>
+<p>Mapshaper is free, open-source software for editing geographic data, hosted at mapshaper.org and maintained by Matthew Bloch. The source code is licensed under the <a href="https://github.com/mbloch/mapshaper/blob/master/LICENSE.txt">Mozilla Public License 2.0</a>.</p>
+
+<h2>Use of the software</h2>
+<p>The software is provided under the terms of the MPL 2.0. You may use, modify, and redistribute the source code in accordance with that license. These Terms of Service govern your use of mapshaper.org as a hosted service; the MPL 2.0 governs your rights to the source code.</p>
+
+<h2>Your responsibilities</h2>
+<p>You are responsible for:</p>
+<ul>
+  <li>The accuracy and legality of any data you load into or process with mapshaper</li>
+  <li>Ensuring you have the right to use any data you load (copyright, licensing, terms of source data)</li>
+  <li>Compliance with all applicable laws in your use of the service</li>
+  <li>Not using the service to violate the rights of others, transmit illegal content, or attempt to disrupt the service or its third-party providers</li>
+</ul>
+
+<h2>No warranty</h2>
+<p>The service is provided &ldquo;as is&rdquo; and &ldquo;as available,&rdquo; without warranty of any kind, express or implied. We make no warranty that the service will be uninterrupted, secure, error-free, or that any output will be accurate, complete, or fit for any particular purpose.</p>
+<p>Map data, basemaps, and conversion results may contain errors. Do not rely on mapshaper output for navigation, safety-critical decisions, legal boundaries, or other applications where accuracy is essential.</p>
+
+<h2>Limitation of liability</h2>
+<p>To the maximum extent permitted by law, mapshaper, its maintainer, and contributors are not liable for any direct, indirect, incidental, consequential, special, or punitive damages arising from your use of (or inability to use) the service, including but not limited to loss of data, business interruption, lost profits, or any other commercial damages.</p>
+
+<h2>Contributions</h2>
+<p>Contributions made via Ko-fi or GitHub Sponsors are voluntary. They are not tax-deductible (mapshaper is not a registered charity). Contributions are non-refundable except in cases of fraud or technical error. Refund requests should be directed to the payment processor (Ko-fi, Stripe, or GitHub).</p>
+
+<h2>Third-party services</h2>
+<p>The service relies on third-party providers including:</p>
+<ul>
+  <li><strong>GitHub Pages</strong> for site hosting</li>
+  <li><strong>Mapbox</strong> for basemap tiles</li>
+  <li><strong>Google Analytics</strong> for usage analytics</li>
+  <li><strong>Stripe</strong>, <strong>Ko-fi</strong>, and <strong>GitHub Sponsors</strong> for payment processing</li>
+</ul>
+<p>When you interact with these services through mapshaper, their terms of service and privacy policies also apply. We are not responsible for the availability, behavior, or content of third-party services.</p>
+
+<h2>Changes to these terms</h2>
+<p>These terms may be updated. The &ldquo;Last updated&rdquo; date at the top reflects the most recent change. Continued use of the service after changes constitutes acceptance of the updated terms.</p>
+
+<h2>Governing law</h2>
+<p>These terms are governed by the laws of the State of New York, United States, without regard to conflict-of-law principles.</p>
+
+<h2>Contact</h2>
+<p>Questions about these terms can be sent to the maintainer via <a href="https://github.com/mbloch/mapshaper/issues">GitHub</a> or <a href="https://ko-fi.com/mapshaper">Ko-fi</a>.</p>
+
+<div class="footer-note">
+  <a href="privacy.html">Privacy Policy</a> &middot; <a href="sponsor.html">Support mapshaper</a> &middot; <a href=".">Back to mapshaper</a>
+</div>
+
+</main>
+
+</body>
+</html>