mapshaper 0.7.20 → 0.7.21

package/bin/mapshaper-gui

@@ -14,6 +14,7 @@ var defaultPort = 5555,
       .option('-n, --name <name(s)>', 'rename input layer or layers')
       .option('-c, --commands <string>', 'console commands to run initially')
       .option('-t, --target <name>', 'name of layer to select initially')
+      .option('-w, --watch', 'watch input files and reload the browser on change')
       .addOption(new commander.Option('-b, --blurb <text>',
         'replace the default blurb on the import screen').hideHelp())
       .argument('[file...]', 'data files to load')
@@ -30,9 +31,26 @@ var defaultPort = 5555,
     port = parseInt(opts.port, 10) || defaultPort,
     dataFiles = expandShapefiles(program.args),
     probeCount = 0,
-    sessionId = null;
+    sessionId = null,
+    sseClients = [],
+    reloadTimer = null;
 validateFiles(dataFiles);
 
+if (opts.watch && dataFiles.length > 0) {
+  dataFiles.forEach(function(file) {
+    if (isUrl(file)) return;
+    fs.watch(file, function() {
+      // debounce: editors often write files in multiple steps
+      clearTimeout(reloadTimer);
+      reloadTimer = setTimeout(function() {
+        sseClients.forEach(function(res) {
+          try { res.write('event: reload\ndata: changed\n\n'); } catch(e) {}
+        });
+      }, 150);
+    });
+  });
+}
+
 process.on('uncaughtException', function(err) {
   // added 'code' for Node.js v16
   if (err.errno === 'EADDRINUSE' || err.code === 'EADDRINUSE') {
@@ -99,6 +117,18 @@ function startServer(port) {
       serveFile(getDataFilePath(uri), response);
     } else if (uri.indexOf('/save') === 0) {
       saveContent(request, response);
+    } else if (uri == '/sse' && opts.watch) {
+      // Server-Sent Events endpoint for file-watch reload notifications
+      response.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive'
+      });
+      response.write('data: connected\n\n');
+      sseClients.push(response);
+      request.on('close', function() {
+        sseClients = sseClients.filter(function(c) { return c !== response; });
+      });
     } else {
       // serve a file from the web root. Translate directory paths (any URI
       // ending in '/') to their index.html so that links like '/docs/' work
@@ -106,7 +136,21 @@ function startServer(port) {
       if (uri.endsWith('/')) {
         uri += 'index.html';
       }
-      serveFile(getAssetFilePath(uri), response);
+      if (opts.watch && uri == '/index.html') {
+        // inject SSE reload script into index.html
+        var htmlPath = getAssetFilePath('/index.html');
+        fs.readFile(htmlPath, 'utf8', function(err, content) {
+          if (err) return serve404(response);
+          var script = '<script>(function(){' +
+            'var es=new EventSource("/sse");' +
+            'es.addEventListener("reload",function(){location.reload();});' +
+            '})();</script>';
+          content = content.replace('</body>', script + '\n</body>');
+          serveContent(content, response, 'text/html');
+        });
+      } else {
+        serveFile(getAssetFilePath(uri), response);
+      }
     }
   }).listen(port, 'localhost', function() {
     if (process.env.MAPSHAPER_GUI_NO_OPEN) return;
@@ -165,7 +209,7 @@ function serveContent(content, response, mimeType) {
   }
   response.setHeader('Cache-Control', 'no-cache');
   response.writeHead(200);
-  response.write(content, "binary");
+  response.write(content, Buffer.isBuffer(content) ? undefined : "utf8");
   response.end();
 }
 

package/mapshaper.js

@@ -7417,7 +7417,7 @@
           i = fw ? arcId : ~arcId,
           iter = _zz && _zlimit ? _filteredArcIter : _arcIter;
       if (i >= _nn.length) {
-        error("#getArcId() out-of-range arc id:", arcId);
+        error("#getArcId() out-of-range arc id:", arcId, `(max id: ${_nn.length - 1})`);
       }
       return iter.init(_ii[i], _nn[i], fw, _zlimit);
     };
@@ -17446,9 +17446,14 @@
     var layers = layersArg.filter(getFeatureCount); // ignore empty layers
     var merged = {};
     opts = opts || {};
