mapshaper 0.7.18 → 0.7.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.7.18",
+  "version": "0.7.20",
   "description": "A tool for editing geospatial data for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -73,7 +73,7 @@
     "idb-keyval": "^6.2.0",
     "jpeg-js": "^0.4.4",
     "kdbush": "^3.0.0",
-    "mproj": "0.1.2",
+    "mproj": "0.1.3",
     "msgpackr": "^1.10.1",
     "open": "^11.0.0",
     "pngjs": "^7.0.0",

package/www/index.html

@@ -375,8 +375,8 @@ encoding=big5</span>. Click to see all options.</div></div></div>
 	</div>
 	<div class="mshp-main-map main-area map-area">
 		<div class="intersection-display">
-			<span class="intersection-count">0 line intersections</span>
-			<div class="repair-btn text-btn colored-text">Repair</div>
+			<span class="intersection-count">0 line intersections</span>&nbsp;
+			<span class="repair-btn text-btn colored-text">repair</span>
 		</div>
 		<div class="basemap-overlay-buttons basemap-buttons"></div>
 		<div class="map-layers"></div>

package/www/mapshaper-gui.js

@@ -6611,34 +6611,42 @@
 
     function getPayloadStore() {
       if (!gui.undoPayloadStore) {
-        gui.undoPayloadStore = createUndoPayloadStore(getUndoPayloadStoreOptions());
-        gui.undoPayloadStore.startLifecycle();
-        gui.undoPayloadStore.cleanupStaleSessions().then(function(result) {
-          logStartupCleanup({
-            count: result.keys.length,
-            sessionCount: result.sessionCount,
-            singular: 'undo payload',
-            plural: 'undo payloads',
-            sizeBytes: result.sizeBytes
-          });
-        }).catch(function() {});
+        gui.undoPayloadStore = createUndoPayloadStore(getUndoPayloadStoreOptions(gui));
       }
+      gui.undoPayloadStore.startLifecycle();
       return gui.undoPayloadStore;
     }
+  }
 
