mapshaper 0.6.20 → 0.6.22

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.20";
+  var VERSION = "0.6.22";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -88,6 +88,7 @@
     get formatter () { return formatter; },
     get wildcardToRegExp () { return wildcardToRegExp; },
     get createBuffer () { return createBuffer; },
+    get toBuffer () { return toBuffer; },
     get expandoBuffer () { return expandoBuffer; },
     get copyElements () { return copyElements; },
     get extendBuffer () { return extendBuffer; },
@@ -1033,6 +1034,15 @@
     }
   }
 
+  function toBuffer(src) {
+    if (src instanceof B$3) return src;
+    if (src instanceof ArrayBuffer) return B$3.from(src);
+    if (src instanceof Uint8Array) {
+      return B$3.from(src.buffer, src.byteOffset, src.byteLength);
+    }
+    error('Unexpected argument type');
+  }
+
   function expandoBuffer(constructor, rate) {
     var capacity = 0,
         k = rate >= 1 ? rate : 1.2,
@@ -1173,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;
@@ -10763,12 +10775,6 @@
     };
   }
 
-  // TODO..
-  // export function serializeSession(catalog) {
-  //   var obj = exportDatasets(catalog.getDatasets());
-  //   return BSON.serialize(obj);
-  // }
-
   async function exportDataset(dataset, opts) {
     return {
       arcs: dataset.arcs ? await exportArcs(dataset.arcs, opts) : null,
@@ -21453,7 +21459,8 @@ ${svg}
 
     function buffer() {
       if (!buf) {
-        buf = (src instanceof ArrayBuffer) ? utils.createBuffer(src) : src;
+        // buf = (src instanceof ArrayBuffer) ? utils.createBuffer(src) : src;
+        buf = utils.toBuffer(src);
       }
       return buf;
     }
@@ -22333,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.20",
+  "version": "0.6.22",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/mapshaper-gui.js

@@ -85,6 +85,7 @@
     get formatter () { return formatter; },
     get wildcardToRegExp () { return wildcardToRegExp; },
     get createBuffer () { return createBuffer; },
+    get toBuffer () { return toBuffer; },
     get expandoBuffer () { return expandoBuffer; },
     get copyElements () { return copyElements; },
     get extendBuffer () { return extendBuffer; },
@@ -589,12 +590,12 @@
         if (arguments.length == 1) {
           return this.el.getAttribute(obj);
         }
-        this.el.setAttribute(obj, value);
-        // this.el[obj] = value;
+        if (value === null) {
+          this.el.removeAttribute(obj);
+        } else {
+          this.el.setAttribute(obj, value);
+        }
       }
-      // else if (!value) {
-      //   Opts.copyAllParams(this.el, obj);
-      // }
       return this;
     },
 
@@ -1397,7 +1398,7 @@
       addMenuLink({
         slug: 'stash',
         // label: 'save data snapshot',
-        label: 'take a snapshot',
+        label: 'create a snapshot',
         action: saveSnapshot
       });
 
@@ -1793,16 +1794,16 @@
       .attr('multiple', 'multiple')
       .on('change', onchange);
 
-    function onchange(e) {
+    async function onchange(e) {
       var files = e.target.files;
       // files may be undefined (e.g. if user presses 'cancel' after a file has been selected)
       if (files) {
         // disable the button while files are being processed
         btn.addClass('selected');
         input.attr('disabled', true);
-        cb(files);
+        await cb(files);
         btn.removeClass('selected');
-        input.attr('disabled', false);
+        input.attr('disabled', null);
       }
     }
   }
@@ -1945,6 +1946,7 @@
     async function receiveFiles(files) {
       var names = getFileNames(files);
       var expanded = [];
+      if (files.length === 0) return;
       try {
         expanded = await expandFiles(files);
       } catch(e) {
@@ -1960,7 +1962,7 @@
       }
       gui.enterMode('import');
       if (useQuickView()) {
-        importQueuedFiles();
+        await importQueuedFiles();
       } else {
         gui.container.addClass('queued-files');
         El('#path-import-options').classed('hidden', !filesMayContainPaths(queuedFiles));
@@ -2133,14 +2135,6 @@
       return new Promise(resolve => setTimeout(resolve, ms));
     }
 
-    function runAsync(fn, arg) {
-      return new Promise((resolve, reject) => {
-        fn(arg, function(err, data) {
-          return err ? reject(err) : resolve(data);
-        });
-      });
-    }
-
     async function readKmzFile(file) {
       var files = await readZipFile(file);
       var name = files[0] && files[0].name;
@@ -2162,7 +2156,7 @@
     async function readZipFile(file) {
       // Async is up to twice as fast unzipping large files
       // var index = internal.unzipSync(file.content);
-      var index = await runAsync(internal.unzipAsync, file.content);
+      var index = await utils$1.promisify(internal.unzipAsync)(file.content);
       return Object.keys(index).reduce(function(memo, filename) {
         if (!/\.txt$/i.test(filename)) {
           memo.push({
@@ -2196,7 +2190,7 @@
 
     async function readFileData(file) {
       try {
-        var content = await runAsync(readContentFileAsync, file);
+        var content = await utils$1.promisify(readContentFileAsync)(file);
         return {
           content: content,
           name: file.name
@@ -6071,6 +6065,15 @@
     }
   }
 
+  function toBuffer(src) {
+    if (src instanceof B) return src;
+    if (src instanceof ArrayBuffer) return B.from(src);
+    if (src instanceof Uint8Array) {
+      return B.from(src.buffer, src.byteOffset, src.byteLength);
+    }
+    error('Unexpected argument type');
+  }
+
   function expandoBuffer(constructor, rate) {
     var capacity = 0,
         k = rate >= 1 ? rate : 1.2,
@@ -6211,17 +6214,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) {

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.20";
+  var VERSION = "0.6.22";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -88,6 +88,7 @@
     get formatter () { return formatter; },
     get wildcardToRegExp () { return wildcardToRegExp; },
     get createBuffer () { return createBuffer; },
+    get toBuffer () { return toBuffer; },
     get expandoBuffer () { return expandoBuffer; },
     get copyElements () { return copyElements; },
     get extendBuffer () { return extendBuffer; },
@@ -1033,6 +1034,15 @@
     }
   }
 
+  function toBuffer(src) {
+    if (src instanceof B$3) return src;
+    if (src instanceof ArrayBuffer) return B$3.from(src);
+    if (src instanceof Uint8Array) {
+      return B$3.from(src.buffer, src.byteOffset, src.byteLength);
+    }
+    error('Unexpected argument type');
+  }
+
   function expandoBuffer(constructor, rate) {
     var capacity = 0,
         k = rate >= 1 ? rate : 1.2,
@@ -1173,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;
@@ -10763,12 +10775,6 @@
     };
   }
 
-  // TODO..
-  // export function serializeSession(catalog) {
-  //   var obj = exportDatasets(catalog.getDatasets());
-  //   return BSON.serialize(obj);
-  // }
-
   async function exportDataset(dataset, opts) {
     return {
       arcs: dataset.arcs ? await exportArcs(dataset.arcs, opts) : null,
@@ -21453,7 +21459,8 @@ ${svg}
 
     function buffer() {
       if (!buf) {
-        buf = (src instanceof ArrayBuffer) ? utils.createBuffer(src) : src;
+        // buf = (src instanceof ArrayBuffer) ? utils.createBuffer(src) : src;
+        buf = utils.toBuffer(src);
       }
       return buf;
     }
@@ -22333,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) {