+    if (!layers.length && layersArg.length > 1) {
+      layers = layersArg; // merge all-empty layer sets
+    }
     if (!layers.length) return null;
     if (layers.length == 1) {
-      message('Use the target= option to specify multiple layers for merging');
+      if (layersArg.length == 1) {
+        message('Use the target= option to specify multiple layers for merging');
+      }
       return layers.concat();
     }
     merged.data = mergeDataFromLayers(layers, opts);
@@ -45286,23 +45291,23 @@ ${svg}
       profileEnd('clipLayers');
       return result;
     }
+    if (!usingPathClip) {
+      result = clipLayersByClipDataset(targetLayers, clipDataset, type, opts);
+      profileEnd('clipLayers');
+      return result;
+    }
     profileStart('mergeLayersForOverlay');
     mergedDataset = mergeLayersForOverlay2(targetLayers, targetDataset, clipDataset);
     profileEnd('mergeLayersForOverlay');
     clipLyr = mergedDataset.layers[mergedDataset.layers.length-1];
-    if (usingPathClip) {
-      nodes = addIntersectionCuts(mergedDataset, opts);
-      noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
-      targetDataset.arcs = mergedDataset.arcs;
-      markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
-      profileStart('clipDissolvePolygonLayer2');
-      clipLyr = utils.defaults({data: null}, clipLyr);
-      clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
-      profileEnd('clipDissolvePolygonLayer2');
-
-    } else {
-      nodes = new NodeCollection(mergedDataset.arcs);
-    }
+    nodes = addIntersectionCuts(mergedDataset, opts);
+    noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
+    targetDataset.arcs = mergedDataset.arcs;
+    markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
+    profileStart('clipDissolvePolygonLayer2');
+    clipLyr = utils.defaults({data: null}, clipLyr);
+    clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
+    profileEnd('clipDissolvePolygonLayer2');
 
     profileStart('clipLayersByLayer');
     result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
@@ -45311,6 +45316,16 @@ ${svg}
     return result;
   }
 
+  function clipLayersByClipDataset(targetLayers, clipDataset, type, opts) {
+    var clipLyr = clipDataset.layers[0];
+    var nodes = new NodeCollection(clipDataset.arcs);
+    var result;
+    profileStart('clipLayersByLayer');
+    result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
+    profileEnd('clipLayersByLayer');
+    return result;
+  }
+
   function clipRasterLayers(targetLayers, clipSrc, targetDataset, type, opts) {
     var clipDataset, clipBounds, bbox;
     if (type != 'clip') {
@@ -58299,8 +58314,7 @@ ${svg}
           // TODO: consider replacing old layers as they are generated, for gc
           replaceLayers(targetDataset, targetLayers, outputLayers);
           // some operations leave unreferenced arcs that should be cleaned up
-          if ((name == 'clip' || name == 'erase' || name == 'rectangle' ||
-              name == 'rectangles' || name == 'filter' && opts.cleanup) && !opts.no_cleanup) {
+          if (commandNeedsArcDissolve(name, targetLayers, opts)) {
             dissolveArcs(targetDataset);
           }
         }
@@ -58347,7 +58361,15 @@ ${svg}
     });
   }
 
-  var version = "0.7.20";
+  function commandNeedsArcDissolve(name, targetLayers, opts) {
+    if (opts.no_cleanup) return false;
+    if (name == 'clip' || name == 'erase') {
+      return utils.some(targetLayers || [], layerHasPaths);
+    }
+    return name == 'rectangle' || name == 'rectangles' || name == 'filter' && opts.cleanup;
+  }
+
+  var version = "0.7.21";
 
   // 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.7.20",
+  "version": "0.7.21",
   "description": "A tool for editing geospatial data for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/mapshaper-gui.js

@@ -17024,6 +17024,9 @@
     }
 
     function selectStyleFeature(id, e) {
+      if (selectionIds.includes(id)) {
+        return utils$1.difference(selectionIds, [id]);
+      }
       return eventUsesAdditiveSelection(e) ?
         toggleId(id, selectionIds) :
         [id];

package/www/mapshaper.js

@@ -7417,7 +7417,7 @@
           i = fw ? arcId : ~arcId,
           iter = _zz && _zlimit ? _filteredArcIter : _arcIter;
       if (i >= _nn.length) {
-        error("#getArcId() out-of-range arc id:", arcId);
+        error("#getArcId() out-of-range arc id:", arcId, `(max id: ${_nn.length - 1})`);
       }
       return iter.init(_ii[i], _nn[i], fw, _zlimit);
     };
