mapshaper 0.6.11 → 0.6.13

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.11";
+  var VERSION = "0.6.13";
 
 
   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);
@@ -18543,7 +18545,13 @@ ${svg}
         // (cli.writeFile() now creates directories that don't exist)
         // cli.validateOutputDir(o.directory);
       }
-      o.file = pathInfo.filename;
+      if (pathInfo.extension == 'gz') {
+        o.file = pathInfo.basename;
+        o.gzip = true;
+      } else {
+        o.file = pathInfo.filename;
+      }
+
       if (filenameIsUnsupportedOutputType(o.file)) {
         error("Output file looks like an unsupported file type:", o.file);
       }
@@ -23497,9 +23505,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 +23532,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 +23824,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);
@@ -42154,6 +42159,7 @@ ${svg}
 
   // Unified function for processing calls to runCommands() and applyCommands()
   function _runCommands(argv, opts, callback) {
+
     var outputArr = opts.output || null,
         inputObj = opts.input,
         commands;
@@ -42200,6 +42206,7 @@ ${svg}
 
     function done(err, job) {
       err = filterError(err);
+      if (err) printError(err);
       callback(err, job);
     }
   }
@@ -42280,8 +42287,8 @@ ${svg}
   }
 
   function filterError(err) {
-    if (err) printError(err);
     if (err && err.name == 'NonFatalError') {
+      printError(err);
       return null;
     }
     return err;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.6.11",
+	"version": "0.6.13",
 	"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

@@ -682,11 +682,10 @@
   El.setStyle = function(el, name, val) {
     var jsName = El.toCamelCase(name);
     if (el.style[jsName] == void 0) {
-      console.error("[Element.setStyle()] css property:", jsName);
       return;
     }
     var cssVal = val;
-    if (isFinite(val)) {
+    if (isFinite(val) && val !== null) {
       cssVal = String(val); // problem if converted to scientific notation
       if (jsName != 'opacity' && jsName != 'zIndex') {
         cssVal += "px";
@@ -763,16 +762,14 @@
 
     // Apply inline css styles to this Element, either as string or object.
     css: function(css, val) {
-      if (val != null) {
-        El.setStyle(this.el, css, val);
-      }
-      else if (utils$1.isString(css)) {
-        addCSS(this.el, css);
-      }
-      else if (utils$1.isObject(css)) {
+      if (utils$1.isObject(css)) {
         utils$1.forEachProperty(css, function(val, key) {
           El.setStyle(this.el, key, val);
         }, this);
+      } else if (val === void 0) {
+        addCSS(this.el, css);
+      } else {
+        El.setStyle(this.el, css, val);
       }
       return this;
     },
@@ -1277,6 +1274,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 +1320,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 +1389,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 +1413,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 +1457,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 +1525,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 +1583,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 +1593,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 +1610,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 +3003,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');
     };
 
@@ -6965,6 +6987,7 @@
       handles.forEach(function(handle) {
         handle.el.on('mousedown', function(e) {
           activeHandle = handle;
+          activeHandle.el.css('background', 'black');
           prevXY = {x: e.pageX, y: e.pageY};
         });
       });
@@ -6992,6 +7015,7 @@
 
       document.addEventListener('mouseup', function() {
         if (activeHandle && _on) {
+          activeHandle.el.css('background', null);
           activeHandle = null;
           prevXY = null;
           box.dispatchEvent('handle_up');
@@ -7034,7 +7058,7 @@
       el.css(props);
       el.show();
       if (handles) {
-        showHandles(handles, props);
+        showHandles(handles, props, x2 < x1, y2 < y1);
       }
     };
 
@@ -7099,25 +7123,26 @@
     return handles;
   }
 
-  function showHandles(handles, props) {
-    var scaledSize = Math.ceil(Math.min(props.width, props.height) / 5);
+  function showHandles(handles, props, xinv, yinv) {
+    var scaledSize = Math.ceil(Math.min(props.width, props.height) / 3) - 1;
     var HANDLE_SIZE = Math.min(scaledSize, 7);
+    var OFFS = Math.floor(HANDLE_SIZE / 2) + 1;
     handles.forEach(function(handle) {
       var top = 0,
           left = 0;
       if (handle.col == 'center') {
         left += props.width / 2 - HANDLE_SIZE / 2;
-      } else if (handle.col == 'right') {
-        left += props.width - HANDLE_SIZE + 1;
+      } else if (handle.col == 'left' && xinv || handle.col == 'right' && !xinv) {
+        left += props.width - HANDLE_SIZE + OFFS;
       } else {
-        left -= 1;
+        left -= OFFS;
       }
       if (handle.row == 'center') {
         top += props.height / 2 - HANDLE_SIZE / 2;
-      } else if (handle.row == 'bottom') {
-        top += props.height - HANDLE_SIZE + 1;
+      } else if (handle.row == 'top' && yinv || handle.row == 'bottom' && !yinv) {
+        top += props.height - HANDLE_SIZE + OFFS;
       } else {
-        top -= 1;
+        top -= OFFS;
       }
 
       handle.el.css({

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.11";
+  var VERSION = "0.6.13";
 
 
   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);
@@ -18543,7 +18545,13 @@ ${svg}
         // (cli.writeFile() now creates directories that don't exist)
         // cli.validateOutputDir(o.directory);
       }
-      o.file = pathInfo.filename;
+      if (pathInfo.extension == 'gz') {
+        o.file = pathInfo.basename;
+        o.gzip = true;
+      } else {
+        o.file = pathInfo.filename;
+      }
+
       if (filenameIsUnsupportedOutputType(o.file)) {
         error("Output file looks like an unsupported file type:", o.file);
       }
@@ -23497,9 +23505,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 +23532,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 +23824,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);
@@ -42154,6 +42159,7 @@ ${svg}
 
   // Unified function for processing calls to runCommands() and applyCommands()
   function _runCommands(argv, opts, callback) {
+
     var outputArr = opts.output || null,
         inputObj = opts.input,
         commands;
@@ -42200,6 +42206,7 @@ ${svg}
 
     function done(err, job) {
       err = filterError(err);
+      if (err) printError(err);
       callback(err, job);
     }
   }
@@ -42280,8 +42287,8 @@ ${svg}
   }
 
   function filterError(err) {
-    if (err) printError(err);
     if (err && err.name == 'NonFatalError') {
+      printError(err);
       return null;
     }
     return err;

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;