mapshaper 0.6.11 → 0.6.12

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.11";
+  var VERSION = "0.6.12";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -15644,9 +15644,11 @@ ${svg}
     } else if (buf instanceof ArrayBuffer) {
       // we're good
     } else if (typeof B$3 == 'function' && buf instanceof B$3) {
-      // Since node 0.10, DataView constructor doesn't accept Buffers,
-      //   so need to copy Buffer to ArrayBuffer
-      buf = BinArray.toArrayBuffer(buf);
+      if (buf.buffer && buf.buffer.byteLength == buf.length) {
+        buf = buf.buffer;
+      } else {
+        buf = BinArray.copyToArrayBuffer(buf);
+      }
     } else {
       error("BinArray constructor takes an integer, ArrayBuffer or Buffer argument");
     }
@@ -15692,7 +15694,7 @@ ${svg}
     return bytes;
   };
 
-  BinArray.toArrayBuffer = function(src) {
+  BinArray.copyToArrayBuffer = function(src) {
     var n = src.length,
         dest = new ArrayBuffer(n),
         view = new Uint8Array(dest);
@@ -23497,9 +23499,9 @@ ${svg}
 
     if (!content) {
       reader = new FileReader(filename);
-    } else if (content instanceof ArrayBuffer) {
+    } else if (content instanceof ArrayBuffer || content instanceof Buffer) {
       // Web API imports JSON as ArrayBuffer, to support larger files
-      if (content.byteLength < 1e7) {
+      if ((content.byteLength || content.length) < 1e7) {
         // content = utils.createBuffer(content).toString();
         content = bufferToString(utils.createBuffer(content));
       } else {
@@ -23524,7 +23526,7 @@ ${svg}
           content = JSON.parse(content); // ~3sec for 100MB string
         } catch(e) {
           // stop("Unable to parse JSON");
-          stop('JSON parsing error --', e.message);
+          stop('JSON parsing error:', e.message);
         }
       }
       if (opts.json_path) {
@@ -23816,9 +23818,6 @@ ${svg}
       }
       // TODO: consider using a temp file, to support incremental reading
       content = require('zlib').gunzipSync(cli.readFile(pathgz));
-      if (fileType == 'json' || fileType == 'text') {
-        content = trimBOM(decodeString(content, encoding || 'utf-8'));
-      }
 
     } else { // type can't be inferred from filename -- try reading as text
       content = cli.readFile(path, encoding || 'utf-8', cache);

package/package.json

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

package/www/index.html

@@ -97,7 +97,10 @@
       	<img class="pin-btn pinned" src="images/eye2.png">
       </div>
 			<div class="layer-list"></div>
-			<div><div id="add-file-btn" class="dialog-btn btn">Add a file</div></div>
+			<div>
+				<div id="add-file-btn" class="dialog-btn btn">Add a file</div>
+				<!-- <div id="add-empty-btn" class="dialog-btn btn">Empty layer</div> -->
+			</div>
 		</div>
 		</div>
 	</div>

package/www/mapshaper-gui.js

@@ -1277,6 +1277,7 @@
     new FileChooser('#file-selection-btn', receiveFiles);
     new FileChooser('#import-buttons .add-btn', receiveFiles);
     new FileChooser('#add-file-btn', receiveFiles);
+    // new SimpleButton('#add-empty-btn').on('click', addEmptyLayer);
     initDropArea('#import-quick-drop', true);
     initDropArea('#import-drop');
     gui.keyboard.onMenuSubmit(El('#import-options'), importQueuedFiles);
@@ -1322,9 +1323,12 @@
           await importFiles(files);
         }
       } catch(e) {
-        console.error(e);
+        gui.alert(e.message, 'Import error');
+      }
+      if (gui.getMode() == 'import') {
+        // Mode could also be 'alert' if an error is thrown and handled
+        gui.clearMode();
       }
-      gui.clearMode();
     }
 
     function turnOn() {
@@ -1388,10 +1392,20 @@
     }
 
     async function receiveFiles(files) {
-      // TODO: show importing message here?
-      var expanded = await expandFiles(files);
+      var expanded = [];
+      try {
+        expanded = await expandFiles(files);
+      } catch(e) {
+        gui.alert(e.message, 'Import error');
+        return;
+      }
       addFilesToQueue(expanded);
-      if (queuedFiles.length === 0) return;
+      if (queuedFiles.length === 0) {
+        var names = getFileNames(files);
+        var msg = `Unable to import data from: ${names.join(', ')}`;
+        gui.alert(msg, 'Import error');
+        return;
+      }
       gui.enterMode('import');
       if (useQuickView()) {
         importQueuedFiles();
@@ -1402,6 +1416,10 @@
       }
     }
 
