mapshaper 0.6.21 → 0.6.23

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.21";
+  var VERSION = "0.6.23";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1183,17 +1183,19 @@
     return str.replace(',', '.');
   }
 
-  function trimQuotes(raw) {
-    var len = raw.length, first, last;
+  function trimQuotes(str) {
+    var len = str.length, first, last;
     if (len >= 2) {
-      first = raw.charAt(0);
-      last = raw.charAt(len-1);
-      if (first == '"' && last == '"' && !raw.includes('","') ||
-          first == "'" && last == "'" && !raw.includes("','")) {
-        return raw.substr(1, len-2);
+      first = str.charAt(0);
+      last = str.charAt(len-1);
+      if (first == '"' && last == '"' && !str.includes('","') ||
+          first == "'" && last == "'" && !str.includes("','")) {
+        str = str.substr(1, len-2);
+        // remove string escapes
+        str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
       }
     }
-    return raw;
+    return str;
   }
 
   var LOGGING = false;
@@ -22338,9 +22340,9 @@ ${svg}
   var assignmentRxp = /^([a-z0-9_+-]+)=(?!=)(.*)$/i; // exclude ==
 
   function splitShellTokens(str) {
-    var BAREWORD = '([^\'"\\s])+';
-    var DOUBLE_QUOTE = '"((\\\\"|[^"])*?)"';
-    var SINGLE_QUOTE = '\'((\\\\\'|[^\'])*?)\'';
+    var BAREWORD = `([^'"\\s])+`;
+    var DOUBLE_QUOTE = `"((\\\\"|[^"])*?)"`;
+    var SINGLE_QUOTE = `'((\\\\'|[^'])*?)'`;
     var rxp = new RegExp('(' + BAREWORD + '|' + SINGLE_QUOTE + '|' + DOUBLE_QUOTE + ')*', 'g');
     var matches = str.match(rxp) || [];
     var chunks = matches.filter(function(chunk) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.21",
+  "version": "0.6.23",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/index.html

@@ -102,7 +102,7 @@
       	<img class="pin-btn pinned" src="images/eye2.png">
       </div>
 			<div class="layer-list"></div>
-			<h3>Files</h3>
+			<h4>Sources</h4>
 			<div class="file-list"></div>
 			<div>
 				<div id="add-file-btn" class="dialog-btn btn">Add a file</div>
@@ -159,6 +159,8 @@
 "precision=0.001"</div></div></div></div>
 		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
 		<div class="save-btn btn dialog-btn">Export</div>
+		<span id="save-preference"><input type="checkbox"/>choose directory</span>
+
 	</div>
 </div>
 

package/www/mapshaper-gui.js

@@ -807,6 +807,19 @@
     return !!(mapshaper.manifest && mapshaper.manifest.allow_saving) && typeof fetch == 'function';
   };
 
+  GUI.setSavedValue = function(name, val) {
+    try {
+      window.localStorage.setItem(name, JSON.stringify(val));
+    } catch(e) {}
+  };
+
+  GUI.getSavedValue = function(name) {
+    try {
+      return JSON.parse(window.localStorage.getItem(name));
+    } catch(e) {}
+    return null;
+  };
+
   GUI.getUrlVars = function() {
     var q = window.location.search.substring(1);
     return q.split('&').reduce(function(memo, chunk) {
@@ -1232,8 +1245,9 @@
   }
 
   async function saveBlobToLocalFile(filename, blob, done) {
+    var chooseDir = GUI.getSavedValue('choose-save-dir');
     done = done || function() {};
-    if (window.showSaveFilePicker) {
+    if (chooseDir) {
       saveBlobToSelectedFile(filename, blob, done);
     } else {
       saveBlobToDownloadsFolder(filename, blob, done);
@@ -1241,7 +1255,7 @@
   }
 
   function showSaveDialog(filename, blob, done) {
-    showPopupAlert(`Save ${filename} to:`)
+    var alert = showPopupAlert(`Save ${filename} to:`)
       .button('selected folder', function() {
         saveBlobToSelectedFile(filename, blob, done);
       })
@@ -1251,6 +1265,7 @@
       .onCancel(done);
   }
 
+
   async function saveBlobToSelectedFile(filename, blob, done) {
     // see: https://developer.chrome.com/articles/file-system-access/
     // note: saving multiple files to a directory using showDirectoryPicker()
@@ -1946,6 +1961,7 @@
     async function receiveFiles(files) {
       var names = getFileNames(files);
       var expanded = [];
+      if (files.length === 0) return;
       try {
         expanded = await expandFiles(files);
       } catch(e) {
@@ -3655,10 +3671,14 @@
       internal.writeFiles = function() {
         error$1(unsupportedMsg);
       };
-    } else {
-      new SimpleButton(menu.findChild('.save-btn').addClass('default-btn')).on('click', onExportClick);
-      gui.addMode('export', turnOn, turnOff, exportBtn);
-      gui.keyboard.onMenuSubmit(menu, onExportClick);
+      return;
+    }
+
+    new SimpleButton(menu.findChild('.save-btn').addClass('default-btn')).on('click', onExportClick);
+    gui.addMode('export', turnOn, turnOff, exportBtn);
+    gui.keyboard.onMenuSubmit(menu, onExportClick);
+    if (window.showSaveFilePicker) {
+      menu.findChild('#save-preference').css('display', 'inline-block');
     }
 
     function turnOn() {
@@ -3682,6 +3702,8 @@
 
     function onExportClick() {
       var layers = getSelectedLayers();
+      var chooseDir = menu.findChild('#save-preference input').node().checked;
+      GUI.setSavedValue('choose-save-dir', chooseDir);
       if (layers.length === 0) {
         return gui.alert('No layers were selected');
       }
@@ -6213,17 +6235,19 @@
     return str.replace(',', '.');
   }
 
-  function trimQuotes(raw) {
-    var len = raw.length, first, last;
+  function trimQuotes(str) {
+    var len = str.length, first, last;
     if (len >= 2) {
-      first = raw.charAt(0);
-      last = raw.charAt(len-1);
-      if (first == '"' && last == '"' && !raw.includes('","') ||
-          first == "'" && last == "'" && !raw.includes("','")) {
-        return raw.substr(1, len-2);
+      first = str.charAt(0);
+      last = str.charAt(len-1);
+      if (first == '"' && last == '"' && !str.includes('","') ||
+          first == "'" && last == "'" && !str.includes("','")) {
+        str = str.substr(1, len-2);
+        // remove string escapes
+        str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
       }
     }
-    return raw;
+    return str;
   }
 
   function absArcId(arcId) {
@@ -8694,7 +8718,6 @@
     function active(e) {
       return e.id > -1 && gui.interaction.getMode() == 'add-points';
     }
-
   }
 
   function Pencil(gui, mouse, hit) {
@@ -8717,10 +8740,7 @@
   }
 
   function initDrawing(gui, ext, mouse, hit) {
-
     initPointDrawing(gui, new Pencil(gui, mouse, hit));
-
-
   }
 
   var darkStroke = "#334",

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.21";
+  var VERSION = "0.6.23";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1183,17 +1183,19 @@
     return str.replace(',', '.');
   }
 
-  function trimQuotes(raw) {
-    var len = raw.length, first, last;
+  function trimQuotes(str) {
+    var len = str.length, first, last;
     if (len >= 2) {
-      first = raw.charAt(0);
-      last = raw.charAt(len-1);
-      if (first == '"' && last == '"' && !raw.includes('","') ||
-          first == "'" && last == "'" && !raw.includes("','")) {
-        return raw.substr(1, len-2);
+      first = str.charAt(0);
+      last = str.charAt(len-1);
+      if (first == '"' && last == '"' && !str.includes('","') ||
+          first == "'" && last == "'" && !str.includes("','")) {
+        str = str.substr(1, len-2);
+        // remove string escapes
+        str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
       }
     }
-    return raw;
+    return str;
   }
 
   var LOGGING = false;
@@ -22338,9 +22340,9 @@ ${svg}
   var assignmentRxp = /^([a-z0-9_+-]+)=(?!=)(.*)$/i; // exclude ==
 
   function splitShellTokens(str) {
-    var BAREWORD = '([^\'"\\s])+';
-    var DOUBLE_QUOTE = '"((\\\\"|[^"])*?)"';
-    var SINGLE_QUOTE = '\'((\\\\\'|[^\'])*?)\'';
+    var BAREWORD = `([^'"\\s])+`;
+    var DOUBLE_QUOTE = `"((\\\\"|[^"])*?)"`;
+    var SINGLE_QUOTE = `'((\\\\'|[^'])*?)'`;
     var rxp = new RegExp('(' + BAREWORD + '|' + SINGLE_QUOTE + '|' + DOUBLE_QUOTE + ')*', 'g');
     var matches = str.match(rxp) || [];
     var chunks = matches.filter(function(chunk) {

package/www/page.css

@@ -292,9 +292,6 @@ div.error-box {
 	font-size: 16px;
 }
 
-div.error-box > div {
-
-}
 
 /* --- Splash screen -------------- */
 
@@ -516,22 +513,26 @@ body.dragover #import-options-drop-area .drop-area {
 }
 
 .info-box h4 {
-	font-size: 1em;
+	font-size: 1.085em;
 	font-weight: normal;
-	margin: 0 0 1px 0;
+	margin: 0 0 2px 0;
 }
 
 .info-box p {
 	white-space: pre-line;
 	margin: 0 0 7px 0;
+	line-height: 1.2;
+	font-size: 90%;
 }
 
 .option-menu {
 	padding: 0 0 9px 0;
 }
 
-.option-menu input[type="radio"],
-.option-menu input[type="checkbox"] 
+/*.option-menu input[type="radio"],
+.option-menu input[type="checkbox"]  */
+.info-box input[type="radio"],
+.info-box input[type="checkbox"] 
 {
 	position: relative;
 	top: 1px;
@@ -539,16 +540,16 @@ body.dragover #import-options-drop-area .drop-area {
 	height: 12px;
 }
 
-.option-menu .tip-button {
+.info-box .tip-button {
 	margin-left: 12px;
 	margin-top: 3px;
 }
 
-.option-menu input[type="checkbox"] {
+.info-box input[type="checkbox"] {
 	margin: 3px 5px 0 1px;
 }
 
-.option-menu input.radio {
+.info-box input.radio {
 	margin: 0 5px 0 0;
 }
 
@@ -1079,10 +1080,7 @@ img.close-btn:hover,
 	height: 100%;
 }
 
-.info-box p {
-	line-height: 1.2;
-	font-size: 90%;
-}
+
 
 .basemap-styles {
 	margin: 0 -2px;
@@ -1212,6 +1210,13 @@ div.basemap-style-btn.active img {
 	top: 23px;
 }
 
+#save-preference {
+	display: none;
+	position: relative;
+	top: 1px;
+	left: 5px;
+}
+
 .nav-sub-menu {
 	position: absolute;
 	z-index: -1;