mapshaper 0.7.2 → 0.7.4

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2025, Matthew Bloch
+Copyright (c) 2026, Matthew Bloch
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this

package/bin/mapshaper-gui

@@ -16,6 +16,7 @@ var defaultPort = 5555,
       .option('-t, --target <name>', 'name of layer to select initially')
       .addOption(new commander.Option('-b, --blurb <text>',
         'replace the default blurb on the import screen').hideHelp())
+      .argument('[file...]', 'data files to load')
       .helpOption('-h, --help', 'show this help message')
       .version(require('../package.json').version)
       .parse(process.argv),
@@ -25,7 +26,6 @@ var defaultPort = 5555,
     url = require("url"),
     fs = require("fs"),
     Cookies = require("cookies"),
-    opn = require("opn"),
     webRoot = path.join(__dirname, "../www"),
     port = parseInt(opts.port, 10) || defaultPort,
     dataFiles = expandShapefiles(program.args),
@@ -66,10 +66,24 @@ function startServer(port) {
       // block attempts to load files outside webroot
       serve404(response);
     } else if (uri == '/close') {
-      // end process when page closes, unless page is immediately refreshed
+      // End process when page closes, unless page is immediately refreshed.
+      // The grace window (1500ms) gives the refreshed page time to send
+      // /cancel-close. A short window is not safe here: with sendBeacon,
+      // /close frequently arrives at the server *after* the new page's
+      // resource fetches have already been served, so we can't rely on
+      // those fetches to reset the timer for us.
       timeout = setTimeout(function() {
         process.exit(0);
-      }, 200);
+      }, 1500);
+      response.writeHead(204); // no content
+      response.end();
+    } else if (uri == '/cancel-close') {
+      // The page-load-time refresh detection in src/gui/gui.mjs sends this
+      // when sessionStorage indicates the new page is a refresh of the
+      // previous tab incarnation. clearTimeout above already cancelled any
+      // pending exit; we just need to acknowledge the request.
+      response.writeHead(204);
+      response.end();
     } else if (uri == "/manifest.js") {
       if (!sessionId && opts.directSave) {
         // create a session id for authenticating requests to save files
@@ -86,14 +100,24 @@ function startServer(port) {
     } else if (uri.indexOf('/save') === 0) {
       saveContent(request, response);
     } else {
-      // serve a file from the web root
-      if (uri == '/') {
-        uri = '/index.html';
+      // serve a file from the web root. Translate directory paths (any URI
+      // ending in '/') to their index.html so that links like '/docs/' work
+      // the way they do behind a normal static-file host (mapshaper.org).
+      if (uri.endsWith('/')) {
+        uri += 'index.html';
       }
       serveFile(getAssetFilePath(uri), response);
     }
   }).listen(port, 'localhost', function() {
-    opn("http://localhost:" + port);
+    // `open` is ESM-only since v9, so import it dynamically from this CJS bin
+    // script. Failure to launch a browser is non-fatal: the user can still
+    // visit the URL printed (or implied) by the running server.
+    import('open').then(function(mod) {
+      return mod.default("http://localhost:" + port);
+    }).catch(function(err) {
+      console.error("Could not open browser automatically; visit http://localhost:" + port + " manually.");
+      console.error(err && err.message || err);
+    });
   });
 }
 

package/mapshaper.js

@@ -12416,8 +12416,8 @@
     return obj;
   };
 
-  async function writeFiles(exports, opts) {
-    return _writeFiles(exports, opts);
+  async function writeFiles(exports$1, opts) {
+    return _writeFiles(exports$1, opts);
   }
 
   // Used by GUI to replace the CLI version of writeFiles()
@@ -12426,24 +12426,24 @@
     _writeFiles = func;
   }
 