+    function getFileNames(files) {
+      return Array.from(files).map(function(f) {return f.name;});
+    }
+
     async function expandFiles(files) {
       var files2 = [], expanded;
       for (var f of files) {
@@ -1442,6 +1460,19 @@
       gui.session.fileImported(group.filename, optStr);
     }
 
+    function addEmptyLayer() {
+      var dataset = {
+        layers: [{
+          name: 'New layer',
+          geometry_type: 'point',
+          shapes: []
+        }],
+        info: {}
+      };
+      model.addDataset(dataset);
+      gui.clearMode();
+    }
+
     function filesMayContainPaths(files) {
       return utils$1.some(files, function(f) {
           var type = internal.guessInputFileType(f.name);
@@ -1497,16 +1528,6 @@
       }
     }
 
-    function handleImportError(e, fileName) {
-      var msg = utils$1.isString(e) ? e : e.message;
-      if (fileName) {
-        msg = "Error importing <i>" + fileName + "</i><br>" + msg;
-      }
-      clearQueuedFiles();
-      gui.alert(msg);
-      console.error(e);
-    }
-
     function prepFilesForDownload(names) {
       var items = names.map(function(name) {
         var isUrl = /:\/\//.test(name);
@@ -1565,7 +1586,7 @@
     }
 
     async function readZipFile(file) {
-      var files;
+      var files = [];
       await wait(35); // pause a beat so status message can display
       try {
         files = await runAsync(GUI.readZipFile, file);
@@ -1575,8 +1596,8 @@
           return !/\.txt$/i.test(f.name);
         });
       } catch(e) {
-        handleImportError(e, file.name);
-        files = [];
+        console.error(e);
+        throw Error(`Unable to unzip ${file.name}`);
       }
       return files;
     }
@@ -1592,9 +1613,9 @@
           type: internal.guessInputType(file.name, content)
         };
       } catch (e) {
-        handleImportError("Web browser was unable to load the file.", file.name);
+        console.error(e);
+        throw Error(`Browser was unable to load the file ${file.name}`);
       }
-      return null;
     }
 
     async function readFiles(files) {
@@ -2985,15 +3006,19 @@
     var el;
     gui.addMode('alert', function() {}, turnOff);
 
-    gui.alert = function(str) {
-      var infoBox;
+    gui.alert = function(str, title) {
+      var infoBox, html = '';
       if (!el) {
         el = El('div').appendTo('body').addClass('error-wrapper');
         infoBox = El('div').appendTo(el).addClass('error-box info-box selectable');
-        El('p').addClass('error-message').appendTo(infoBox);
+        El('div').appendTo(infoBox).addClass('error-content');
         El('div').addClass("btn dialog-btn").appendTo(infoBox).html('close').on('click', gui.clearMode);
       }
-      el.findChild('.error-message').html(str);
+      if (title) {
+        html += `<div class="error-title">${title}</div>`;
+      }
+      html += `<p class="error-message">${str}</p>`;
+      el.findChild('.error-content').html(html);
       gui.enterMode('alert');
     };
 

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.11";
+  var VERSION = "0.6.12";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -15644,9 +15644,11 @@ ${svg}
     } else if (buf instanceof ArrayBuffer) {
       // we're good
     } else if (typeof B$3 == 'function' && buf instanceof B$3) {
-      // Since node 0.10, DataView constructor doesn't accept Buffers,
-      //   so need to copy Buffer to ArrayBuffer
-      buf = BinArray.toArrayBuffer(buf);
+      if (buf.buffer && buf.buffer.byteLength == buf.length) {
+        buf = buf.buffer;
+      } else {
+        buf = BinArray.copyToArrayBuffer(buf);
+      }
     } else {
       error("BinArray constructor takes an integer, ArrayBuffer or Buffer argument");
     }
@@ -15692,7 +15694,7 @@ ${svg}
     return bytes;
   };
 
-  BinArray.toArrayBuffer = function(src) {
+  BinArray.copyToArrayBuffer = function(src) {
     var n = src.length,
         dest = new ArrayBuffer(n),
         view = new Uint8Array(dest);
@@ -23497,9 +23499,9 @@ ${svg}
 
     if (!content) {
       reader = new FileReader(filename);
-    } else if (content instanceof ArrayBuffer) {
+    } else if (content instanceof ArrayBuffer || content instanceof Buffer) {
       // Web API imports JSON as ArrayBuffer, to support larger files
-      if (content.byteLength < 1e7) {
+      if ((content.byteLength || content.length) < 1e7) {
         // content = utils.createBuffer(content).toString();
         content = bufferToString(utils.createBuffer(content));
       } else {
@@ -23524,7 +23526,7 @@ ${svg}
           content = JSON.parse(content); // ~3sec for 100MB string
         } catch(e) {
           // stop("Unable to parse JSON");
-          stop('JSON parsing error --', e.message);
+          stop('JSON parsing error:', e.message);
         }
       }
       if (opts.json_path) {
@@ -23816,9 +23818,6 @@ ${svg}
       }
       // TODO: consider using a temp file, to support incremental reading
       content = require('zlib').gunzipSync(cli.readFile(pathgz));
-      if (fileType == 'json' || fileType == 'text') {
-        content = trimBOM(decodeString(content, encoding || 'utf-8'));
-      }
 
     } else { // type can't be inferred from filename -- try reading as text
       content = cli.readFile(path, encoding || 'utf-8', cache);

package/www/page.css

@@ -251,6 +251,11 @@ body {
 	left: 0;
 }
 
+.error-title {
+	font-weight: bold;
+	margin-bottom: 4px;
+}
+
 div.error-box {
 	margin-top: 55px;
 	overflow: auto;