mapshaper 0.6.44 → 0.6.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.44",
+  "version": "0.6.46",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -68,7 +68,7 @@
     "browserify": "^17.0.0",
     "csv-spectrum": "^1.0.0",
     "eslint": "^8.16.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "rollup": "^2.73.0",
     "shell-quote": "^1.7.4",
     "underscore": "^1.13.1"

package/www/index.html

@@ -156,7 +156,7 @@
 		<div class="export-formats option-menu">
 		</div>
 
-		<div style="height:10px"></div>
+		<div style="height:11px"></div>
 
 		<div class="option-menu"><input type="text" class="text-input advanced-options" placeholder="command line options" />
 		<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-o-output" target="_mapshaper_output_docs">
@@ -164,15 +164,15 @@
 		<div class="tip">Enter options from the command line interface for
 the -o command. Examples: bbox no-quantization
 precision=0.001. Click to see all options.</div></div></div></a>
-</div>
+
 
 	<!-- 	<div class="option-menu">
 	<input id="ofile-name" class="text-input" type="text" placeholder="output file name" />
 	</div> -->
-
-		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
-		<div class="save-btn btn dialog-btn">Export</div>
-		<span id="save-preference" class="inline-checkbox" style="display: none;"><input type="checkbox"/>choose directory</span>
+		<div><span id="save-preference" style="display: none;"><input type="checkbox"/>choose output directory</span></div>
+		<div><span id="save-to-clipboard" style="display: inline-block;"><input type="checkbox"/>save to clipboard</span></div>
+		</div>
+		<div id="export-btn" class="btn dialog-btn" style="margin-top: 4px;">Export</div>
 
 	</div>
 </div>

package/www/mapshaper-gui.js

@@ -1442,7 +1442,7 @@
         }).text('restore');
         El('span').addClass('save-menu-btn').appendTo(line).on('click', async function(e) {
           var obj = await idb.get(item.id);
-          await internal.applyCompression(obj, {consume: true});
+          await internal.compressSnapshotForExport(obj);
           var buf = internal.pack(obj);
           // choose output filename and directory every time
           // saveBlobToLocalFile('mapshaper_snapshot.msx', new Blob([buf]));
@@ -3504,6 +3504,7 @@
         // keeping a reference to current arcs and intersections, so intersections
         // don't need to be recalculated when 'repair' button is pressed.
         _currArcs,
+        _currLayer,
         _currXX;
 
     gui.on('simplify_drag_start', hide);
@@ -3524,8 +3525,8 @@
     });
 
     repairBtn.on('click', function() {
-      var fixed = internal.repairIntersections(_currArcs, _currXX);
-      showIntersections(fixed, _currArcs);
+      _currXX = internal.repairIntersections(_currArcs, _currXX);
+      showIntersections();
       repairBtn.addClass('disabled');
       model.updated({repair: true});
       gui.session.simplificationRepair();
@@ -3573,13 +3574,17 @@
         showBtn = false;
       }
       el.show();
-      showIntersections(XX, arcs);
+      _currLayer = e.layer;
+      _currArcs = arcs;
+      _currXX = XX;
+      showIntersections();
       repairBtn.classed('disabled', !showBtn);
     }
 
     function reset() {
       _currArcs = null;
       _currXX = null;
+      _currLayer = null;
       hide();
     }
 
@@ -3590,13 +3595,11 @@
       reset();
     }
 