-  var _writeFiles = function(exports, opts) {
-    if (exports.length > 0 === false) {
+  var _writeFiles = function(exports$1, opts) {
+    if (exports$1.length > 0 === false) {
       message("No files to save");
     } else if (opts.dry_run) ; else if (opts.stdout) {
       // Using async writeFile() function -- synchronous output to stdout can
       // trigger EAGAIN error, e.g. when piped to less.
-      require$1('rw').writeFile('/dev/stdout', exports[0].content, function() {});
+      require$1('rw').writeFile('/dev/stdout', exports$1[0].content, function() {});
     } else {
       if (opts.zip) {
-        exports = [{
+        exports$1 = [{
           // TODO: add output subdirectory, if relevant
           filename: opts.zipfile || 'output.zip',
-          content: zipSync(exports)
+          content: zipSync(exports$1)
         }];
       }
-      var paths = getOutputPaths(utils.pluck(exports, 'filename'), opts);
+      var paths = getOutputPaths(utils.pluck(exports$1, 'filename'), opts);
       var inputFiles = getStashedVar('input_files');
-      exports.forEach(function(obj, i) {
+      exports$1.forEach(function(obj, i) {
         var path = paths[i];
         if (obj.content instanceof ArrayBuffer) {
           // replacing content so ArrayBuffers can be gc'd
@@ -14993,10 +14993,10 @@
     return d;
   }
 
-  var cache$1 = {};
+  var cache = {};
 
   function getParseRxp(fmt) {
-    if (fmt in cache$1) return cache$1[fmt];
+    if (fmt in cache) return cache[fmt];
     var rxp = fmt;
     rxp = rxp.replace('[-]', '(?<prefix>-)?'); // optional -
     rxp = rxp.replace(/\[[NSEW, +-]{2,}\]/, '(?<prefix>$&)');
@@ -15020,11 +15020,11 @@
     rxp = '^' + rxp + '$';
     try {
       // TODO: make sure all DMS codes have been matched
-      cache$1[fmt] = new RegExp(rxp);
+      cache[fmt] = new RegExp(rxp);
     } catch(e) {
       stop$1('Invalid DMS format string:', fmt);
     }
-    return cache$1[fmt];
+    return cache[fmt];
   }
 
   function formatNumber(val, integers, decimals) {
@@ -21150,15 +21150,6 @@
     getSphereEffectParams: getSphereEffectParams
   });
 
-  var cache = {};
-  function fetchFileSync(url) {
-    if (url in cache) return cache[url];
-    var res  = require$1('sync-request')('GET', url, {timeout: 2000});
-    var content = res.getBody().toString();
-    cache[url] = content;
-    return content;
-  }
-
   // convert object properties to definitions for images and hatch fills
   function convertPropertiesToDefinitions(obj, defs) {
     procNode(obj);
@@ -21183,6 +21174,13 @@
   function convertSvgImage(obj, defs) {
     // Same-origin policy prevents embedding images in the web UI
     var href = obj.properties.href;
+    // Remote URLs were previously fetched at export time so the SVG could be
+    // embedded inline. That capability has been removed (it required a
+    // synchronous-HTTP dependency built on a child-process hack); download
+    // the asset first and reference it by local path instead.
+    if (href.indexOf('http') === 0) {
+      stop$1('Remote SVG asset references are not supported. Download the file first and reference it by a local path:', href);
+    }
     // look for a previously added definition to use
     // (assumes that images that share the same href can also use the same defn)
     var item = utils.find(defs, function(item) {return item.href == href;});
@@ -21200,12 +21198,12 @@
     }
   }
 
-  // Returns the content of an SVG file from a local path or URL
-  // Returns '' if unable to get the content (e.g. due to cross-domain security rules)
+  // Returns the content of an SVG file from a local path.
+  // Returns '' if unable to get the content; the caller leaves the original
+  // <image> tag in the output so the SVG renderer can attempt to load it.
   function serializeSvgImage(href, id) {
     var svg = '';
     try {
-      // try to download the SVG content and use that
       svg = convertSvgToDefn(getSvgContent(href), id) + '\n';
       svg = '<!-- ' + href + '-->\n' + svg; // add href as a comment, to aid in debugging
     } catch(e) {
@@ -21216,20 +21214,12 @@
     return svg;
   }
 
-  // href: A URL or a local path
-  // TODO: download SVG files asynchronously
-  // (currently, files are downloaded synchronously, which is obviously undesirable)
-  //
+  // href: A local path
   function getSvgContent(href) {
-    var content;
-    if (href.indexOf('http') === 0) {
-      content = fetchFileSync(href);
-    } else if (require$1('fs').existsSync(href)) {
-      content = require$1('fs').readFileSync(href, 'utf8');
-    } else {
-      stop$1("Invalid SVG location:", href);
+    if (require$1('fs').existsSync(href)) {
+      return require$1('fs').readFileSync(href, 'utf8');
     }
-    return content;
+    stop$1("Invalid SVG location:", href);
   }
 
   function convertSvgToDefn(svg, id) {
@@ -21372,12 +21362,27 @@ ${svg}
     var geojson = exportDatasetAsGeoJSON(d, opts);
     var features = geojson.features || geojson.geometries || (geojson.type ? [geojson] : []);
     var children = importGeoJSONFeatures(features, opts);
+    // Drop empty placeholder <g/> elements (features whose geometry was null in the
+    // source data, collapsed during simplification, or otherwise produced no
+    // visible output). Keep the layer's records in lockstep so that data-*
+    // attributes added via -o svg-data= remain correctly aligned.
+    var records = lyr.data ? lyr.data.getRecords() : null;
+    var keptRecords = records ? [] : null;
+    children = children.filter(function(child, i) {
+      if (isEmptyPlaceholder(child)) return false;
+      if (keptRecords) keptRecords.push(records[i]);
+      return true;
+    });
     if (opts.svg_data && lyr.data) {
-      addDataAttributesToSVG(children, lyr.data, opts.svg_data);
+      addDataAttributesToSVG(children, keptRecords, lyr.data.getFields(), opts.svg_data);
     }
     return children;
   }
 
+  function isEmptyPlaceholder(o) {
+    return o.tag == 'g' && (!o.children || o.children.length === 0);
+  }
+
   function validateSvgDataFields(layers, fieldsArg) {
     var missingFields = fieldsArg.reduce(function(memo, field) {
       if (!fieldExists(layers, field)) {
@@ -21397,15 +21402,13 @@ ${svg}
     }
   }
 
-  function addDataAttributesToSVG(children, table, fieldsArg) {
-    var allFields = table.getFields();
+  function addDataAttributesToSVG(children, records, allFields, fieldsArg) {
     var dataFields = fieldsArg.indexOf('*') > -1 ? allFields.concat() : fieldsArg;
     var missingFields = utils.difference(dataFields, allFields);
     if (missingFields.length > 0) {
       dataFields = utils.difference(dataFields, missingFields);
       // stop("Missing data field(s):", missingFields.join(', '));
     }
-    var records = table.getRecords();
     var data = exportDataAttributesForSVG(records, dataFields);
     if (children.length != data.length) {
       error("Mismatch between number of SVG symbols and data attributes");
@@ -52127,7 +52130,7 @@ ${svg}
     });
   }
 
-  var version = "0.7.2";
+  var version = "0.7.4";
 
   // 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.2",
+  "version": "0.7.4",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -20,7 +20,7 @@
     "url": "git+https://github.com/mbloch/mapshaper.git"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=20.11.0"
   },
   "scripts": {
     "test": "mocha test",
@@ -38,7 +38,9 @@
     "/www/**",
     "!/www/nacis/**",
     "/mapshaper.js",
-    "!.DS_Store"
+    "!.DS_Store",
+    "!/www/docs/**",
+    "!/www/llms*"
   ],
   "dependencies": {
     "@ngageoint/geopackage": "^4.2.6",
@@ -47,7 +49,7 @@
     "@xmldom/xmldom": "^0.8.6",
     "adm-zip": "^0.5.9",
     "big.js": "^7.0.1",
-    "commander": "7.0.0",
+    "commander": "^14.0.3",
     "cookies": "^0.8.0",
     "d3-color": "3.1.0",
     "d3-interpolate": "^3.0.1",
@@ -63,9 +65,8 @@
     "kdbush": "^3.0.0",
     "mproj": "0.0.40",
     "msgpackr": "^1.10.1",
-    "opn": "^5.3.0",
+    "open": "^11.0.0",
     "rw": "~1.3.3",
-    "sync-request": "6.1.0",
     "tinyqueue": "^2.0.3"
   },
   "devDependencies": {
@@ -76,7 +77,7 @@
     "eslint": "^8.16.0",
     "highlight.js": "^11.11.1",
     "marked": "^18.0.2",
-    "mocha": "^10.2.0",
+    "mocha": "^11.7.5",
     "rollup": "^4.44.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
     "shell-quote": "^1.7.4",