@@ -17446,9 +17446,14 @@
     var layers = layersArg.filter(getFeatureCount); // ignore empty layers
     var merged = {};
     opts = opts || {};
+    if (!layers.length && layersArg.length > 1) {
+      layers = layersArg; // merge all-empty layer sets
+    }
     if (!layers.length) return null;
     if (layers.length == 1) {
-      message('Use the target= option to specify multiple layers for merging');
+      if (layersArg.length == 1) {
+        message('Use the target= option to specify multiple layers for merging');
+      }
       return layers.concat();
     }
     merged.data = mergeDataFromLayers(layers, opts);
@@ -45286,23 +45291,23 @@ ${svg}
       profileEnd('clipLayers');
       return result;
     }
+    if (!usingPathClip) {
+      result = clipLayersByClipDataset(targetLayers, clipDataset, type, opts);
+      profileEnd('clipLayers');
+      return result;
+    }
     profileStart('mergeLayersForOverlay');
     mergedDataset = mergeLayersForOverlay2(targetLayers, targetDataset, clipDataset);
     profileEnd('mergeLayersForOverlay');
     clipLyr = mergedDataset.layers[mergedDataset.layers.length-1];
-    if (usingPathClip) {
-      nodes = addIntersectionCuts(mergedDataset, opts);
-      noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
-      targetDataset.arcs = mergedDataset.arcs;
-      markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
-      profileStart('clipDissolvePolygonLayer2');
-      clipLyr = utils.defaults({data: null}, clipLyr);
-      clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
-      profileEnd('clipDissolvePolygonLayer2');
-
-    } else {
-      nodes = new NodeCollection(mergedDataset.arcs);
-    }
+    nodes = addIntersectionCuts(mergedDataset, opts);
+    noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
+    targetDataset.arcs = mergedDataset.arcs;
+    markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
+    profileStart('clipDissolvePolygonLayer2');
+    clipLyr = utils.defaults({data: null}, clipLyr);
+    clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
+    profileEnd('clipDissolvePolygonLayer2');
 
     profileStart('clipLayersByLayer');
     result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
@@ -45311,6 +45316,16 @@ ${svg}
     return result;
   }
 
+  function clipLayersByClipDataset(targetLayers, clipDataset, type, opts) {
+    var clipLyr = clipDataset.layers[0];
+    var nodes = new NodeCollection(clipDataset.arcs);
+    var result;
+    profileStart('clipLayersByLayer');
+    result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
+    profileEnd('clipLayersByLayer');
+    return result;
+  }
+
   function clipRasterLayers(targetLayers, clipSrc, targetDataset, type, opts) {
     var clipDataset, clipBounds, bbox;
     if (type != 'clip') {
@@ -58299,8 +58314,7 @@ ${svg}
           // TODO: consider replacing old layers as they are generated, for gc
           replaceLayers(targetDataset, targetLayers, outputLayers);
           // some operations leave unreferenced arcs that should be cleaned up
-          if ((name == 'clip' || name == 'erase' || name == 'rectangle' ||
-              name == 'rectangles' || name == 'filter' && opts.cleanup) && !opts.no_cleanup) {
+          if (commandNeedsArcDissolve(name, targetLayers, opts)) {
             dissolveArcs(targetDataset);
           }
         }
@@ -58347,7 +58361,15 @@ ${svg}
     });
   }
 
-  var version = "0.7.20";
+  function commandNeedsArcDissolve(name, targetLayers, opts) {
+    if (opts.no_cleanup) return false;
+    if (name == 'clip' || name == 'erase') {
+      return utils.some(targetLayers || [], layerHasPaths);
+    }
+    return name == 'rectangle' || name == 'rectangles' || name == 'filter' && opts.cleanup;
+  }
+
+  var version = "0.7.21";
 
   // 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.