mapshaper 0.6.88 → 0.6.90

package/mapshaper.js

@@ -11557,7 +11557,6 @@
     return ss && ss.isFile() || false;
   };
 
-
   // cli.fileSize = function(path) {
   //   var ss = cli.statSync(path);
   //   return ss && ss.size || 0;
@@ -11600,16 +11599,32 @@
   };
 
   // content: Buffer or string
-  cli.writeFile = function(fname, content, cb) {
-    var fs = require$1('rw');
+  cli.writeFileSync = function(fname, content) {
     cli.createDirIfNeeded(fname);
-    if (cb) {
-      fs.writeFile(fname, content, cb);
+    if (utils.isString(content)) {
+      require$1('fs').writeFileSync(fname, content);
     } else {
-      fs.writeFileSync(fname, content);
+      // as of Node.js v20, on a typical machine, max buffer size is 4gb but the max
+      // write buffer size is 2gb. An error is thrown when writing >2gb and <4gb.
+      // To support writing files up to 4gb, files are written in chunks.
+      cli.writeFileInChunks(fname, content, 1e7);
     }
   };
 
+  cli.writeFileInChunks = function(fname, buffer, chunkSize) {
+    var fs = require$1('fs');
+    var fd = fs.openSync(fname, 'w');
+    var offset = 0;
+    var bufLen = buffer.length;
+    var bytesWritten, bytesToWrite;
+    do {
+      bytesToWrite = Math.min(chunkSize, bufLen - offset);
+      bytesWritten = fs.writeSync(fd, buffer, offset, bytesToWrite);
+      offset += bytesWritten;
+    } while (bytesWritten > 0 && offset < bufLen);
+    fs.closeSync(fd);
+  };
+
   // Returns Node Buffer
   cli.convertArrayBuffer = function(buf) {
     var src = new Uint8Array(buf),
@@ -11700,9 +11715,8 @@
     return obj;
   };
 
-  function writeFiles(exports, opts, cb) {
-    cb = cb || function() {};
-    return _writeFiles(exports, opts, cb);
+  async function writeFiles(exports, opts) {
+    return _writeFiles(exports, opts);
   }
 
   // Used by GUI to replace the CLI version of writeFiles()
@@ -11711,13 +11725,13 @@
     _writeFiles = func;
   }
 
-  var _writeFiles = function(exports, opts, cb) {
+  var _writeFiles = function(exports, opts) {
     if (exports.length > 0 === false) {
       message("No files to save");
     } else if (opts.dry_run) ; else if (opts.stdout) {
-      // Pass callback for asynchronous output (synchronous output to stdout can
-      // trigger EAGAIN error, e.g. when piped to less)
-      return cli.writeFile('/dev/stdout', exports[0].content, cb);
+      // 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() {});
     } else {
       if (opts.zip) {
         exports = [{
@@ -11741,11 +11755,10 @@
         if (!opts.force && inputFiles.indexOf(path) > -1) {
           stop('Need to use the "-o force" option to overwrite input files.');
         }
-        cli.writeFile(path, obj.content);
+        cli.writeFileSync(path, obj.content);
         message("Wrote " + path);
       });
     }
-    if (cb) cb(null);
   };
 
   function getOutputPaths(files, opts) {
@@ -23469,8 +23482,7 @@ ${svg}
       if (pathInfo.directory) {
         o.directory = pathInfo.directory;
         // no longer checking for missing directory
-        // (cli.writeFile() now creates directories that don't exist)
-        // cli.validateOutputDir(o.directory);
+        // (cli.writeFileSync() now creates directories that don't exist)
       }
       if (/gz/i.test(pathInfo.extension)) {
         // handle arguments like -o out.json.gz (the preferred format)
@@ -45388,7 +45400,7 @@ ${svg}
           //// catalog = null;
           job.catalog = new Catalog();
         }
-        await utils.promisify(writeFiles)(outputFiles, opts);
+        await writeFiles(outputFiles, opts);
 
       } else if (name == 'point-grid') {
         outputLayers = [cmd.pointGrid(targetDataset, opts)];
@@ -45584,7 +45596,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.88";
+  var version = "0.6.90";
 
   // 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.88",
+  "version": "0.6.90",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -56,7 +56,7 @@
     "iconv-lite": "^0.6.3",
     "idb-keyval": "^6.2.0",
     "kdbush": "^3.0.0",
-    "mproj": "0.0.38",
+    "mproj": "0.0.39",
     "msgpackr": "^1.10.1",
     "opn": "^5.3.0",
     "rw": "~1.3.3",

package/www/index.html

@@ -123,7 +123,7 @@
 		<div class="erase-btn btn sidebar-btn">Erase</div>
 		<div class="rect-btn btn sidebar-btn">Rectangle</div>
 		<div class="frame-btn btn sidebar-btn">Frame</div>
-		<div class="info-btn btn sidebar-btn">Coords</div>
+		<div class="info-btn btn sidebar-btn">Bounds</div>
 		<div class="box-coords selectable"></div>
 		<div class="cancel-btn btn sidebar-btn">Cancel</div>
 	</div>
@@ -135,7 +135,7 @@
 		<div class="filter-btn btn sidebar-btn">Keep</div>
 		<div class="duplicate-btn btn sidebar-btn">Duplicate</div>
 		<div class="split-btn btn sidebar-btn">Split</div>
-		<div class="coords-btn btn sidebar-btn toggle-btn">Coords</div>
+		<div class="coords-btn btn sidebar-btn toggle-btn">Bounds</div>
 		<div class="box-coords selectable"></div>
 		<div class="data-btn btn sidebar-btn toggle-btn">Edit data</div>
 		<div class="cancel-btn btn sidebar-btn">Clear</div>

package/www/mapshaper-gui.js

@@ -2443,33 +2443,31 @@
 
   function WriteFilesProxy(gui) {
     // replace CLI version of writeFiles()
-    internal.replaceWriteFiles(function(files, opts, done) {
+    internal.replaceWriteFiles(async function(files, opts) {
       var filename;
       if (!utils$1.isArray(files) || files.length === 0) {
-        done("Nothing to export");
+        throw Error("Nothing to export");
       } else if (GUI.canSaveToServer() && !opts.save_to_download_folder) {
         var paths = internal.getOutputPaths(utils$1.pluck(files, 'filename'), opts);
         var data = utils$1.pluck(files, 'content');
-        saveFilesToServer(paths, data, function(err) {
-          var msg;
-          if (err) {
-            msg = "<b>Direct save failed</b><br>Reason: " + err + ".";
-            msg += "<br>Saving to download folder instead.";
-            gui.alert(msg);
-            // fall back to standard method if saving to server fails
-            internal.writeFiles(files, {save_to_download_folder: true}, done);
-          } else {
-            if (files.length >= 1) {
-              gui.alert('<b>Saved</b><br>' + paths.join('<br>'));
-            }
-            done();
+        var msg;
+        try {
+          await utils$1.promisify(saveFilesToServer)(paths, data);
+          if (files.length >= 1) {
+            gui.alert('<b>Saved</b><br>' + paths.join('<br>'));
           }
-        });
+        } catch(err) {
+          msg = "<b>Direct save failed</b><br>Reason: " + err.message + ".";
+          msg += "<br>Saving to download folder instead.";
+          gui.alert(msg);
+          // fall back to standard method if saving to server fails
+          await internal.writeFiles(files, {save_to_download_folder: true});
+        }
       } else if (files.length == 1) {
-        saveBlobToLocalFile(files[0].filename, new Blob([files[0].content]), done);
+        await gui.promisify(saveBlobToLocalFile)(files[0].filename, new Blob([files[0].content]));
       } else {
         filename = internal.getCommonFileBase(utils$1.pluck(files, 'filename')) || "output";
-        saveZipFile(filename + ".zip", files, done);
+        await utils$1.promisify(saveZipFile)(filename + ".zip", files);
       }
     });
   }
@@ -3500,15 +3498,6 @@
     }
   }
 
-  function deleteFeature(lyr, fid) {
-    var records = lyr.data?.getRecords();
-    if (records) records.splice(fid, 1);
-    lyr.shapes.splice(fid, 1);
-    if (isProjectedLayer(lyr) && lyr.shapes != lyr.gui.displayLayer.shapes) {
-      lyr.gui.displayLayer.shapes.splice(fid, 1);
-    }
-  }
-
   // p: one point in source data coords
   function appendNewPoint(lyr, p) {
     lyr.shapes.push([p]);
@@ -3521,15 +3510,20 @@
     }
   }
 
-  function deletePoint(lyr, fid) {
-    deleteFeature(lyr, fid);
+  function deleteFeature(lyr, fid) {
+    var records = lyr.data?.getRecords();
+    if (records) records.splice(fid, 1);
+    lyr.shapes.splice(fid, 1);
+    if (isProjectedLayer(lyr) && lyr.geometry_type == 'point') {
+      lyr.gui.displayLayer.shapes.splice(fid, 1); // point layer
+    }
   }
 
-  function insertPoint(lyr, fid, shp, d) {
+  function insertFeature(lyr, fid, shp, d) {
     var records = lyr.data?.getRecords();
     if (records) records.splice(fid, 0, d);
     lyr.shapes.splice(fid, 0, shp);
-    if (isProjectedLayer(lyr)) {
+    if (isProjectedLayer(lyr) && lyr.geometry_type == 'point') {
       var shp2 = projectPointCoords(shp, lyr.gui.projectPoint);
       lyr.gui.displayLayer.shapes.splice(fid, 0, shp2);
     }
@@ -4255,6 +4249,10 @@
           setDisplayProjection(gui, cmd);
         } else {
           line.hide(); // hide cursor while command is being run
+          // quit certain edit modes
+          if (!gui.interaction.modeWorksWithConsole(gui.interaction.getMode())) {
+            gui.interaction.turnOff();
+          }
           runMapshaperCommands(cmd, function(err, flags) {
             if (flags) {
               gui.clearMode();
@@ -4754,7 +4752,7 @@
       if (files.length == 1 && checkboxOn(clipboardCheckbox)) {
         await saveFileContentToClipboard(files[0].content);
       } else {
-        await utils$1.promisify(internal.writeFiles)(files, opts);
+        await internal.writeFiles(files, opts);
       }
     }
 
@@ -5606,12 +5604,12 @@
       addHistoryState(undo, redo);
     });
 
-    gui.on('point_delete', function(e) {
+    gui.on('feature_delete', function(e) {
       var redo = function() {
-        deletePoint(e.data.target, e.fid);
+        deleteFeature(e.data.target, e.fid);
       };
       var undo = function() {
-        insertPoint(e.data.target, e.fid, e.coords, e.d);
+        insertFeature(e.data.target, e.fid, e.coords, e.d);
       };
       addHistoryState(undo, redo);
     });
@@ -5966,6 +5964,10 @@
       setMode('off');
     };
 
+    this.modeWorksWithConsole = function(mode) {
+      return ['off', 'info'];
+    };
+
     this.modeUsesHitDetection = function(mode) {
       return ['info', 'selection', 'data', 'labels', 'edit_points', 'vertices', 'rectangles', 'edit_lines', 'edit_polygons'].includes(mode);
     };
@@ -10243,8 +10245,8 @@
     function removePoint(target, id) {
       var d = target.data ? target.data.getRecords()[id] : null;
       var coords = target.shapes[id];
-      deletePoint(target, id);
-      gui.dispatchEvent('point_delete', {coords, d, target, fid: id});
+      deleteFeature(target, id);
+      gui.dispatchEvent('feature_delete', {coords, d, target, fid: id});
       gui.dispatchEvent('map-needs-refresh');
       hit.setHitId(-1);
     }
@@ -10492,7 +10494,7 @@
     }
 
     gui.keyboard.on('keydown', function(e) {
-      if (active() && e.keyName == 'space') {
+      if (pathDrawing() && e.keyName == 'space') {
         e.stopPropagation(); // prevent console from opening if shift-panning
       }
     }, null, 1);
@@ -10506,6 +10508,7 @@
           deleteActiveVertex(e, vInfo);
         };
       }
+
       // don't allow copying of open paths as geojson in polygon mode
       gui.contextMenu.open(e, target);
     });
@@ -10669,7 +10672,7 @@
 
     // esc or enter key finishes a path
     gui.keyboard.on('keydown', function(e) {
-      if (active() && (e.keyName == 'esc' || e.keyName == 'enter')) {
+      if (pathDrawing() && (e.keyName == 'esc' || e.keyName == 'enter')) {
         e.stopPropagation();
         finishCurrentPath();
         e.originalEvent.preventDefault(); // block console "enter"
@@ -12402,6 +12405,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     this.pixelCoordsToLngLatCoords = function(x, y) {
       var crsFrom = this.getDisplayCRS();
+      if (!crsFrom) return null; // e.g. table view
       var p1 = internal.toLngLat(_ext.translatePixelCoords(x, y), crsFrom);
       var p2 = internal.toLngLat(_ext.translatePixelCoords(x+1, y+1), crsFrom);
       return p1 && p2 && p1[1] <= 90 && p1[1] >= -90 ?
@@ -12893,10 +12897,12 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     }
 
     function addMenuItem(label, func) {
+      var prefix = '• &nbsp;';
+
       El('div')
         .appendTo(menu)
         .addClass('contextmenu-item')
-        .html(label)
+        .html(prefix + label)
         .on('click', func)
         .show();
     }
@@ -12909,28 +12915,36 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     }
 
     this.open = function(e, lyr) {
+      var copyable = e.ids?.length;
       if (lyr && !lyr.gui.geographic) return; // no popup for tabular data
       menu.empty();
 
       // menu contents
       //
-      if (e.deleteVertex) {
-        addMenuItem('Delete vertex', e.deleteVertex);
-      }
-      if (e.deletePoint) {
-        addMenuItem('Delete point', e.deletePoint);
-      }
-      if (e.ids?.length) {
-        addMenuItem('Copy as GeoJSON', copyGeoJSON);
-      }
-      if (e.deleteFeature) {
-        addMenuItem(getDeleteLabel(), e.deleteFeature);
+      if (e.deleteVertex || e.deletePoint || copyable || e.deleteFeature) {
+
+        addMenuLabel('selection');
+        if (e.deleteVertex) {
+          addMenuItem('delete vertex', e.deleteVertex);
+        }
+        if (e.deletePoint) {
+          addMenuItem('delete point', e.deletePoint);
+        }
+        if (e.ids?.length) {
+          addMenuItem('copy as GeoJSON', copyGeoJSON);
+        }
+        if (e.deleteFeature) {
+          addMenuItem(getDeleteLabel(), e.deleteFeature);
+        }
       }
+
       if (e.lonlat_coordinates) {
-        addCoords(e.lonlat_coordinates, 'longitude, latitude');
+        addMenuLabel('longitude, latitude');
+        addCoords(e.lonlat_coordinates);
       }
       if (e.projected_coordinates) {
-        addCoords(e.projected_coordinates, 'easting, northing');
+        addMenuLabel('easting, northing');
+        addCoords(e.projected_coordinates);
       }
 
       if (menu.node().childNodes.length === 0) {
@@ -12952,16 +12966,13 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       menu.show();
 
       function getDeleteLabel() {
-        return 'Delete ' + (lyr.geometry_type == 'point' ? 'point' : 'shape');
+        return 'delete ' + (lyr.geometry_type == 'point' ? 'point' : 'shape');
       }
 
-      function addCoords(p, label) {
+      function addCoords(p) {
         var coordStr = p[0] + ',' + p[1];
         // var displayStr = '• &nbsp;' + coordStr.replace(/-/g, '–').replace(',', ', ');
         var displayStr = coordStr.replace(/-/g, '–').replace(',', ', ');
-        if (label) {
-          addMenuLabel(label);
-        }
         addMenuItem(displayStr, function() {
           saveFileContentToClipboard(coordStr);
         });

package/www/mapshaper.js

@@ -11557,7 +11557,6 @@
     return ss && ss.isFile() || false;
   };
 
-
   // cli.fileSize = function(path) {
   //   var ss = cli.statSync(path);
   //   return ss && ss.size || 0;
@@ -11600,16 +11599,32 @@
   };
 
   // content: Buffer or string
-  cli.writeFile = function(fname, content, cb) {
-    var fs = require$1('rw');
+  cli.writeFileSync = function(fname, content) {
     cli.createDirIfNeeded(fname);
-    if (cb) {
-      fs.writeFile(fname, content, cb);
+    if (utils.isString(content)) {
+      require$1('fs').writeFileSync(fname, content);
     } else {
-      fs.writeFileSync(fname, content);
+      // as of Node.js v20, on a typical machine, max buffer size is 4gb but the max
+      // write buffer size is 2gb. An error is thrown when writing >2gb and <4gb.
+      // To support writing files up to 4gb, files are written in chunks.
+      cli.writeFileInChunks(fname, content, 1e7);
     }
   };
 
+  cli.writeFileInChunks = function(fname, buffer, chunkSize) {
+    var fs = require$1('fs');
+    var fd = fs.openSync(fname, 'w');
+    var offset = 0;
+    var bufLen = buffer.length;
+    var bytesWritten, bytesToWrite;
+    do {
+      bytesToWrite = Math.min(chunkSize, bufLen - offset);
+      bytesWritten = fs.writeSync(fd, buffer, offset, bytesToWrite);
+      offset += bytesWritten;
+    } while (bytesWritten > 0 && offset < bufLen);
+    fs.closeSync(fd);
+  };
+
   // Returns Node Buffer
   cli.convertArrayBuffer = function(buf) {
     var src = new Uint8Array(buf),
@@ -11700,9 +11715,8 @@
     return obj;
   };
 
-  function writeFiles(exports, opts, cb) {
-    cb = cb || function() {};
-    return _writeFiles(exports, opts, cb);
+  async function writeFiles(exports, opts) {
+    return _writeFiles(exports, opts);
   }
 
   // Used by GUI to replace the CLI version of writeFiles()
@@ -11711,13 +11725,13 @@
     _writeFiles = func;
   }
 
-  var _writeFiles = function(exports, opts, cb) {
+  var _writeFiles = function(exports, opts) {
     if (exports.length > 0 === false) {
       message("No files to save");
     } else if (opts.dry_run) ; else if (opts.stdout) {
-      // Pass callback for asynchronous output (synchronous output to stdout can
-      // trigger EAGAIN error, e.g. when piped to less)
-      return cli.writeFile('/dev/stdout', exports[0].content, cb);
+      // 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() {});
     } else {
       if (opts.zip) {
         exports = [{
@@ -11741,11 +11755,10 @@
         if (!opts.force && inputFiles.indexOf(path) > -1) {
           stop('Need to use the "-o force" option to overwrite input files.');
         }
-        cli.writeFile(path, obj.content);
+        cli.writeFileSync(path, obj.content);
         message("Wrote " + path);
       });
     }
-    if (cb) cb(null);
   };
 
   function getOutputPaths(files, opts) {
@@ -23469,8 +23482,7 @@ ${svg}
       if (pathInfo.directory) {
         o.directory = pathInfo.directory;
         // no longer checking for missing directory
-        // (cli.writeFile() now creates directories that don't exist)
-        // cli.validateOutputDir(o.directory);
+        // (cli.writeFileSync() now creates directories that don't exist)
       }
       if (/gz/i.test(pathInfo.extension)) {
         // handle arguments like -o out.json.gz (the preferred format)
@@ -45388,7 +45400,7 @@ ${svg}
           //// catalog = null;
           job.catalog = new Catalog();
         }
-        await utils.promisify(writeFiles)(outputFiles, opts);
+        await writeFiles(outputFiles, opts);
 
       } else if (name == 'point-grid') {
         outputLayers = [cmd.pointGrid(targetDataset, opts)];
@@ -45584,7 +45596,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.88";
+  var version = "0.6.90";
 
   // 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

@@ -1380,17 +1380,18 @@ body.pan.panning .map-layers:not(.drawing) {
 .contextmenu-item {
 	background-color: #fff;
 	white-space: nowrap;
-	padding: 5px 10px 6px 10px;
-	line-height: 11px;
+	padding: 3px 10px 4px 10px;
 	cursor: pointer;
+	font-size: 13px;
+	line-height: 13px;
 }
 
 .contextmenu-label {
 	color: #999;
-	font-size: 82%;
 	white-space: nowrap;
-	padding: 6px 10px 1px 10px;
-	line-height: 9px;
+	padding: 4px 10px 1px 10px;
+	font-size: 12px;
+	line-height: 12px;
 	margin-top: -2px;
 }