-    function getUndoPayloadStoreOptions() {
-      return {
-        maxBytes: getUndoStorageLimit('undoStorageMaxBytes', 1024 * 1024 * 1024),
-        maxPayloadBytes: getUndoStorageLimit('undoPayloadMaxBytes', 512 * 1024 * 1024)
-      };
+  function cleanupStaleUndoPayloads(gui) {
+    if (!gui.undoPayloadStore) {
+      gui.undoPayloadStore = createUndoPayloadStore(getUndoPayloadStoreOptions(gui));
     }
+    var store = gui.undoPayloadStore;
+    return store.cleanupStaleSessions().then(function(result) {
+      logStartupCleanup({
+        count: result.keys.length,
+        sessionCount: result.sessionCount,
+        singular: 'undo payload',
+        plural: 'undo payloads',
+        sizeBytes: result.sizeBytes
+      });
+      return result;
+    });
+  }
 
-    function getUndoStorageLimit(name, defaultValue) {
-      var opt = gui.options && gui.options[name],
-          query = getQueryValue$2(name);
-      if (query !== null && +query >= 0) return +query;
-      return opt >= 0 ? opt : defaultValue;
-    }
+  function getUndoPayloadStoreOptions(gui) {
+    return {
+      maxBytes: getUndoStorageLimit(gui, 'undoStorageMaxBytes', 1024 * 1024 * 1024),
+      maxPayloadBytes: getUndoStorageLimit(gui, 'undoPayloadMaxBytes', 512 * 1024 * 1024)
+    };
+  }
+
+  function getUndoStorageLimit(gui, name, defaultValue) {
+    var opt = gui && gui.options && gui.options[name],
+        query = getQueryValue$2(name);
+    if (query !== null && +query >= 0) return +query;
+    return opt >= 0 ? opt : defaultValue;
   }
 
   function getRedoCaptureUnits(units) {
@@ -6872,7 +6880,7 @@
     var mapCRS = gui.map.getActiveLayerCRS();
     var dataCRS = internal.getDatasetCRS(dataset);
     var msg, reproject;
-    if (!dataCRS || !mapCRS || internal.crsAreEqual(mapCRS, dataCRS)) return;
+    if (!dataCRS || !mapCRS || internal.crsHaveSameTransform(mapCRS, dataCRS)) return;
     if (!datasetCanBeReprojected(dataset, dataCRS, mapCRS)) {
       notifyProjectionMismatch(gui, dataset);
       return;
@@ -8373,7 +8381,7 @@
     if (!sourceCRS || !displayCRS) {
       return false;
     }
-    if (internal.crsAreEqual(sourceCRS, displayCRS)) {
+    if (internal.crsHaveSameTransform(sourceCRS, displayCRS)) {
       return false;
     }
     return true;
@@ -8522,7 +8530,7 @@
     if (!lyr.gui.geographic) {
       return;
     }
-    if (lyr.gui.dynamic_crs && internal.crsAreEqual(sourceCRS, lyr.gui.dynamic_crs)) {
+    if (lyr.gui.dynamic_crs && internal.crsHaveSameTransform(sourceCRS, lyr.gui.dynamic_crs)) {
       return;
     }
     var gui = lyr.gui;
@@ -15074,6 +15082,7 @@
     }
 
     function updateControls() {
+      syncTargetLayer();
       var geom = targetLayer && targetLayer.geometry_type;
       var manualIds = getSelectionIds();
       if (!targetLayer) return;
@@ -15159,6 +15168,7 @@
 
     function runStyleCommand(styles, opts) {
       var parts = ['-style'];
+      syncTargetLayer();
       var ids = getTargetIds();
       if (!gui.console || !targetLayer || ids.length === 0) return;
       if (!opts || !opts.preservePreset) {
@@ -15187,6 +15197,7 @@
 
     function applyRandomFillColors() {
       var cmd = '-classify colors=random non-adjacent';
+      syncTargetLayer();
       if (!gui.console || !targetLayer || targetLayer.geometry_type != 'polygon') return;
       if (getActiveLayer() != targetLayer) {
         cmd += ' target=' + internal.formatOptionValue(internal.getLayerTargetId(gui.model, targetLayer));
@@ -15250,6 +15261,7 @@
 
     function clearLayerStyle() {
       var parts = ['-style clear'];
+      syncTargetLayer();
       if (!gui.console || !targetLayer) return;
       presetControl.clearSelection();
       addTargetOption(parts);
@@ -15335,6 +15347,17 @@
       return active && active.layer;
     }
 
+    function syncTargetLayer() {
+      var lyr = getActiveLayer();
+      if (lyr == targetLayer) return;
+      if (layerCanBeStyled(lyr)) {
+        targetLayer = lyr;
+        if (hit) hit.clearSelection();
+      } else {
+        targetLayer = null;
+      }
+    }
+
     function closePanel() {
       turnOff();
       if (gui.interaction.getMode() == 'line_style' || gui.interaction.getMode() == 'polygon_style') {
@@ -15654,6 +15677,7 @@
     }
 
     function updateControls() {
+      syncTargetLayer();
       var representation = getPointRepresentation();
       updateCreateLabelsButton();
       title.text(representation == 'circle' ? 'Circle styles' : 'Point symbols');
@@ -15798,6 +15822,7 @@
     }
 
     function runStyleCommand(args, title) {
+      syncTargetLayer();
       var ids = getTargetIds();
       var parts = ['-style'].concat(args);
       if (!targetLayer || ids.length === 0) return;
@@ -16001,6 +16026,17 @@
       return active && active.layer;
     }
 
+    function syncTargetLayer() {
+      var lyr = getActiveLayer();
+      if (lyr == targetLayer) return;
+      if (layerCanBeStyled(lyr)) {
+        targetLayer = lyr;
+        if (hit) hit.clearSelection();
+      } else {
+        targetLayer = null;
+      }
+    }
+
     function modelSelectLayer(lyr, dataset) {
       if (lyr) lyr.hidden = false;
       gui.model.selectLayer(lyr, dataset);
@@ -17274,18 +17310,18 @@
         height = 0;
 
     el.on('mouseover', update);
-    if (window.onorientationchange) window.addEventListener('orientationchange', update);
+    if (window.onorientationchange) window.addEventListener('orientationchange', function() { update('window'); });
     window.addEventListener('scroll', update);
-    window.addEventListener('resize', update);
+    window.addEventListener('resize', function() { update('window'); });
 
     // trigger an update, e.g. when map container is resized
-    this.update = function() {
-      update();
+    this.update = function(source) {
+      update(source);
     };
 
-    this.resize = function(w, h) {
+    this.resize = function(w, h, source) {
       el.css('width', w).css('height', h);
-      update();
+      update(source);
     };
 
     this.width = function() { return width; };
@@ -17300,7 +17336,7 @@
       };
     };
 
-    function update() {
+    function update(source) {
       var div = el.node(),
           xy = getPageXY(div),
           w = div.clientWidth,
@@ -17316,7 +17352,7 @@
         height = h;
         self.dispatchEvent('change', self.position());
         if (resized) {
-          self.dispatchEvent('resize', self.position());
+          self.dispatchEvent('resize', Object.assign(self.position(), {source: source}));
         }
       }
     }
@@ -20279,7 +20315,7 @@
     _position.on('resize', function(e) {
       if (ready()) {
         // triggerChangeEvent({resize: true});
-        triggerChangeEvent();
+        triggerChangeEvent({resize: true, resizeSource: e.source});
       }
     });
 
@@ -20450,8 +20486,8 @@
       _scale = scale;
     }
 
-    function triggerChangeEvent() {
-      _self.dispatchEvent('change');
+    function triggerChangeEvent(data) {
+      _self.dispatchEvent('change', data);
     }
 
     // stop zooming before rounding errors become too obvious
@@ -20543,7 +20579,7 @@
   function getCachedRasterViewportPreview(layer, ext) {
     var entry = cache$1.get(layer);
     var params = getRasterViewportPreviewParams(layer, ext);
-    if (!entry || !params || entry.key != params.key) return null;
+    if (!entry || !params || !rasterViewportCacheEntryMatches(entry, params)) return null;
     return entry.preview;
   }
 
@@ -20552,9 +20588,9 @@
     var entry = cache$1.get(layer);
     var id, stats, timing, preview;
     if (!params || !params.needed) return;
-    if (entry && entry.key == params.key) return;
+    if (entry && rasterViewportCacheEntryMatches(entry, params)) return;
     id = ++requestId$1;
-    cache$1.set(layer, {key: params.key, pending: id});
+    cache$1.set(layer, getRasterViewportCacheEntry(params, {pending: id}));
     setTimeout(function() {
       var current = cache$1.get(layer);
       if (!current || current.pending != id) return;
@@ -20566,10 +20602,7 @@
       logRasterPreviewTiming(params, timing);
       current = cache$1.get(layer);
       if (!preview || !current || current.pending != id) return;
-      cache$1.set(layer, {
-        key: params.key,
-        preview: preview
-      });
+      cache$1.set(layer, getRasterViewportCacheEntry(params, {preview: preview}));
       onReady();
     }, 0);
   }
@@ -20631,6 +20664,17 @@
     };
   }
 
+  function rasterViewportCacheEntryMatches(entry, params) {
+    return entry.key == params.key && entry.grid == params.grid && entry.samples == params.grid.samples;
+  }
+
+  function getRasterViewportCacheEntry(params, entry) {
+    entry.key = params.key;
+    entry.grid = params.grid;
+    entry.samples = params.grid.samples;
+    return entry;
+  }
+
   function getCachedRasterScalingStats(params, timing) {
     var cached = params.raster.view && params.raster.view.scalingStats;
     var key;
@@ -20736,6 +20780,7 @@
     var params = getRasterReprojectedPreviewParams(layer, ext);
     var entry = cache.get(layer);
     if (!entry || !entry.preview) return null;
+    if (params && !rasterReprojectedCacheSourceMatches(entry, params)) return null;
     if (!params || entry.key != params.key) return entry.preview;
     return entry.preview;
   }
@@ -20745,9 +20790,9 @@
     var entry = cache.get(layer);
     var id, timing;
     if (!params) return;
-    if (entry && entry.key == params.key) return;
+    if (entry && rasterReprojectedCacheEntryMatches(entry, params)) return;
     id = ++requestId;
-    cache.set(layer, {key: params.key, pending: id});
+    cache.set(layer, getRasterReprojectedCacheEntry(params, {pending: id}));
     setTimeout(function() {
       var current = cache.get(layer);
       var grid, preview;
@@ -20777,7 +20822,7 @@
       preview.bbox = grid.bbox;
       current = cache.get(layer);
       if (!current || current.pending != id) return;
-      cache.set(layer, {key: params.key, preview: preview});
+      cache.set(layer, getRasterReprojectedCacheEntry(params, {preview: preview}));
       onReady();
     }, 0);
   }
@@ -20843,6 +20888,21 @@
     ].join('|');
   }
 
+  function rasterReprojectedCacheEntryMatches(entry, params) {
+    return entry.key == params.key && rasterReprojectedCacheSourceMatches(entry, params);
+  }
+
+  function rasterReprojectedCacheSourceMatches(entry, params) {
+    return entry.grid == params.grid && entry.samples == params.grid.samples;
+  }
+
+  function getRasterReprojectedCacheEntry(params, entry) {
+    entry.key = params.key;
+    entry.grid = params.grid;
+    entry.samples = params.grid.samples;
+    return entry;
+  }
+
   function applyCoverageMask(preview, coverage) {
     var pixels = preview && preview.pixels;
     if (!pixels || !coverage) return;
@@ -22349,7 +22409,10 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
         _visibleLayers = [], // cached visible map layers
         _hit, _nav,
         _intersectionLyr, _activeLyr, _overlayLayers,
-        _renderer, _dynamicCRS;
+        _renderer, _dynamicCRS,
+        _resizeRedrawTimer = null;
+
+    var RESIZE_REDRAW_DELAY = 200;
 
     _mouse.disable(); // wait for gui.focus() to activate mouse events
 
@@ -22499,14 +22562,44 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
       _ext.on('change', function(e) {
         gui?.basemap.refresh(); // keep basemap synced up (if enabled)
-        drawLayers(e.redraw ? '' : 'nav');
+        if (e.resize) {
+          drawLayersForResize(e.resizeSource);
+        } else {
+          cancelResizeRedraw();
+          drawLayers(e.redraw ? '' : 'nav');
+        }
       });
 
-      gui.on('resize', function() {
-        position.update(); // kludge to detect new map size after console toggle
+      gui.on('resize', function(e) {
+        position.update(e.source); // kludge to detect new map size after console toggle
       });
     };
 
+    function drawLayersForResize(source) {
+      if (source == 'sidebar') {
+        cancelResizeRedraw();
+        drawLayers();
+      } else {
+        drawLayers('nav');
+        scheduleResizeRedraw();
+      }
+    }
+
+    function scheduleResizeRedraw() {
+      cancelResizeRedraw();
+      _resizeRedrawTimer = setTimeout(function() {
+        _resizeRedrawTimer = null;
+        drawLayers();
+      }, RESIZE_REDRAW_DELAY);
+    }
+
+    function cancelResizeRedraw() {
+      if (_resizeRedrawTimer) {
+        clearTimeout(_resizeRedrawTimer);
+        _resizeRedrawTimer = null;
+      }
+    }
+
     function getGlobalStyleOptions(opts) {
       var mode = gui.state.interaction_mode;
       return Object.assign({
@@ -23605,6 +23698,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     initModeRules(gui);
     startRasterSourceStoreLifecycle();
+    cleanupStaleUndoPayloads(gui).catch(function() {});
     gui.map.init();
 
     if (opts.saveControl) {
@@ -23666,7 +23760,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
         .classed('layers-open', sidebarPanel == 'layers')
         .classed('console-open', sidebarPanel == 'console');
       gui.dispatchEvent('sidebar', {name: sidebarPanel, prev: prev});
-      gui.dispatchEvent('resize');
+      gui.dispatchEvent('resize', {source: 'sidebar'});
     };
 
     gui.toggleSidebarPanel = function(name) {
@@ -23769,7 +23863,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       if (sidebarResizeFrame) return;
       sidebarResizeFrame = requestAnimationFrame(function() {
         sidebarResizeFrame = null;
-        gui.dispatchEvent('resize');
+        gui.dispatchEvent('resize', {source: 'sidebar-resize'});
       });
     }
   }