mapshaper 0.5.75 → 0.5.79

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.75",
+	"version": "0.5.79",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -49,7 +49,7 @@
 		"geokdbush": "^1.1.0",
 		"iconv-lite": "0.4.24",
 		"kdbush": "^3.0.0",
-		"mproj": "0.0.34",
+		"mproj": "0.0.35",
 		"opn": "^5.3.0",
 		"rw": "~1.3.3",
 		"sync-request": "5.0.0",

package/www/mapshaper-gui.js

@@ -485,6 +485,7 @@
   }
 
   function addCSS(el, css) {
+    // console.error(css);
     el.style.cssText = mergeCSS(el.style.cssText, css);
   }
 
@@ -1254,7 +1255,7 @@
 
     function receiveFiles(files) {
       var prevSize = queuedFiles.length;
-      useQuickView = overQuickView;
+      useQuickView = useQuickView || overQuickView;
       files = handleZipFiles(utils.toArray(files));
       addFilesToQueue(files);
       if (queuedFiles.length === 0) return;
@@ -1750,7 +1751,7 @@
       else if (pct < 0.01) decimals = 3;
       else if (pct < 1) decimals = 2;
       else if (pct < 100) decimals = 1;
-      return utils.formatNumber(pct, decimals) + "%";
+      return utils.formatNumberForDisplay(pct, decimals) + "%";
     });
 
     text.parser(function(s) {
@@ -2291,6 +2292,7 @@
     function onPaste(e) {
       // paste plain text (remove any copied HTML tags)
       e.preventDefault();
+      e.stopPropagation(); // don't try to import pasted text as data (see gui-import-control.js)
       var str = (e.originalEvent || e).clipboardData.getData('text/plain');
       document.execCommand("insertHTML", false, str);
     }
@@ -5325,6 +5327,10 @@
       hit.clearSelection();
     }
 
+    function getIdsOpt() {
+      return hit.getSelectionIds().join(',');
+    }
+
     hit.on('change', function(e) {
       if (e.mode != 'selection') return;
       var ids = hit.getSelectionIds();
@@ -5339,18 +5345,17 @@
     });
 
     new SimpleButton(popup.findChild('.delete-btn')).on('click', function() {
-      var cmd = '-filter "$$set.has(this.id) === false"';
+      var cmd = '-filter invert ids=' + getIdsOpt();
       runCommand(cmd);
     });
 
     new SimpleButton(popup.findChild('.filter-btn')).on('click', function() {
-
-      var cmd = '-filter "$$set.has(this.id)"';
+      var cmd = '-filter ids=' + getIdsOpt();
       runCommand(cmd);
     });
 
     new SimpleButton(popup.findChild('.split-btn')).on('click', function() {
-      var cmd = '-each "split_id = $$set.has(this.id) ? \'1\' : \'2\'" -split split_id';
+      var cmd = '-split ids=' + getIdsOpt();
       runCommand(cmd);
     });
 
@@ -5359,10 +5364,6 @@
     });
 
     function runCommand(cmd) {
-      // var defs = internal.getStateVar('defs');
-      // defs.$$selection = utils.arrayToIndex(hit.getSelectionIds());
-      var ids = JSON.stringify(hit.getSelectionIds());
-      cmd = `-define "$$set = new Set(${ids})" ${cmd} -define "delete $$set"`;
       popup.hide();
       if (gui.console) gui.console.runMapshaperCommands(cmd, function(err) {
         reset();