-    function showIntersections(XX, arcs) {
-      var n = XX.length, pointLyr;
-      _currXX = XX;
-      _currArcs = arcs;
+    function showIntersections() {
+      var n = _currXX.length, pointLyr;
       if (n > 0) {
         // console.log("first intersection:", internal.getIntersectionDebugData(XX[0], arcs));
-        pointLyr = {geometry_type: 'point', shapes: [internal.getIntersectionPoints(XX)]};
+        pointLyr = internal.getIntersectionLayer(_currXX, _currLayer, _currArcs);
         map.setIntersectionLayer(pointLyr, {layers:[pointLyr]});
         readout.html(utils$1.format('<span class="icon"></span>%s line intersection%s <img class="close-btn" src="images/close.png">', n, utils$1.pluralSuffix(n)));
         readout.findChild('.close-btn').on('click', dismiss);
@@ -3672,11 +3675,12 @@
       return;
     }
 
-    new SimpleButton(menu.findChild('.save-btn').addClass('default-btn')).on('click', onExportClick);
+    new SimpleButton(menu.findChild('#export-btn').addClass('default-btn')).on('click', onExportClick);
     gui.addMode('export', turnOn, turnOff, exportBtn);
     gui.keyboard.onMenuSubmit(menu, onExportClick);
+    var savePreferenceCheckbox;
     if (window.showSaveFilePicker) {
-      menu.findChild('#save-preference')
+      savePreferenceCheckbox = menu.findChild('#save-preference')
         .css('display', 'inline-block')
         .findChild('input')
         .on('change', function() {
@@ -3684,11 +3688,44 @@
         })
         .attr('checked', GUI.getSavedValue('choose-save-dir') || null);
     }
+    var clipboardCheckbox = menu.findChild('#save-to-clipboard')
+      .findChild('input')
+      .on('change', function() {
+        updateExportCheckboxes();
+      });
+
+    function setDisabled(inputEl, flag) {
+      if (!inputEl) return;
+      inputEl.node().disabled = !!flag;
+      inputEl.parent().css({color: flag ? '#bbb' : 'black'});
+    }
+
+    function checkboxOn(inputEl) {
+      if (!inputEl) return false;
+      return inputEl.node().checked && !inputEl.node().disabled;
+    }
+
+    function updateExportCheckboxes() {
+      // disable cliboard if not usable
+      var canUseClipboard = clipboardIsAvailable();
+      setDisabled(clipboardCheckbox, !canUseClipboard);
+
+      // disable save to directory checkbox if clipboard is selected
+      setDisabled(savePreferenceCheckbox, checkboxOn(clipboardCheckbox));
+    }
+
+    function clipboardIsAvailable() {
+      var layers = getSelectedLayerEntries();
+      var fmt = getSelectedFormat();
+      return layers.length == 1 && ['json', 'geojson', 'dsv', 'topojson'].includes(fmt);
+    }
+
 
     function turnOn() {
       layersArr = initLayerMenu();
       // initZipOption();
       initFormatMenu();
+      updateExportCheckboxes();
       menu.show();
     }
 
@@ -3697,22 +3734,25 @@
       menu.hide();
     }
 
-    function getSelectedLayers() {
-      var targets = layersArr.reduce(function(memo, o) {
+    function getSelectedLayerEntries() {
+      return layersArr.reduce(function(memo, o) {
         return o.checkbox.checked ? memo.concat(o.target) : memo;
       }, []);
-      return internal.groupLayersByDataset(targets);
+    }
+
+    function getExportTargets() {
+      return internal.groupLayersByDataset(getSelectedLayerEntries());
     }
 
     function onExportClick() {
-      var layers = getSelectedLayers();
-      if (layers.length === 0) {
+      var targets = getExportTargets();
+      if (targets.length === 0) {
         return gui.alert('No layers were selected');
       }
       gui.clearMode();
       gui.showProgressMessage('Exporting');
       setTimeout(function() {
-        exportMenuSelection(layers).catch(function(err) {
+        exportMenuSelection(targets).catch(function(err) {
           if (utils$1.isString(err)) {
             gui.alert(err);
           } else {
@@ -3742,12 +3782,22 @@
     }
 
     // done: function(string|Error|null)
-    async function exportMenuSelection(layers) {
+    async function exportMenuSelection(targets) {
       var opts = getExportOpts();
       // note: command line "target" option gets ignored
-      var files = await internal.exportTargetLayers(layers, opts);
+      var files = await internal.exportTargetLayers(targets, opts);
       gui.session.layersExported(getTargetLayerIds(), getExportOptsAsString());
-      await utils$1.promisify(internal.writeFiles)(files, opts);
+      if (files.length == 1 && checkboxOn(clipboardCheckbox)) {
+        await saveFileContentToClipboard(files[0].content);
+      } else {
+        await utils$1.promisify(internal.writeFiles)(files, opts);
+      }
+
+    }
+
+    async function saveFileContentToClipboard(content) {
+      var str = utils$1.isString(content) ? content : content.toString();
+      await navigator.clipboard.writeText(str);
     }
 
     function initLayerItem(o, i) {
@@ -3833,6 +3883,7 @@
     }
 
     function updateToggleBtn() {
+      updateExportCheckboxes(); // checkbox visibility is affected by number of export layers
       if (!toggleBtn) return;
       var state = getSelectionState();
       // style of intermediate checkbox state doesn't look right in Chrome --
@@ -3853,30 +3904,49 @@
       return 'some';
     }
 
-    function getInputFormats() {
-      return model.getDatasets().reduce(function(memo, d) {
-        var fmts = d.info && d.info.input_formats || [];
-        return memo.concat(fmts);
-      }, []);
-    }
-
     function getDefaultExportFormat() {
       var dataset = model.getActiveLayer().dataset;
-      return dataset.info && dataset.info.input_formats &&
-          dataset.info.input_formats[0] || 'geojson';
+      var inputFmt = dataset.info && dataset.info.input_formats &&
+          dataset.info.input_formats[0];
+      return getExportFormats().includes(inputFmt) ? inputFmt : 'geojson';
+    }
+
+    function getExportFormats() {
+      // return ['shapefile', 'geojson', 'topojson', 'json', 'dsv', 'kml', 'svg', internal.PACKAGE_EXT];
+      return ['shapefile', 'json', 'geojson', 'dsv', 'topojson', 'kml', internal.PACKAGE_EXT, 'svg'];
     }
 
     function initFormatMenu() {
-      var defaults = ['shapefile', 'geojson', 'topojson', 'json', 'dsv', 'kml', 'svg', internal.PACKAGE_EXT];
-      var formats = utils$1.uniq(defaults.concat(getInputFormats()));
+      var formats = getExportFormats();
+      // var formats = utils.uniq(getExportFormats().concat(getInputFormats()));
       var items = formats.map(function(fmt) {
-        return utils$1.format('<div><label><input type="radio" name="format" value="%s"' +
-          ' class="radio">%s</label></div>', fmt, internal.getFormatName(fmt));
+        return utils$1.format('<td><label><input type="radio" name="format" value="%s"' +
+          ' class="radio">%s</label></td>', fmt, internal.getFormatName(fmt));
       });
-      menu.findChild('.export-formats').html(items.join('\n'));
+      var table = '<table>';
+      for (var i=0; i<items.length; i+=2) {
+        table += '<tr>' + items[i] + items[i+1] + '<tr>';
+      }
+      table += '</table>';
+
+      // menu.findChild('.export-formats').html(items.join('\n'));
+      menu.findChild('.export-formats').html(table);
       menu.findChild('.export-formats input[value="' + getDefaultExportFormat() + '"]').node().checked = true;
+      // update save-as settings when value changes
+      menu.findChildren('input[type="radio"]').forEach(el => {
+        el.on('change', updateExportCheckboxes);
+      });
     }
 
+
+    // function getInputFormats() {
+    //   return model.getDatasets().reduce(function(memo, d) {
+    //     var fmts = d.info && d.info.input_formats || [];
+    //     return memo.concat(fmts);
+    //   }, []);
+    // }
+
+
     function initZipOption() {
       var html = `<label><input type="checkbox">Save to .zip file</label>`;
       menu.findChild('.export-zip-option').html(html);
@@ -6303,6 +6373,23 @@
     return [xmin, ymin, xmax, ymax];
   }
 
+
+  function findArcIdFromVertexId(i, ii) {
+    // binary search
+    // possible optimization: use interpolation to find a better partition value.
+    var lower = 0, upper = ii.length - 1;
+    var middle;
+    while (lower < upper) {
+      middle = Math.ceil((lower + upper) / 2);
+      if (i < ii[middle]) {
+        upper = middle - 1;
+      } else {
+        lower = middle;
+      }
+    }
+    return lower; // assumes dataset is not empty
+  }
+
   function deleteVertex(arcs, i) {
     var data = arcs.getVertexData();
     var nn = data.nn;
@@ -6372,6 +6459,61 @@
     arcs.updateVertexData(nn, xx2, yy2, zz2);
   }
 
+  function countFilteredVertices(zz, zlimit) {
+    var count = 0;
+    for (var i=0, n = zz.length; i<n; i++) {
+      if (zz[i] >= zlimit) count++;
+    }
+    return count;
+  }
+
+  function filterVertexData(o, zlimit) {
+    if (!o.zz) error('Expected simplification data');
+    var xx = o.xx,
+        yy = o.yy,
+        zz = o.zz,
+        len2 = countFilteredVertices(zz, zlimit),
+        arcCount = o.nn.length,
+        xx2 = new Float64Array(len2),
+        yy2 = new Float64Array(len2),
+        zz2 = new Float64Array(len2),
+        nn2 = new Int32Array(arcCount),
+        i = 0, i2 = 0,
+        n, n2;
+
+    for (var arcId=0; arcId < arcCount; arcId++) {
+      n2 = 0;
+      n = o.nn[arcId];
+      for (var end = i+n; i < end; i++) {
+        if (zz[i] >= zlimit) {
+          xx2[i2] = xx[i];
+          yy2[i2] = yy[i];
+          zz2[i2] = zz[i];
+          i2++;
+          n2++;
+        }
+      }
+      if (n2 == 1) {
+        error("Collapsed arc");
+        // This should not happen (endpoints should be z == Infinity)
+        // Could handle like this, instead of throwing an error:
+        // n2 = 0;
+        // xx2.pop();
+        // yy2.pop();
+        // zz2.pop();
+      } else if (n2 === 0) {
+        // collapsed arc... ignoring
+      }
+      nn2[arcId] = n2;
+    }
+    return {
+      xx: xx2,
+      yy: yy2,
+      zz: zz2,
+      nn: nn2
+    };
+  }
+
   function getShapeHitTest(displayLayer, ext, interactionMode) {
     var geoType = displayLayer.layer.geometry_type;
     var test;
@@ -8023,14 +8165,13 @@
     });
 
     self.show = function(id, ids, lyr, pinned) {
-      var table = lyr.data; // table can be null (e.g. if layer has no attribute data)
       var editable = pinned && gui.interaction.getMode() == 'data';
       var maxHeight = parent.node().clientHeight - 36;
       currId = id;
       // stash a function for refreshing the current popup when data changes
       // while the popup is being displayed (e.g. while dragging a label)
       refresh = function() {
-        render(content, id, table, editable);
+        render(content, id, lyr, editable);
       };
       refresh();
       if (ids && ids.length > 1) {
@@ -8069,7 +8210,8 @@
       tab.show();
     }
 
-    function render(el, recId, table, editable) {
+    function render(el, recId, lyr, editable) {
+      var table = lyr.data; // table can be null (e.g. if layer has no attribute data)
       var rec = table && (editable ? table.getRecordAt(recId) : table.getReadOnlyRecordAt(recId)) || {};
       var tableEl = El('table').addClass('selectable'),
           rows = 0;
@@ -8111,19 +8253,19 @@
       if (editable) {
         // render "add field" button
         var line = El('div').appendTo(el);
-        El('span').addClass('save-menu-btn').appendTo(line).on('click', async function(e) {
+        El('span').addClass('add-field-btn').appendTo(line).on('click', async function(e) {
           // show "add field" dialog
-          renderAddFieldPopup(recId, table);
+          renderAddFieldPopup(recId, lyr);
         }).text('+ add field');
       }
     }
 
-    function renderAddFieldPopup(recId, table) {
+    function renderAddFieldPopup(recId, lyr) {
       var popup = showPopupAlert('', 'Add field');
       var el = popup.container();
       el.addClass('option-menu');
-      var html = `<input type="text" class="field-name text-input" placeholder="field name"><br>
-    <input type="text" class="field-value text-input" placeholder="value"><br>
+      var html = `<div><input type="text" class="field-name text-input" placeholder="field name"></div>
+    <div><input type="text" class="field-value text-input" placeholder="value"><div>
     <div tabindex="0" class="btn dialog-btn">Apply</div> <span class="inline-checkbox"><input type="checkbox" class="all" />assign value to all records</span>`;
       el.html(html);
 
@@ -8132,6 +8274,7 @@
       var val = el.findChild('.field-value');
       var box = el.findChild('.all');
       var btn = el.findChild('.btn').on('click', function() {
+        var table = internal.getLayerDataTable(lyr); // creates new table if missing
         var all = box.node().checked;
         var nameStr = name.node().value.trim();
         if (!nameStr) return;
@@ -11439,6 +11582,9 @@
       new SessionSnapshots(gui);
     }
 
+    var msgCount = 0;
+    var clearMsg;
+
     initModeRules(gui);
 
     gui.showProgressMessage = function(msg) {
@@ -11447,10 +11593,25 @@
           .appendTo('body');
       }
       El('<div>').text(msg).appendTo(gui.progressMessage.empty().show());
+      clearMsg = getClearFunction(msgCount);
     };
 
+    function getClearFunction(count) {
+      var time = Date.now();
+      // wait at least [min] milliseconds before closing
+      var min = 400;
+      msgCount = ++count;
+      return function() {
+        setTimeout(function() {
+          if (count != msgCount) return;
+          if (gui.progressMessage) gui.progressMessage.hide();
+        }, Math.max(min - (Date.now() - time), 0));
+      };
+    }
+
     gui.clearProgressMessage = function() {
-      if (gui.progressMessage) gui.progressMessage.hide();
+      clearMsg();
+      // if (gui.progressMessage) gui.progressMessage.hide();
     };
 
     gui.consoleIsOpen = function() {