mapshaper 0.6.22 → 0.6.24

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.22";
+  var VERSION = "0.6.24";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -10620,7 +10620,8 @@
       buf = new Uint8Array(buf);
     }
     opts = opts || {};
-    var out = await utils.promisify(gunzip)(buf, opts);
+    var gunzip$1 = runningInBrowser() ? utils.promisify(gunzip) : utils.promisify(require('zlib').gunzip);
+    var out = await gunzip$1(buf, opts);
     if (opts.filename && !isImportableAsBinary(opts.filename)) {
       out = strFromU8(out);
     }
@@ -10628,8 +10629,6 @@
   }
 
   function gunzipSync(buf, filename) {
-    // TODO: use native module in Node
-    // require('zlib').
     if (buf instanceof ArrayBuffer) {
       buf = new Uint8Array(buf);
     }
@@ -10768,16 +10767,39 @@
   // gui: (optional) gui instance
   //
   async function exportDatasetsToPack(datasets, opts) {
-    return {
+    var obj = {
       version: 1,
       created: (new Date).toISOString(),
-      datasets: await Promise.all(datasets.map(d => exportDataset(d, opts || {})))
+      datasets: await Promise.all(datasets.map(exportDataset))
     };
+    if (opts.compact) {
+      await applyCompression(obj);
+    }
+    return obj;
+  }
+
+  async function applyCompression(obj, opts) {
+    var promises = [];
+    obj.datasets.forEach(d => {
+      if (d.arcs) promises.push(compressArcs(d.arcs, opts));
+    });
+    await Promise.all(promises);
+  }
+
+  async function compressArcs(obj, opts) {
+    var gzipOpts = Object.assign({level: 1, consume: false}, opts);
+    var promises = [gzipAsync(obj.nn, gzipOpts), gzipAsync(obj.xx, gzipOpts), gzipAsync(obj.yy, gzipOpts)];
+    if (obj.zz) promises.push(gzipAsync(obj.zz, gzipOpts));
+    var results = await Promise.all(promises);
+    obj.nn = results.shift();
+    obj.xx = results.shift();
+    obj.yy = results.shift();
+    if (obj.zz) obj.zz = results.shift();
   }
 
   async function exportDataset(dataset, opts) {
     return {
-      arcs: dataset.arcs ? await exportArcs(dataset.arcs, opts) : null,
+      arcs: dataset.arcs ? exportArcs(dataset.arcs) : null,
       info: dataset.info ? exportInfo(dataset.info) : null,
       layers: await Promise.all((dataset.layers || []).map(exportLayer))
     };
@@ -10787,38 +10809,22 @@
     return new Uint8Array(arr.buffer, arr.byteOffset, arr.byteLength);
   }
 
-  async function exportArcs(arcs, opts) {
+  function exportArcs(arcs) {
     var data = arcs.getVertexData();
-    var obj = {
+    return {
       nn: typedArrayToBuffer(data.nn),
       xx: typedArrayToBuffer(data.xx),
       yy: typedArrayToBuffer(data.yy),
       zz: data.zz ? typedArrayToBuffer(data.zz) : null,
       zlimit: arcs.getRetainedInterval()
     };
-
-    // gzipping typically sees about 70% compression on unrounded coordinates
-    // -- possibly not worth the time
-    if (opts.compact) {
-      var gzipOpts = {level: 1, consume: false};
-      var promises = [gzipAsync(obj.nn, gzipOpts), gzipAsync(obj.xx, gzipOpts), gzipAsync(obj.yy, gzipOpts)];
-      if (obj.zz) promises.push(gzipAsync(obj.zz, gzipOpts));
-      var results = await Promise.all(promises);
-      obj.nn = results.shift();
-      obj.xx = results.shift();
-      obj.yy = results.shift();
-      if (obj.zz) obj.zz = results.shift();
-    }
-    return obj;
   }
 
   async function exportLayer(lyr) {
-    // console.time('table')
     var data = null;
     if (lyr.data) {
       data = await exportTable2(lyr.data);
     }
-    // console.timeEnd('table')
     return {
       name: lyr.name || null,
       geometry_type: lyr.geometry_type || null,
@@ -10845,6 +10851,7 @@
     exportPackedDatasets: exportPackedDatasets,
     pack: pack,
     exportDatasetsToPack: exportDatasetsToPack,
+    applyCompression: applyCompression,
     exportDataset: exportDataset
   });
 
@@ -24922,6 +24929,9 @@ ${svg}
 
     parser.command('info')
       .describe('print information about data layers')
+      .option('save-to', {
+        describe: 'name of file to save info in JSON format'
+      })
       .option('target', targetOpt);
 
     parser.command('inspect')
@@ -27457,12 +27467,14 @@ ${svg}
   // Import datasets contained in a BSON blob
   // Return command target as a dataset
   //
-  async function unpackSession(buf) {
-    var obj = unpack(buf, {});
+  async function unpackSessionData(buf) {
+    return restoreSessionData(unpack(buf, {}));
+  }
+
+  async function restoreSessionData(obj) {
     if (!isValidSession(obj)) {
       stop('Invalid mapshaper session data object');
     }
-
     var datasets = await Promise.all(obj.datasets.map(importDataset));
     return Object.assign(obj, {datasets: datasets});
   }
@@ -27539,7 +27551,8 @@ ${svg}
 
   var Unpack = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    unpackSession: unpackSession
+    unpackSessionData: unpackSessionData,
+    restoreSessionData: restoreSessionData
   });
 
   cmd.importFiles = async function(catalog, opts) {
@@ -27593,7 +27606,7 @@ ${svg}
 
   async function importMshpFile(file, catalog, opts) {
     var buf = cli.readFile(file, null, opts.input);
-    var obj = await unpackSession(buf);
+    var obj = await unpackSessionData(buf);
     obj.datasets.forEach(catalog.addDataset, catalog);
     return obj.target;
   }
@@ -38240,55 +38253,27 @@ ${svg}
 
   var MAX_RULE_LEN = 50;
 
-  cmd.printInfo = function(layers) {
-    var str = '';
-    layers.forEach(function(o, i) {
-      var title =  'Layer:    ' + (o.layer.name || '[unnamed layer]');
-      var tableStr = getAttributeTableInfo(o.layer);
-      var tableWidth = measureLongestLine(tableStr);
-      var ruleLen = Math.min(Math.max(title.length, tableWidth), MAX_RULE_LEN);
-      str += '\n';
-      str += utils.lpad('', ruleLen, '=') + '\n';
-      str += title + '\n';
-      str += utils.lpad('', ruleLen, '-') + '\n';
-      str += getLayerInfo(o.layer, o.dataset);
-      str += tableStr;
+  cmd.info = function(targets, opts) {
+    var layers = expandCommandTargets(targets);
+    var arr = layers.map(function(o) {
+      return getLayerInfo(o.layer, o.dataset);
     });
-    message(str);
-  };
-
-  function measureLongestLine(str) {
-    return Math.max.apply(null, str.split('\n').map(function(line) {return stringDisplayWidth(line);}));
-  }
-
-  function stringDisplayWidth(str) {
-    var w = 0;
-    for (var i = 0, n=str.length; i < n; i++) {
-      w += charDisplayWidth(str.charCodeAt(i));
+    message(formatInfo(arr));
+    if (opts.save_to) {
+      var output = [{
+        filename: opts.save_to + (opts.save_to.endsWith('.json') ? '' : '.json'),
+        content: JSON.stringify(arr, null, 2)
+      }];
+      writeFiles(output, opts);
     }
-    return w;
-  }
+  };
 
-  // see https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
-  // this is a simplified version, focusing on double-width CJK chars and ignoring nonprinting etc chars
-  function charDisplayWidth(c) {
-    if (c >= 0x1100 &&
-      (c <= 0x115f || c == 0x2329 || c == 0x232a ||
-      (c >= 0x2e80 && c <= 0xa4cf && c != 0x303f) || /* CJK ... Yi */
-      (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
-      (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
-      (c >= 0xfe10 && c <= 0xfe19) || /* Vertical forms */
-      (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
-      (c >= 0xff00 && c <= 0xff60) || /* Fullwidth Forms */
-      (c >= 0xffe0 && c <= 0xffe6) ||
-      (c >= 0x20000 && c <= 0x2fffd) ||
-      (c >= 0x30000 && c <= 0x3fffd))) return 2;
-    return 1;
-  }
+  cmd.printInfo = cmd.info; // old name
 
-  function getLayerData(lyr, dataset) {
+  function getLayerInfo(lyr, dataset) {
     var n = getFeatureCount(lyr);
     var o = {
+      layer_name: lyr.name,
       geometry_type: lyr.geometry_type,
       feature_count: n,
       null_shape_count: 0,
@@ -38296,31 +38281,47 @@ ${svg}
     };
     if (lyr.shapes && lyr.shapes.length > 0) {
       o.null_shape_count = countNullShapes(lyr.shapes);
-      o.bbox =getLayerBounds(lyr, dataset.arcs).toArray();
+      o.bbox = getLayerBounds(lyr, dataset.arcs).toArray();
       o.proj4 = getProjInfo(dataset);
     }
+    o.source_file = getLayerSourceFile(lyr, dataset) || null;
+    o.attribute_data = getAttributeTableInfo(lyr);
     return o;
   }
 
-  // TODO: consider polygons with zero area or other invalid geometries
-  function countNullShapes(shapes) {
-    var count = 0;
-    for (var i=0; i<shapes.length; i++) {
-      if (!shapes[i] || shapes[i].length === 0) count++;
+  // i: (optional) record index
+  function getAttributeTableInfo(lyr, i) {
+    if (!lyr.data || lyr.data.size() === 0 || lyr.data.getFields().length === 0) {
+      return null;
     }
-    return count;
+    var fields = applyFieldOrder(lyr.data.getFields(), 'ascending');
+    var valueName = i === undefined ? 'first_value' : 'value';
+    return fields.map(function(fname) {
+      return {
+        field: fname,
+        [valueName]: lyr.data.getReadOnlyRecordAt(i || 0)[fname]
+      };
+    });
   }
 
-  function countNullRecords(records) {
-    var count = 0;
-    for (var i=0; i<records.length; i++) {
-      if (!records[i]) count++;
-    }
-    return count;
+  function formatInfo(arr) {
+    var str = '';
+    arr.forEach(function(info, i) {
+      var title =  'Layer:    ' + (info.layer_name || '[unnamed layer]');
+      var tableStr = formatAttributeTableInfo(info.attribute_data);
+      var tableWidth = measureLongestLine(tableStr);
+      var ruleLen = Math.min(Math.max(title.length, tableWidth), MAX_RULE_LEN);
+      str += '\n';
+      str += utils.lpad('', ruleLen, '=') + '\n';
+      str += title + '\n';
+      str += utils.lpad('', ruleLen, '-') + '\n';
+      str += formatLayerInfo(info);
+      str += tableStr;
+    });
+    return str;
   }
 
-  function getLayerInfo(lyr, dataset) {
-    var data = getLayerData(lyr, dataset);
+  function formatLayerInfo(data) {
     var str = '';
     str += "Type:     " + (data.geometry_type || "tabular data") + "\n";
     str += utils.format("Records:  %,d\n",data.feature_count);
@@ -38331,21 +38332,19 @@ ${svg}
       str += "Bounds:   " + data.bbox.join(',') + "\n";
       str += "CRS:      " + data.proj4 + "\n";
     }
-    str += "Source:   " + (getLayerSourceFile(lyr, dataset) || 'n/a') + "\n";
+    str += "Source:   " + (data.source_file || 'n/a') + "\n";
     return str;
   }
 
-  function getAttributeTableInfo(lyr, i) {
-    if (!lyr.data || lyr.data.size() === 0 || lyr.data.getFields().length === 0) {
-      return "Attribute data: [none]\n";
-    }
-    return "\nAttribute data\n" + formatAttributeTable(lyr.data, i);
-  }
-
-  function formatAttributeTable(data, i) {
-    var fields = applyFieldOrder(data.getFields(), 'ascending');
-    var vals = fields.map(function(fname) {
-      return data.getReadOnlyRecordAt(i || 0)[fname];
+  function formatAttributeTableInfo(arr) {
+    if (!arr) return "Attribute data: [none]\n";
+    var header = "\nAttribute data\n";
+    var valKey = 'first_value' in arr[0] ? 'first_value' : 'value';
+    var vals = [];
+    var fields = [];
+    arr.forEach(function(o) {
+      fields.push(o.field);
+      vals.push(o[valKey]);
     });
     var maxIntegralChars = vals.reduce(function(max, val) {
       if (utils.isNumber(val)) {
@@ -38357,20 +38356,66 @@ ${svg}
     var col2Arr = vals.reduce(function(memo, val) {
       memo.push(formatTableValue(val, maxIntegralChars));
       return memo;
-    }, [i >= 0 ? 'Value' : 'First value']);
+    }, [valKey == 'first_value' ? 'First value' : 'Value']);
     var col1Chars = maxChars(col1Arr);
     var col2Chars = maxChars(col2Arr);
     var sepStr = (utils.rpad('', col1Chars + 2, '-') + '+' +
         utils.rpad('', col2Chars + 2, '-')).substr(0, MAX_RULE_LEN);
     var sepLine = sepStr + '\n';
-    var table = sepLine;
+    var table = '';
     col1Arr.forEach(function(col1, i) {
       var w = stringDisplayWidth(col1);
       table += ' ' + col1 + utils.rpad('', col1Chars - w, ' ') + ' | ' +
         col2Arr[i] + '\n';
       if (i === 0) table += sepLine; // separator after first line
     });
-    return table + sepLine;
+    return header + sepLine + table + sepLine;
+  }
+
+  function measureLongestLine(str) {
+    return Math.max.apply(null, str.split('\n').map(function(line) {return stringDisplayWidth(line);}));
+  }
+
+  function stringDisplayWidth(str) {
+    var w = 0;
+    for (var i = 0, n=str.length; i < n; i++) {
+      w += charDisplayWidth(str.charCodeAt(i));
+    }
+    return w;
+  }
+
+  // see https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+  // this is a simplified version, focusing on double-width CJK chars and ignoring nonprinting etc chars
+  function charDisplayWidth(c) {
+    if (c >= 0x1100 &&
+      (c <= 0x115f || c == 0x2329 || c == 0x232a ||
+      (c >= 0x2e80 && c <= 0xa4cf && c != 0x303f) || /* CJK ... Yi */
+      (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
+      (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
+      (c >= 0xfe10 && c <= 0xfe19) || /* Vertical forms */
+      (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
+      (c >= 0xff00 && c <= 0xff60) || /* Fullwidth Forms */
+      (c >= 0xffe0 && c <= 0xffe6) ||
+      (c >= 0x20000 && c <= 0x2fffd) ||
+      (c >= 0x30000 && c <= 0x3fffd))) return 2;
+    return 1;
+  }
+
+  // TODO: consider polygons with zero area or other invalid geometries
+  function countNullShapes(shapes) {
+    var count = 0;
+    for (var i=0; i<shapes.length; i++) {
+      if (!shapes[i] || shapes[i].length === 0) count++;
+    }
+    return count;
+  }
+
+  function countNullRecords(records) {
+    var count = 0;
+    for (var i=0; i<records.length; i++) {
+      if (!records[i]) count++;
+    }
+    return count;
   }
 
   function maxChars(arr) {
@@ -38424,8 +38469,9 @@ ${svg}
 
   var Info = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    getLayerData: getLayerData,
+    getLayerInfo: getLayerInfo,
     getAttributeTableInfo: getAttributeTableInfo,
+    formatAttributeTableInfo: formatAttributeTableInfo,
     formatTableValue: formatTableValue
   });
 
@@ -38477,7 +38523,7 @@ ${svg}
   function getFeatureInfo(id, lyr, arcs) {
       var msg = "Feature " + id + '\n';
       msg += getShapeInfo(id, lyr, arcs);
-      msg += getAttributeTableInfo(lyr, id);
+      msg += formatAttributeTableInfo(getAttributeTableInfo(lyr, id));
       return msg;
   }
 
@@ -40589,7 +40635,7 @@ ${svg}
 
   function getRunCommandData(target) {
     var lyr = target.layers[0];
-    var data = getLayerData(lyr, target.dataset);
+    var data = getLayerInfo(lyr, target.dataset);
     data.layer = lyr;
     data.dataset = target.dataset;
     return data;
@@ -42939,7 +42985,7 @@ ${svg}
         cmd.include(opts);
 
       } else if (name == 'info') {
-        cmd.printInfo(expandCommandTargets(targets));
+        cmd.info(targets, opts);
 
       } else if (name == 'inlay') {
         outputLayers = cmd.inlay(targetLayers, source, targetDataset, opts);
@@ -43305,13 +43351,13 @@ ${svg}
     commands = runAndRemoveInfoCommands(commands);
     if (commands.length === 0) return done(null);
 
-    // add options to -i -o -join -clip -erase commands to bypass file i/o
+    // add options to -i -o -join -clip -erase etc. commands to bypass file i/o
     // TODO: find a less kludgy solution
     commands.forEach(function(cmd) {
       if (commandTakesFileInput(cmd.name) && inputObj) {
         cmd.options.input = inputObj;
       }
-      if (cmd.name == 'o' && outputArr) {
+      if (outputArr && (cmd.name == 'o' || cmd.name == 'info' && cmd.options.save_to)) {
         cmd.options.output = outputArr;
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.22",
+  "version": "0.6.24",
   "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()
@@ -1422,7 +1437,9 @@
           closeMenu(100);
         }).text('restore');
         El('span').addClass('save-menu-btn').appendTo(line).on('click', async function(e) {
-          var buf = await idb.get(item.id);
+          var obj = await idb.get(item.id);
+          await internal.applyCompression(obj, {consume: true});
+          var buf = internal.pack(obj);
           saveBlobToLocalFile('mapshaper_snapshot.msx', new Blob([buf]));
         }).text('export');
         El('span').addClass('save-menu-btn').appendTo(line).on('click', async function(e) {
@@ -1470,20 +1487,24 @@
     }
 
     async function saveSnapshot(gui) {
-      var buf = await captureSnapshot(gui);
+      var obj = await captureSnapshot(gui);
+      // storing an unpacked object is usually a bit faster (~20%)
+      // note: we don't know the size of unpacked snapshot objects
+      // obj = internal.pack(obj);
       var entryId = String(++snapshotCount).padStart(3, '0');
       var snapshotId = sessionId + '_' + entryId; // e.g. session_d89fw_001
+      var size = obj.length;
       var entry = {
         created: Date.now(),
         session: sessionId,
         id: snapshotId,
         name: snapshotCount + '.',
         number: snapshotCount,
-        size: buf.length,
-        display_size: formatSize(buf.length)
+        size: size,
+        display_size: formatSize(size)
       };
 
-      await idb.set(entry.id, buf);
+      await idb.set(entry.id, obj);
       await addToIndex(entry);
       renderMenu();
     }
@@ -1492,9 +1513,8 @@
   function formatSize(bytes) {
     var kb = Math.round(bytes / 1000);
     var mb = (bytes / 1e6).toFixed(1);
-    if (kb < 990) {
-      return kb + 'kB';
-    }
+    if (!kb) return '';
+    if (kb < 990) return kb + 'kB';
     return mb + 'MB';
   }
 
@@ -1516,13 +1536,13 @@
   }
 
   async function restoreSnapshotById(id, gui) {
-    var buf = await idb.get(id);
-    if (!buf) {
-      console.log('Snapshot not available:', id);
-      return;
+    var data;
+    try {
+      data = await internal.restoreSessionData(await idb.get(id));
+    } catch(e) {
+      console.error(e);
+      stop$1('Snapshot is not available');
     }
-    var data = await internal.unpackSession(buf);
-    buf = null;
     gui.model.clear();
     importDatasets(data.datasets, gui);
     gui.clearMode();
@@ -1535,7 +1555,7 @@
     if (buf instanceof ArrayBuffer) {
       buf = new Uint8Array(buf);
     }
-    var data = await internal.unpackSession(buf);
+    var data = await internal.unpackSessionData(buf);
     importDatasets(data.datasets, gui);
   }
 
@@ -1558,7 +1578,7 @@
     // console.timeEnd('msx')
     delete lyr.active;
     obj.gui = getGuiState(gui);
-    return internal.pack(obj);
+    return obj;
   }
 
   // TODO: capture gui state information to allow restoring more of the UI
@@ -3025,22 +3045,12 @@
     }
 
     function getHistory() {
-      var hist;
-      try {
-        hist = JSON.parse(window.localStorage.getItem('console_history'));
-      } catch(e) {
-      }
-      return hist && hist.length > 0 ? hist : [];
+      return GUI.getSavedValue('console_history') || [];
     }
 
     function saveHistory() {
-      try {
-        history = history.filter(Boolean); // TODO: fix condition that leaves a blank line on the history
-        if (history.length) {
-          window.localStorage.setItem('console_history', JSON.stringify(history.slice(-50)));
-        }
-      } catch(e) {
-      }
+      history = history.filter(Boolean); // TODO: fix condition that leaves a blank line on the history
+      GUI.setSavedValue('console_history', history.slice(-100));
     }
 
     function toLog(str, cname) {
@@ -3656,10 +3666,20 @@
       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')
+        .findChild('input')
+        .on('change', function() {
+          GUI.setSavedValue('choose-save-dir', this.checked);
+        })
+        .attr('checked', GUI.getSavedValue('choose-save-dir') || false);
     }
 
     function turnOn() {
@@ -8697,7 +8717,6 @@
     function active(e) {
       return e.id > -1 && gui.interaction.getMode() == 'add-points';
     }
-
   }
 
   function Pencil(gui, mouse, hit) {
@@ -8720,10 +8739,7 @@
   }
 
   function initDrawing(gui, ext, mouse, hit) {
-
     initPointDrawing(gui, new Pencil(gui, mouse, hit));
-
-
   }
 
   var darkStroke = "#334",
@@ -9780,19 +9796,26 @@
         bx = t.bx,
         by = t.by;
     var x, y, xp, yp;
+    var count = 0;
     if (!vec.hasNext()) return;
-    x = xp = round(vec.x * mx + bx);
-    y = yp = round(vec.y * my + by);
+    x = round(vec.x * mx + bx);
+    y = round(vec.y * my + by);
     ctx.moveTo(x, y);
     while (vec.hasNext()) {
+      xp = x;
+      yp = y;
       x = round(vec.x * mx + bx);
       y = round(vec.y * my + by);
       if (x != xp || y != yp) {
         ctx.lineTo(x, y);
-        xp = x;
-        yp = y;
+        count++;
       }
     }
+    if (count === 0) {
+      // draw a tiny line if all coords round to the same location,
+      // so tiny shapes with strokes will consistently be drawn as dots,
+      ctx.lineTo(x + 0.1, y);
+    }
   }
 
   function roundToPix(x) {

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.22";
+  var VERSION = "0.6.24";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -10620,7 +10620,8 @@
       buf = new Uint8Array(buf);
     }
     opts = opts || {};
-    var out = await utils.promisify(gunzip)(buf, opts);
+    var gunzip$1 = runningInBrowser() ? utils.promisify(gunzip) : utils.promisify(require('zlib').gunzip);
+    var out = await gunzip$1(buf, opts);
     if (opts.filename && !isImportableAsBinary(opts.filename)) {
       out = strFromU8(out);
     }
@@ -10628,8 +10629,6 @@
   }
 
   function gunzipSync(buf, filename) {
-    // TODO: use native module in Node
-    // require('zlib').
     if (buf instanceof ArrayBuffer) {
       buf = new Uint8Array(buf);
     }
@@ -10768,16 +10767,39 @@
   // gui: (optional) gui instance
   //
   async function exportDatasetsToPack(datasets, opts) {
-    return {
+    var obj = {
       version: 1,
       created: (new Date).toISOString(),
-      datasets: await Promise.all(datasets.map(d => exportDataset(d, opts || {})))
+      datasets: await Promise.all(datasets.map(exportDataset))
     };
+    if (opts.compact) {
+      await applyCompression(obj);
+    }
+    return obj;
+  }
+
+  async function applyCompression(obj, opts) {
+    var promises = [];
+    obj.datasets.forEach(d => {
+      if (d.arcs) promises.push(compressArcs(d.arcs, opts));
+    });
+    await Promise.all(promises);
+  }
+
+  async function compressArcs(obj, opts) {
+    var gzipOpts = Object.assign({level: 1, consume: false}, opts);
+    var promises = [gzipAsync(obj.nn, gzipOpts), gzipAsync(obj.xx, gzipOpts), gzipAsync(obj.yy, gzipOpts)];
+    if (obj.zz) promises.push(gzipAsync(obj.zz, gzipOpts));
+    var results = await Promise.all(promises);
+    obj.nn = results.shift();
+    obj.xx = results.shift();
+    obj.yy = results.shift();
+    if (obj.zz) obj.zz = results.shift();
   }
 
   async function exportDataset(dataset, opts) {
     return {
-      arcs: dataset.arcs ? await exportArcs(dataset.arcs, opts) : null,
+      arcs: dataset.arcs ? exportArcs(dataset.arcs) : null,
       info: dataset.info ? exportInfo(dataset.info) : null,
       layers: await Promise.all((dataset.layers || []).map(exportLayer))
     };
@@ -10787,38 +10809,22 @@
     return new Uint8Array(arr.buffer, arr.byteOffset, arr.byteLength);
   }
 
-  async function exportArcs(arcs, opts) {
+  function exportArcs(arcs) {
     var data = arcs.getVertexData();
-    var obj = {
+    return {
       nn: typedArrayToBuffer(data.nn),
       xx: typedArrayToBuffer(data.xx),
       yy: typedArrayToBuffer(data.yy),
       zz: data.zz ? typedArrayToBuffer(data.zz) : null,
       zlimit: arcs.getRetainedInterval()
     };
-
-    // gzipping typically sees about 70% compression on unrounded coordinates
-    // -- possibly not worth the time
-    if (opts.compact) {
-      var gzipOpts = {level: 1, consume: false};
-      var promises = [gzipAsync(obj.nn, gzipOpts), gzipAsync(obj.xx, gzipOpts), gzipAsync(obj.yy, gzipOpts)];
-      if (obj.zz) promises.push(gzipAsync(obj.zz, gzipOpts));
-      var results = await Promise.all(promises);
-      obj.nn = results.shift();
-      obj.xx = results.shift();
-      obj.yy = results.shift();
-      if (obj.zz) obj.zz = results.shift();
-    }
-    return obj;
   }
 
   async function exportLayer(lyr) {
-    // console.time('table')
     var data = null;
     if (lyr.data) {
       data = await exportTable2(lyr.data);
     }
-    // console.timeEnd('table')
     return {
       name: lyr.name || null,
       geometry_type: lyr.geometry_type || null,
@@ -10845,6 +10851,7 @@
     exportPackedDatasets: exportPackedDatasets,
     pack: pack,
     exportDatasetsToPack: exportDatasetsToPack,
+    applyCompression: applyCompression,
     exportDataset: exportDataset
   });
 
@@ -24922,6 +24929,9 @@ ${svg}
 
     parser.command('info')
       .describe('print information about data layers')
+      .option('save-to', {
+        describe: 'name of file to save info in JSON format'
+      })
       .option('target', targetOpt);
 
     parser.command('inspect')
@@ -27457,12 +27467,14 @@ ${svg}
   // Import datasets contained in a BSON blob
   // Return command target as a dataset
   //
-  async function unpackSession(buf) {
-    var obj = unpack(buf, {});
+  async function unpackSessionData(buf) {
+    return restoreSessionData(unpack(buf, {}));
+  }
+
+  async function restoreSessionData(obj) {
     if (!isValidSession(obj)) {
       stop('Invalid mapshaper session data object');
     }
-
     var datasets = await Promise.all(obj.datasets.map(importDataset));
     return Object.assign(obj, {datasets: datasets});
   }
@@ -27539,7 +27551,8 @@ ${svg}
 
   var Unpack = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    unpackSession: unpackSession
+    unpackSessionData: unpackSessionData,
+    restoreSessionData: restoreSessionData
   });
 
   cmd.importFiles = async function(catalog, opts) {
@@ -27593,7 +27606,7 @@ ${svg}
 
   async function importMshpFile(file, catalog, opts) {
     var buf = cli.readFile(file, null, opts.input);
-    var obj = await unpackSession(buf);
+    var obj = await unpackSessionData(buf);
     obj.datasets.forEach(catalog.addDataset, catalog);
     return obj.target;
   }
@@ -38240,55 +38253,27 @@ ${svg}
 
   var MAX_RULE_LEN = 50;
 
-  cmd.printInfo = function(layers) {
-    var str = '';
-    layers.forEach(function(o, i) {
-      var title =  'Layer:    ' + (o.layer.name || '[unnamed layer]');
-      var tableStr = getAttributeTableInfo(o.layer);
-      var tableWidth = measureLongestLine(tableStr);
-      var ruleLen = Math.min(Math.max(title.length, tableWidth), MAX_RULE_LEN);
-      str += '\n';
-      str += utils.lpad('', ruleLen, '=') + '\n';
-      str += title + '\n';
-      str += utils.lpad('', ruleLen, '-') + '\n';
-      str += getLayerInfo(o.layer, o.dataset);
-      str += tableStr;
+  cmd.info = function(targets, opts) {
+    var layers = expandCommandTargets(targets);
+    var arr = layers.map(function(o) {
+      return getLayerInfo(o.layer, o.dataset);
     });
-    message(str);
-  };
-
-  function measureLongestLine(str) {
-    return Math.max.apply(null, str.split('\n').map(function(line) {return stringDisplayWidth(line);}));
-  }
-
-  function stringDisplayWidth(str) {
-    var w = 0;
-    for (var i = 0, n=str.length; i < n; i++) {
-      w += charDisplayWidth(str.charCodeAt(i));
+    message(formatInfo(arr));
+    if (opts.save_to) {
+      var output = [{
+        filename: opts.save_to + (opts.save_to.endsWith('.json') ? '' : '.json'),
+        content: JSON.stringify(arr, null, 2)
+      }];
+      writeFiles(output, opts);
     }
-    return w;
-  }
+  };
 
-  // see https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
-  // this is a simplified version, focusing on double-width CJK chars and ignoring nonprinting etc chars
-  function charDisplayWidth(c) {
-    if (c >= 0x1100 &&
-      (c <= 0x115f || c == 0x2329 || c == 0x232a ||
-      (c >= 0x2e80 && c <= 0xa4cf && c != 0x303f) || /* CJK ... Yi */
-      (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
-      (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
-      (c >= 0xfe10 && c <= 0xfe19) || /* Vertical forms */
-      (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
-      (c >= 0xff00 && c <= 0xff60) || /* Fullwidth Forms */
-      (c >= 0xffe0 && c <= 0xffe6) ||
-      (c >= 0x20000 && c <= 0x2fffd) ||
-      (c >= 0x30000 && c <= 0x3fffd))) return 2;
-    return 1;
-  }
+  cmd.printInfo = cmd.info; // old name
 
-  function getLayerData(lyr, dataset) {
+  function getLayerInfo(lyr, dataset) {
     var n = getFeatureCount(lyr);
     var o = {
+      layer_name: lyr.name,
       geometry_type: lyr.geometry_type,
       feature_count: n,
       null_shape_count: 0,
@@ -38296,31 +38281,47 @@ ${svg}
     };
     if (lyr.shapes && lyr.shapes.length > 0) {
       o.null_shape_count = countNullShapes(lyr.shapes);
-      o.bbox =getLayerBounds(lyr, dataset.arcs).toArray();
+      o.bbox = getLayerBounds(lyr, dataset.arcs).toArray();
       o.proj4 = getProjInfo(dataset);
     }
+    o.source_file = getLayerSourceFile(lyr, dataset) || null;
+    o.attribute_data = getAttributeTableInfo(lyr);
     return o;
   }
 
-  // TODO: consider polygons with zero area or other invalid geometries
-  function countNullShapes(shapes) {
-    var count = 0;
-    for (var i=0; i<shapes.length; i++) {
-      if (!shapes[i] || shapes[i].length === 0) count++;
+  // i: (optional) record index
+  function getAttributeTableInfo(lyr, i) {
+    if (!lyr.data || lyr.data.size() === 0 || lyr.data.getFields().length === 0) {
+      return null;
     }
-    return count;
+    var fields = applyFieldOrder(lyr.data.getFields(), 'ascending');
+    var valueName = i === undefined ? 'first_value' : 'value';
+    return fields.map(function(fname) {
+      return {
+        field: fname,
+        [valueName]: lyr.data.getReadOnlyRecordAt(i || 0)[fname]
+      };
+    });
   }
 
-  function countNullRecords(records) {
-    var count = 0;
-    for (var i=0; i<records.length; i++) {
-      if (!records[i]) count++;
-    }
-    return count;
+  function formatInfo(arr) {
+    var str = '';
+    arr.forEach(function(info, i) {
+      var title =  'Layer:    ' + (info.layer_name || '[unnamed layer]');
+      var tableStr = formatAttributeTableInfo(info.attribute_data);
+      var tableWidth = measureLongestLine(tableStr);
+      var ruleLen = Math.min(Math.max(title.length, tableWidth), MAX_RULE_LEN);
+      str += '\n';
+      str += utils.lpad('', ruleLen, '=') + '\n';
+      str += title + '\n';
+      str += utils.lpad('', ruleLen, '-') + '\n';
+      str += formatLayerInfo(info);
+      str += tableStr;
+    });
+    return str;
   }
 
-  function getLayerInfo(lyr, dataset) {
-    var data = getLayerData(lyr, dataset);
+  function formatLayerInfo(data) {
     var str = '';
     str += "Type:     " + (data.geometry_type || "tabular data") + "\n";
     str += utils.format("Records:  %,d\n",data.feature_count);
@@ -38331,21 +38332,19 @@ ${svg}
       str += "Bounds:   " + data.bbox.join(',') + "\n";
       str += "CRS:      " + data.proj4 + "\n";
     }
-    str += "Source:   " + (getLayerSourceFile(lyr, dataset) || 'n/a') + "\n";
+    str += "Source:   " + (data.source_file || 'n/a') + "\n";
     return str;
   }
 
-  function getAttributeTableInfo(lyr, i) {
-    if (!lyr.data || lyr.data.size() === 0 || lyr.data.getFields().length === 0) {
-      return "Attribute data: [none]\n";
-    }
-    return "\nAttribute data\n" + formatAttributeTable(lyr.data, i);
-  }
-
-  function formatAttributeTable(data, i) {
-    var fields = applyFieldOrder(data.getFields(), 'ascending');
-    var vals = fields.map(function(fname) {
-      return data.getReadOnlyRecordAt(i || 0)[fname];
+  function formatAttributeTableInfo(arr) {
+    if (!arr) return "Attribute data: [none]\n";
+    var header = "\nAttribute data\n";
+    var valKey = 'first_value' in arr[0] ? 'first_value' : 'value';
+    var vals = [];
+    var fields = [];
+    arr.forEach(function(o) {
+      fields.push(o.field);
+      vals.push(o[valKey]);
     });
     var maxIntegralChars = vals.reduce(function(max, val) {
       if (utils.isNumber(val)) {
@@ -38357,20 +38356,66 @@ ${svg}
     var col2Arr = vals.reduce(function(memo, val) {
       memo.push(formatTableValue(val, maxIntegralChars));
       return memo;
-    }, [i >= 0 ? 'Value' : 'First value']);
+    }, [valKey == 'first_value' ? 'First value' : 'Value']);
     var col1Chars = maxChars(col1Arr);
     var col2Chars = maxChars(col2Arr);
     var sepStr = (utils.rpad('', col1Chars + 2, '-') + '+' +
         utils.rpad('', col2Chars + 2, '-')).substr(0, MAX_RULE_LEN);
     var sepLine = sepStr + '\n';
-    var table = sepLine;
+    var table = '';
     col1Arr.forEach(function(col1, i) {
       var w = stringDisplayWidth(col1);
       table += ' ' + col1 + utils.rpad('', col1Chars - w, ' ') + ' | ' +
         col2Arr[i] + '\n';
       if (i === 0) table += sepLine; // separator after first line
     });
-    return table + sepLine;
+    return header + sepLine + table + sepLine;
+  }
+
+  function measureLongestLine(str) {
+    return Math.max.apply(null, str.split('\n').map(function(line) {return stringDisplayWidth(line);}));
+  }
+
+  function stringDisplayWidth(str) {
+    var w = 0;
+    for (var i = 0, n=str.length; i < n; i++) {
+      w += charDisplayWidth(str.charCodeAt(i));
+    }
+    return w;
+  }
+
+  // see https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+  // this is a simplified version, focusing on double-width CJK chars and ignoring nonprinting etc chars
+  function charDisplayWidth(c) {
+    if (c >= 0x1100 &&
+      (c <= 0x115f || c == 0x2329 || c == 0x232a ||
+      (c >= 0x2e80 && c <= 0xa4cf && c != 0x303f) || /* CJK ... Yi */
+      (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
+      (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
+      (c >= 0xfe10 && c <= 0xfe19) || /* Vertical forms */
+      (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
+      (c >= 0xff00 && c <= 0xff60) || /* Fullwidth Forms */
+      (c >= 0xffe0 && c <= 0xffe6) ||
+      (c >= 0x20000 && c <= 0x2fffd) ||
+      (c >= 0x30000 && c <= 0x3fffd))) return 2;
+    return 1;
+  }
+
+  // TODO: consider polygons with zero area or other invalid geometries
+  function countNullShapes(shapes) {
+    var count = 0;
+    for (var i=0; i<shapes.length; i++) {
+      if (!shapes[i] || shapes[i].length === 0) count++;
+    }
+    return count;
+  }
+
+  function countNullRecords(records) {
+    var count = 0;
+    for (var i=0; i<records.length; i++) {
+      if (!records[i]) count++;
+    }
+    return count;
   }
 
   function maxChars(arr) {
@@ -38424,8 +38469,9 @@ ${svg}
 
   var Info = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    getLayerData: getLayerData,
+    getLayerInfo: getLayerInfo,
     getAttributeTableInfo: getAttributeTableInfo,
+    formatAttributeTableInfo: formatAttributeTableInfo,
     formatTableValue: formatTableValue
   });
 
@@ -38477,7 +38523,7 @@ ${svg}
   function getFeatureInfo(id, lyr, arcs) {
       var msg = "Feature " + id + '\n';
       msg += getShapeInfo(id, lyr, arcs);
-      msg += getAttributeTableInfo(lyr, id);
+      msg += formatAttributeTableInfo(getAttributeTableInfo(lyr, id));
       return msg;
   }
 
@@ -40589,7 +40635,7 @@ ${svg}
 
   function getRunCommandData(target) {
     var lyr = target.layers[0];
-    var data = getLayerData(lyr, target.dataset);
+    var data = getLayerInfo(lyr, target.dataset);
     data.layer = lyr;
     data.dataset = target.dataset;
     return data;
@@ -42939,7 +42985,7 @@ ${svg}
         cmd.include(opts);
 
       } else if (name == 'info') {
-        cmd.printInfo(expandCommandTargets(targets));
+        cmd.info(targets, opts);
 
       } else if (name == 'inlay') {
         outputLayers = cmd.inlay(targetLayers, source, targetDataset, opts);
@@ -43305,13 +43351,13 @@ ${svg}
     commands = runAndRemoveInfoCommands(commands);
     if (commands.length === 0) return done(null);
 
-    // add options to -i -o -join -clip -erase commands to bypass file i/o
+    // add options to -i -o -join -clip -erase etc. commands to bypass file i/o
     // TODO: find a less kludgy solution
     commands.forEach(function(cmd) {
       if (commandTakesFileInput(cmd.name) && inputObj) {
         cmd.options.input = inputObj;
       }
-      if (cmd.name == 'o' && outputArr) {
+      if (outputArr && (cmd.name == 'o' || cmd.name == 'info' && cmd.options.save_to)) {
         cmd.options.output = outputArr;
       }
     });

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;