mapshaper 0.5.86 → 0.5.91

package/www/mapshaper-gui.js

@@ -1,114 +1,16 @@
 (function () {
 
-  var utils = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    get default () { return utils; },
-    get getUniqueName () { return getUniqueName; },
-    get isFunction () { return isFunction; },
-    get isObject () { return isObject; },
-    get clamp () { return clamp; },
-    get isArray () { return isArray; },
-    get isNumber () { return isNumber; },
-    get isValidNumber () { return isValidNumber; },
-    get isFiniteNumber () { return isFiniteNumber; },
-    get isNonNegNumber () { return isNonNegNumber; },
-    get isInteger () { return isInteger; },
-    get isEven () { return isEven; },
-    get isOdd () { return isOdd; },
-    get isString () { return isString; },
-    get isDate () { return isDate; },
-    get isBoolean () { return isBoolean; },
-    get formatDateISO () { return formatDateISO; },
-    get toArray () { return toArray; },
-    get isArrayLike () { return isArrayLike; },
-    get addslashes () { return addslashes; },
-    get regexEscape () { return regexEscape; },
-    get htmlEscape () { return htmlEscape; },
-    get defaults () { return defaults; },
-    get extend () { return extend; },
-    get inherit () { return inherit; },
-    get reduceAsync () { return reduceAsync; },
-    get merge () { return merge; },
-    get difference () { return difference; },
-    get intersection () { return intersection; },
-    get indexOf () { return indexOf; },
-    get contains () { return contains; },
-    get some () { return some; },
-    get every () { return every; },
-    get find () { return find; },
-    get range () { return range; },
-    get repeat () { return repeat; },
-    get sum () { return sum; },
-    get getArrayBounds () { return getArrayBounds; },
-    get uniq () { return uniq; },
-    get pluck () { return pluck; },
-    get countValues () { return countValues; },
-    get indexOn () { return indexOn; },
-    get groupBy () { return groupBy; },
-    get arrayToIndex () { return arrayToIndex; },
-    get forEach () { return forEach; },
-    get forEachProperty () { return forEachProperty; },
-    get initializeArray () { return initializeArray; },
-    get replaceArray () { return replaceArray; },
-    get repeatString () { return repeatString; },
-    get splitLines () { return splitLines; },
-    get pluralSuffix () { return pluralSuffix; },
-    get endsWith () { return endsWith; },
-    get lpad () { return lpad; },
-    get rpad () { return rpad; },
-    get trim () { return trim; },
-    get ltrim () { return ltrim; },
-    get rtrim () { return rtrim; },
-    get addThousandsSep () { return addThousandsSep; },
-    get numToStr () { return numToStr; },
-    get formatNumber () { return formatNumber; },
-    get formatIntlNumber () { return formatIntlNumber; },
-    get formatNumberForDisplay () { return formatNumberForDisplay; },
-    get shuffle () { return shuffle; },
-    get sortOn () { return sortOn; },
-    get genericSort () { return genericSort; },
-    get getSortedIds () { return getSortedIds; },
-    get sortArrayIndex () { return sortArrayIndex; },
-    get reorderArray () { return reorderArray; },
-    get getKeyComparator () { return getKeyComparator; },
-    get getGenericComparator () { return getGenericComparator; },
-    get quicksort () { return quicksort; },
-    get quicksortPartition () { return quicksortPartition; },
-    get findRankByValue () { return findRankByValue; },
-    get findValueByPct () { return findValueByPct; },
-    get findValueByRank () { return findValueByRank; },
-    get findMedian () { return findMedian; },
-    get mean () { return mean; },
-    get format () { return format; },
-    get formatter () { return formatter; },
-    get wildcardToRegExp () { return wildcardToRegExp; },
-    get createBuffer () { return createBuffer; },
-    get expandoBuffer () { return expandoBuffer; },
-    get copyElements () { return copyElements; },
-    get extendBuffer () { return extendBuffer; },
-    get mergeNames () { return mergeNames; },
-    get findStringPrefix () { return findStringPrefix; },
-    get parsePercent () { return parsePercent; },
-    get formatVersionedName () { return formatVersionedName; },
-    get uniqifyNames () { return uniqifyNames; },
-    get parseString () { return parseString; },
-    get parseNumber () { return parseNumber; },
-    get parseIntlNumber () { return parseIntlNumber; },
-    get cleanNumericString () { return cleanNumericString; },
-    get trimQuotes () { return trimQuotes; }
-  });
-
   var api = window.mapshaper; // assuming mapshaper is in global scope
   var mapshaper = api,
-    utils$1 = api.utils,
+    utils = api.utils,
     cli = api.cli,
     geom = api.geom,
     internal = api.internal,
     Bounds = internal.Bounds,
-    UserError$1 = internal.UserError,
-    message$1 = internal.message, // stop, error and message are overridden in gui-proxy.js
-    stop$1 = internal.stop,
-    error$1 = internal.error;
+    UserError = internal.UserError,
+    message = internal.message, // stop, error and message are overridden in gui-proxy.js
+    stop = internal.stop,
+    error = internal.error;
 
   api.enableLogging();
 
@@ -144,7 +46,7 @@
 
     html = '<table>';
     if (catalog.title) {
-      html += utils$1.format('<tr><th colspan="%d"><h4>%s</h4></th></tr>', cols, catalog.title);
+      html += utils.format('<tr><th colspan="%d"><h4>%s</h4></th></tr>', cols, catalog.title);
     }
     while (row < rows) {
       html += renderRow(items.slice(row * cols, row * cols + cols));
@@ -209,7 +111,7 @@
 
     function renderCell(item, i) {
       var template = '<td data-id="%d"><h4 class="title">%s</h4><div class="subtitle">%s</div></td>';
-      return utils$1.format(template, i, item.title, item.subtitle || '');
+      return utils.format(template, i, item.title, item.subtitle || '');
     }
 
   }
@@ -280,6 +182,10 @@
     return (el && (el.tagName == 'INPUT' || el.contentEditable == 'true')) ? el : null;
   };
 
+  GUI.textIsSelected = function() {
+    return !!GUI.getInputElement();
+  };
+
   GUI.selectElement = function(el) {
     var range = document.createRange(),
         sel = window.getSelection();
@@ -322,11 +228,35 @@
     }
     parsed =  internal.parseCommands(str);
     if (!parsed.length || parsed[0].name != cmd) {
-      stop$1("Unable to parse command line options");
+      stop("Unable to parse command line options");
     }
     return parsed[0].options;
   };
 
+  // Convert an options object to a command line options string
+  // (used by gui-import-control.js)
+  // TODO: handle options with irregular string <-> object conversion
+  GUI.formatCommandOptions = function(o) {
+    var arr = [];
+    Object.keys(o).forEach(function(key) {
+      var name = key.replace(/_/g, '-');
+      var val = o[key];
+      var str;
+      // TODO: quote values that contain spaces
+      if (Array.isArray(val)) {
+        str = name + '=' + val.join(',');
+      } else if (val === true) {
+        str = name;
+      } else if (val === false) {
+        return;
+      } else {
+        str = name + '=' + val;
+      }
+      arr.push(str);
+    });
+    return arr.join(' ');
+  };
+
   // @file: Zip file
   // @cb: function(err, <files>)
   //
@@ -391,7 +321,7 @@
       evt = new EventData(this.type);
       evt.target = this.target;
     } else if (evt.target != this.target || evt.type != this.type) {
-      error$1("[Handler] event target/type have changed.");
+      error("[Handler] event target/type have changed.");
     }
     this.callback.call(this.listener, evt);
   };
@@ -400,7 +330,7 @@
     this.type = type;
     this.target = target;
     if (data) {
-      utils$1.defaults(this, data);
+      utils.defaults(this, data);
       this.data = data;
     }
   }
@@ -630,12 +560,12 @@
       try {
         els = root.querySelectorAll(selector);
       } catch (e) {
-        error$1("Invalid selector:", selector);
+        error("Invalid selector:", selector);
       }
     } else {
-      error$1("This browser doesn't support CSS query selectors");
+      error("This browser doesn't support CSS query selectors");
     }
-    return utils$1.toArray(els);
+    return utils.toArray(els);
   };
 
   // Converts dash-separated names (e.g. background-color) to camelCase (e.g. backgroundColor)
@@ -672,7 +602,7 @@
   };
 
   function El(ref) {
-    if (!ref) error$1("Element() needs a reference");
+    if (!ref) error("Element() needs a reference");
     if (ref instanceof El) {
       return ref;
     }
@@ -681,7 +611,7 @@
     }
 
     var node;
-    if (utils$1.isString(ref)) {
+    if (utils.isString(ref)) {
       if (ref[0] == '<') {
         var parent = El('div').html(ref).node();
         node = parent.childNodes.length  == 1 ? parent.childNodes[0] : parent;
@@ -693,13 +623,13 @@
     } else if (ref.tagName) {
       node = ref;
     }
-    if (!node) error$1("Unmatched element selector:", ref);
+    if (!node) error("Unmatched element selector:", ref);
     this.el = node;
   }
 
-  utils$1.inherit(El, EventDispatcher);
+  utils.inherit(El, EventDispatcher);
 
-  utils$1.extend(El.prototype, {
+  utils.extend(El.prototype, {
 
     clone: function() {
       var el = this.el.cloneNode(true);
@@ -708,7 +638,7 @@
         //    can ...
         el = El('div').addClass(el.className).html(el.innerHTML).node();
       }
-      el.id = utils$1.getUniqueName();
+      el.id = utils.getUniqueName();
       this.el = el;
       return this;
     },
@@ -738,11 +668,11 @@
       if (val != null) {
         El.setStyle(this.el, css, val);
       }
-      else if (utils$1.isString(css)) {
+      else if (utils.isString(css)) {
         addCSS(this.el, css);
       }
-      else if (utils$1.isObject(css)) {
-        utils$1.forEachProperty(css, function(val, key) {
+      else if (utils.isObject(css)) {
+        utils.forEachProperty(css, function(val, key) {
           El.setStyle(this.el, key, val);
         }, this);
       }
@@ -750,7 +680,7 @@
     },
 
     attr: function(obj, value) {
-      if (utils$1.isString(obj)) {
+      if (utils.isString(obj)) {
         if (arguments.length == 1) {
           return this.el.getAttribute(obj);
         }
@@ -834,7 +764,7 @@
     },
 
     text: function(str) {
-      this.html(utils$1.htmlEscape(str));
+      this.html(utils.htmlEscape(str));
       return this;
     },
 
@@ -924,7 +854,7 @@
   El.prototype.__on = El.prototype.on;
   El.prototype.on = function(type, func, ctx) {
     if (ctx) {
-      error$1("[El#on()] Third argument no longer supported.");
+      error("[El#on()] Third argument no longer supported.");
     }
     if (this.constructor == El) {
       this.el.addEventListener(type, func);
@@ -980,7 +910,7 @@
     }
 
     this.value = function(str) {
-      if (utils$1.isString(str)) {
+      if (utils.isString(str)) {
         el.node().textContent = str;
       } else {
         return el.node().textContent;
@@ -988,7 +918,7 @@
     };
   }
 
-  utils$1.inherit(ClickText2, EventDispatcher);
+  utils.inherit(ClickText2, EventDispatcher);
 
   // @ref reference to a text input element
   function ClickText(ref) {
@@ -1059,9 +989,9 @@
         // return _parser ? _parser(valStr) : parseFloat(valStr);
         return _value;
       }
-      var val = utils$1.clamp(arg, _min, _max);
+      var val = utils.clamp(arg, _min, _max);
       if (!_validator(val)) {
-        error$1("ClickText#value() invalid value:", arg);
+        error("ClickText#value() invalid value:", arg);
       } else {
         _value = val;
       }
@@ -1070,14 +1000,14 @@
     };
   }
 
-  utils$1.inherit(ClickText, EventDispatcher);
+  utils.inherit(ClickText, EventDispatcher);
 
 
   function Checkbox(ref) {
     var _el = El(ref);
   }
 
-  utils$1.inherit(Checkbox, EventDispatcher);
+  utils.inherit(Checkbox, EventDispatcher);
 
   function SimpleButton(ref) {
     var _el = El(ref),
@@ -1106,7 +1036,7 @@
     }
   }
 
-  utils$1.inherit(SimpleButton, EventDispatcher);
+  utils.inherit(SimpleButton, EventDispatcher);
 
   // @cb function(<FileList>)
   function DropControl(gui, el, cb) {
@@ -1125,6 +1055,10 @@
       var types = Array.from(e.clipboardData.types || []).join(',');
       var items = Array.from(e.clipboardData.items || []);
       var files;
+      if (GUI.textIsSelected()) {
+        // user is probably pasting text into an editable text field
+        return;
+      }
       block(e);
       // Browser compatibility (tested on MacOS only):
       // Chrome and Safari: full support
@@ -1197,20 +1131,19 @@
 
   function ImportControl(gui, opts) {
     var model = gui.model;
+    var initialImport = true;
     var importCount = 0;
     var importTotal = 0;
     var overQuickView = false;
-    var useQuickView = opts.quick_view; // may be set by mapshaper-gui
     var queuedFiles = [];
     var manifestFiles = opts.files || [];
-    var cachedFiles = {};
     var catalog;
 
     if (opts.catalog) {
       catalog = new CatalogControl(gui, opts.catalog, downloadFiles);
     }
 
-    new SimpleButton('#import-buttons .submit-btn').on('click', onSubmit);
+    new SimpleButton('#import-buttons .submit-btn').on('click', importQueuedFiles);
     new SimpleButton('#import-buttons .cancel-btn').on('click', gui.clearMode);
     new DropControl(gui, 'body', receiveFiles);
     new FileChooser('#file-selection-btn', receiveFiles);
@@ -1218,7 +1151,7 @@
     new FileChooser('#add-file-btn', receiveFiles);
     initDropArea('#import-quick-drop', true);
     initDropArea('#import-drop');
-    gui.keyboard.onMenuSubmit(El('#import-options'), onSubmit);
+    gui.keyboard.onMenuSubmit(El('#import-options'), importQueuedFiles);
 
     gui.addMode('import', turnOn, turnOff);
     gui.enterMode('import');
@@ -1230,6 +1163,10 @@
       }
     });
 
+    function useQuickView() {
+      return initialImport && (opts.quick_view || overQuickView);
+    }
+
     function initDropArea(el, isQuick) {
       var area = El(el)
         .on('dragleave', onout)
@@ -1247,15 +1184,19 @@
       }
     }
 
-    function findMatchingShp(filename) {
-      // use case-insensitive matching
-      var base = internal.getPathBase(filename).toLowerCase();
-      return model.getDatasets().filter(function(d) {
-        var fname = d.info.input_files && d.info.input_files[0] || "";
-        var ext = internal.getFileExtension(fname).toLowerCase();
-        var base2 = internal.getPathBase(fname).toLowerCase();
-        return base == base2 && ext == 'shp';
-      });
+    async function importQueuedFiles() {
+      gui.container.removeClass('queued-files');
+      gui.container.removeClass('splash-screen');
+      var files = queuedFiles;
+      try {
+        if (files.length > 0) {
+          queuedFiles = [];
+          await importFiles(files);
+        }
+      } catch(e) {
+        console.error(e);
+      }
+      gui.clearMode();
     }
 
     function turnOn() {
@@ -1276,13 +1217,8 @@
         importCount = 0;
       }
       gui.clearProgressMessage();
-      useQuickView = false; // unset 'quick view' mode, if on
-      close();
-    }
-
-    function close() {
+      initialImport = false; // unset 'quick view' mode, if on
       clearQueuedFiles();
-      cachedFiles = {};
     }
 
     function onImportComplete() {
@@ -1316,34 +1252,6 @@
       }, []);
     }
 
-    // When a Shapefile component is at the head of the queue, move the entire
-    // Shapefile to the front of the queue, sorted in reverse alphabetical order,
-    // (a kludge), so .shp is read before .dbf and .prj
-    // (If a .dbf file is imported before a .shp, it becomes a separate dataset)
-    // TODO: import Shapefile parts without relying on this kludge
-    function sortQueue(queue) {
-      var nextFile = queue[0];
-      var basename, parts;
-      if (!isShapefilePart(nextFile.name)) {
-        return queue;
-      }
-      basename = internal.getFileBase(nextFile.name).toLowerCase();
-      parts = [];
-      queue = queue.filter(function(file) {
-        if (internal.getFileBase(file.name).toLowerCase() == basename) {
-          parts.push(file);
-          return false;
-        }
-        return true;
-      });
-      parts.sort(function(a, b) {
-        // Sorting on LC filename so Shapefiles with mixed-case
-        // extensions are sorted correctly
-        return a.name.toLowerCase() < b.name.toLowerCase() ? 1 : -1;
-      });
-      return parts.concat(queue);
-    }
-
     function showQueuedFiles() {
       var list = gui.container.findChild('.dropped-file-list').empty();
       queuedFiles.forEach(function(f) {
@@ -1351,16 +1259,14 @@
       });
     }
 
-    function receiveFiles(files) {
-      var prevSize = queuedFiles.length;
-      useQuickView = useQuickView || overQuickView;
-      files = handleZipFiles(utils$1.toArray(files));
-      addFilesToQueue(files);
+    async function receiveFiles(files) {
+      // TODO: show importing message here?
+      var expanded = await expandFiles(files);
+      addFilesToQueue(expanded);
       if (queuedFiles.length === 0) return;
       gui.enterMode('import');
-
-      if (useQuickView) {
-        onSubmit();
+      if (useQuickView()) {
+        importQueuedFiles();
       } else {
         gui.container.addClass('queued-files');
         El('#path-import-options').classed('hidden', !filesMayContainPaths(queuedFiles));
@@ -1368,25 +1274,51 @@
       }
     }
 
-    function filesMayContainPaths(files) {
-      return utils$1.some(files, function(f) {
-          var type = internal.guessInputFileType(f.name);
-          return type == 'shp' || type == 'json' || internal.isZipFile(f.name);
-      });
+    async function expandFiles(files) {
+      var files2 = [], expanded;
+      for (var f of files) {
+        if (internal.isZipFile(f.name)) {
+          expanded = await readZipFile(f);
+          files2 = files2.concat(expanded);
+        } else {
+          files2.push(f);
+        }
+      }
+      return files2;
     }
 
-    function onSubmit() {
-      gui.container.removeClass('queued-files');
-      gui.container.removeClass('splash-screen');
-      procNextQueuedFile();
+    async function importFiles(files) {
+      var fileData = await readFiles(files);
+      var importOpts = readImportOpts();
+      var groups = groupFilesForImport(fileData, importOpts);
+      for (var group of groups) {
+        if (group.size > 4e7) {
+          gui.showProgressMessage('Importing');
+          await wait(35);
+        }
+        importDataset(group, importOpts);
+      }
     }
 
-    function addDataset(dataset) {
-      if (!datasetIsEmpty(dataset)) {
-        model.addDataset(dataset);
-        importCount++;
+    function importDataset(group, importOpts) {
+      var optStr = GUI.formatCommandOptions(importOpts);
+      var dataset = internal.importContent(group, importOpts);
+      if (datasetIsEmpty(dataset)) return;
+      if (group.layername) {
+        dataset.layers.forEach(lyr => lyr.name = group.layername);
       }
-      procNextQueuedFile();
+      // save import options for use by repair control, etc.
+      dataset.info.import_options = importOpts;
+      model.addDataset(dataset);
+      importCount++;
+      gui.session.fileImported(group.filename, optStr);
+    }
+
+    function filesMayContainPaths(files) {
+      return utils.some(files, function(f) {
+          var type = internal.guessInputFileType(f.name);
+          return type == 'shp' || type == 'json' || internal.isZipFile(f.name);
+      });
     }
 
     function datasetIsEmpty(dataset) {
@@ -1395,41 +1327,27 @@
       });
     }
 
-    function procNextQueuedFile() {
-      if (queuedFiles.length === 0) {
-        gui.clearMode();
-      } else {
-        queuedFiles = sortQueue(queuedFiles);
-        readFile(queuedFiles.shift());
-      }
-    }
 
     // TODO: support .cpg
     function isShapefilePart(name) {
       return /\.(shp|shx|dbf|prj)$/i.test(name);
     }
 
-
     function readImportOpts() {
-      if (useQuickView) return {};
-      var freeform = El('#import-options .advanced-options').node().value,
-          opts = GUI.parseFreeformOptions(freeform, 'i');
-      opts.no_repair = !El("#repair-intersections-opt").node().checked;
-      opts.snap = !!El("#snap-points-opt").node().checked;
-      return opts;
-    }
-
-    // for CLI output
-    function readImportOptsAsString() {
-      if (useQuickView) return '';
-      var freeform = El('#import-options .advanced-options').node().value;
-      var opts = readImportOpts();
-      if (opts.snap) freeform = 'snap ' + freeform;
-      return freeform.trim();
+      var importOpts;
+      if (useQuickView()) {
+        importOpts = {}; // default opts using quickview
+      } else {
+        var freeform = El('#import-options .advanced-options').node().value;
+        importOpts = GUI.parseFreeformOptions(freeform, 'i');
+        importOpts.no_repair = !El("#repair-intersections-opt").node().checked;
+        importOpts.snap = !!El("#snap-points-opt").node().checked;
+      }
+      return importOpts;
     }
 
     // @file a File object
-    function readFile(file) {
+    async function readContentFileAsync(file, cb) {
       var name = file.name,
           reader = new FileReader(),
           useBinary = internal.isSupportedBinaryInputType(name) ||
@@ -1439,9 +1357,9 @@
 
       reader.addEventListener('loadend', function(e) {
         if (!reader.result) {
-          handleImportError("Web browser was unable to load the file.", name);
+          cb(new Error());
         } else {
-          importFileContent(name, reader.result);
+          cb(null, reader.result);
         }
       });
       if (useBinary) {
@@ -1452,93 +1370,8 @@
       }
     }
 
-    function importFileContent(fileName, content) {
-      var fileType = internal.guessInputType(fileName, content),
-          importOpts = readImportOpts(),
-          matches = findMatchingShp(fileName),
-          dataset, lyr;
-
-      // Add dbf data to a previously imported .shp file with a matching name
-      // (.shp should have been queued before .dbf)
-      if (fileType == 'dbf' && matches.length > 0) {
-        // find an imported .shp layer that is missing attribute data
-        // (if multiple matches, try to use the most recently imported one)
-        dataset = matches.reduce(function(memo, d) {
-          if (!d.layers[0].data) {
-            memo = d;
-          }
-          return memo;
-        }, null);
-        if (dataset) {
-          lyr = dataset.layers[0];
-          lyr.data = new internal.ShapefileTable(content, importOpts.encoding);
-          if (lyr.shapes && lyr.data.size() != lyr.shapes.length) {
-            stop$1("Different number of records in .shp and .dbf files");
-          }
-          if (!lyr.geometry_type) {
-            // kludge: trigger display of table cells if .shp has null geometry
-            // TODO: test case if lyr is not the current active layer
-            model.updated({});
-          }
-          procNextQueuedFile();
-          return;
-        }
-      }
-
-      if (fileType == 'shx') {
-        // save .shx for use when importing .shp
-        // (queue should be sorted so that .shx is processed before .shp)
-        cachedFiles[fileName.toLowerCase()] = {filename: fileName, content: content};
-        procNextQueuedFile();
-        return;
-      }
-
-      // Add .prj file to previously imported .shp file
-      if (fileType == 'prj') {
-        matches.forEach(function(d) {
-          if (!d.info.prj) {
-            d.info.prj = content;
-          }
-        });
-        procNextQueuedFile();
-        return;
-      }
-
-      importNewDataset(fileType, fileName, content, importOpts);
-    }
-
-    function importNewDataset(fileType, fileName, content, importOpts) {
-      var size = content.byteLength || content.length, // ArrayBuffer or string
-          delay = 0;
-
-      // show importing message if file is large
-      if (size > 4e7) {
-        gui.showProgressMessage('Importing');
-        delay = 35;
-      }
-      setTimeout(function() {
-        var dataset;
-        var input = {};
-        try {
-          input[fileType] = {filename: fileName, content: content};
-          if (fileType == 'shp') {
-            // shx file should already be cached, if it was added together with the shp
-            input.shx = cachedFiles[fileName.replace(/shp$/i, 'shx').toLowerCase()] || null;
-          }
-          dataset = internal.importContent(input, importOpts);
-          // save import options for use by repair control, etc.
-          dataset.info.import_options = importOpts;
-          gui.session.fileImported(fileName, readImportOptsAsString());
-          addDataset(dataset);
-
-        } catch(e) {
-          handleImportError(e, fileName);
-        }
-      }, delay);
-    }
-
     function handleImportError(e, fileName) {
-      var msg = utils$1.isString(e) ? e : e.message;
+      var msg = utils.isString(e) ? e : e.message;
       if (fileName) {
         msg = "Error importing <i>" + fileName + "</i><br>" + msg;
       }
@@ -1547,34 +1380,6 @@
       console.error(e);
     }
 
-    function handleZipFiles(files) {
-      return files.filter(function(file) {
-        var isZip = internal.isZipFile(file.name);
-        if (isZip) {
-          importZipFile(file);
-        }
-        return !isZip;
-      });
-    }
-
-    function importZipFile(file) {
-      // gui.showProgressMessage('Importing');
-      setTimeout(function() {
-        GUI.readZipFile(file, function(err, files) {
-          if (err) {
-            handleImportError(err, file.name);
-          } else {
-            // don't try to import .txt files from zip files
-            // (these would be parsed as dsv and throw errows)
-            files = files.filter(function(f) {
-              return !/\.txt$/i.test(f.name);
-            });
-            receiveFiles(files);
-          }
-        });
-      }, 35);
-    }
-
     function prepFilesForDownload(names) {
       var items = names.map(function(name) {
         var isUrl = /:\/\//.test(name);
@@ -1596,7 +1401,7 @@
 
     function downloadFiles(paths) {
       var items = prepFilesForDownload(paths);
-      utils$1.reduceAsync(items, [], downloadNextFile, function(err, files) {
+      utils.reduceAsync(items, [], downloadNextFile, function(err, files) {
         if (err) {
           gui.alert(err);
         } else if (!files.length) {
@@ -1620,37 +1425,107 @@
       });
     }
 
-    function downloadNextFile_v1(memo, item, next) {
-      var req = new XMLHttpRequest();
-      var blob;
-      req.responseType = 'blob';
-      req.addEventListener('load', function(e) {
-        if (req.status == 200) {
-          blob = req.response;
-        }
-      });
-      req.addEventListener('progress', function(e) {
-        if (!e.lengthComputable) return;
-        var pct = e.loaded / e.total;
-        if (catalog) catalog.progress(pct);
+    function wait(ms) {
+      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);
+        });
       });
-      req.addEventListener('loadend', function() {
-        var err;
-        if (req.status == 404) {
-          err = "Not&nbsp;found:&nbsp;" + item.name;
-        } else if (!blob) {
-          // Errors like DNS lookup failure, no CORS headers, no network connection
-          // all are status 0 - it seems impossible to show a more specific message
-          // actual reason is displayed on the console
-          err = "Error&nbsp;loading&nbsp;" + item.name + ". Possible causes include: wrong URL, no network connection, server not configured for cross-domain sharing (CORS).";
+    }
+
+    async function readZipFile(file) {
+      var files;
+      await wait(35); // pause a beat so status message can display
+      try {
+        files = await runAsync(GUI.readZipFile, file);
+        // don't try to import .txt files from zip files
+        // (these would be parsed as dsv and throw errows)
+        files = files.filter(function(f) {
+          return !/\.txt$/i.test(f.name);
+        });
+      } catch(e) {
+        handleImportError(e, file.name);
+        files = [];
+      }
+      return files;
+    }
+
+    async function readFileData(file) {
+      try {
+        var content = await runAsync(readContentFileAsync, file);
+        return {
+          content: content,
+          size: content.byteLength || content.length, // ArrayBuffer or string
+          name: file.name,
+          basename: internal.getFileBase(file.name).toLowerCase(),
+          type: internal.guessInputType(file.name, content)
+        };
+      } catch (e) {
+        handleImportError("Web browser was unable to load the file.", file.name);
+      }
+      return null;
+    }
+
+    async function readFiles(files) {
+      var data = [], d;
+      for (var file of files) {
+        d = await readFileData(file);
+        if (d) data.push(d);
+      }
+      return data;
+    }
+
+    function groupFilesForImport(data, importOpts) {
+      var names = importOpts.name ? [importOpts.name] : null;
+      if (initialImport && opts.name) { // name from mapshaper-gui --name option
+        names = opts.name.split(',');
+      }
+
+      function key(basename, type) {
+        return basename + '.' + type;
+      }
+      function hasShp(basename) {
+        var shpKey = key(basename, 'shp');
+        return data.some(d => key(d.basename, d.type) == shpKey);
+      }
+      data.forEach(d => {
+        if (d.type == 'shp' || !isShapefilePart(d.name)) {
+          d.group = key(d.basename, d.type);
+          d.filename = d.name;
+        } else if (hasShp(d.basename)) {
+          d.group = key(d.basename, 'shp');
+        } else if (d.type == 'dbf') {
+          d.filename = d.name;
+          d.group = key(d.basename, 'dbf');
         } else {
-          blob.name = item.basename;
-          memo.push(blob);
+          // shapefile part without a .shp file
+          d.group = null;
         }
-        next(err, memo);
       });
-      req.open('GET', item.url);
-      req.send();
+      var index = {};
+      var groups = [];
+      data.forEach(d => {
+        if (!d.group) return;
+        var g = index[d.group];
+        if (!g) {
+          g = {};
+          g.layername = names ? names[groups.length] || names[names.length - 1] : null;
+          groups.push(g);
+          index[d.group] = g;
+        }
+        g.size = (g.size || 0) + d.size; // accumulate size
+        g[d.type] = {
+          filename: d.name,
+          content: d.content
+        };
+        // kludge: stash import name for session history
+        if (d.filename) g.filename = d.filename;
+      });
+      return groups;
     }
   }
 
@@ -1692,7 +1567,7 @@
     var defaults = {
       space: 7
     };
-    opts = utils$1.extend(defaults, opts);
+    opts = utils.extend(defaults, opts);
 
     var _pct = 0;
     var _track,
@@ -1745,7 +1620,7 @@
     };
 
     function setHandlePos(x, fire) {
-      x = utils$1.clamp(x, 0, size());
+      x = utils.clamp(x, 0, size());
       var pct = x / size();
       if (pct != _pct) {
         _pct = pct;
@@ -1760,7 +1635,7 @@
     }
   }
 
-  utils$1.inherit(Slider, EventDispatcher);
+  utils.inherit(Slider, EventDispatcher);
 
   /*
   How changes in the simplify control should affect other components
@@ -1828,7 +1703,7 @@
     slider.on('change', function(e) {
       var pct = fromSliderPct(e.pct);
       text.value(pct);
-      pct = utils$1.parsePercent(text.text()); // use rounded value (for consistency w/ cli)
+      pct = utils.parsePercent(text.text()); // use rounded value (for consistency w/ cli)
       onChange(pct);
     });
     slider.on('start', function(e) {
@@ -1849,7 +1724,7 @@
       else if (pct < 0.01) decimals = 3;
       else if (pct < 1) decimals = 2;
       else if (pct < 100) decimals = 1;
-      return utils$1.formatNumberForDisplay(pct, decimals) + "%";
+      return utils.formatNumberForDisplay(pct, decimals) + "%";
     });
 
     text.parser(function(s) {
@@ -2101,7 +1976,7 @@
 
     // Replace error function in mapshaper lib
     var error = function() {
-      stop.apply(null, utils$1.toArray(arguments));
+      stop.apply(null, utils.toArray(arguments));
     };
 
     var message = function() {
@@ -2115,11 +1990,11 @@
     // replace CLI version of writeFiles()
     internal.replaceWriteFiles(function(files, opts, done) {
       var filename;
-      if (!utils$1.isArray(files) || files.length === 0) {
+      if (!utils.isArray(files) || files.length === 0) {
         done("Nothing to export");
       } else if (GUI.canSaveToServer() && !opts.save_to_download_folder) {
-        var paths = internal.getOutputPaths(utils$1.pluck(files, 'filename'), opts);
-        var data = utils$1.pluck(files, 'content');
+        var paths = internal.getOutputPaths(utils.pluck(files, 'filename'), opts);
+        var data = utils.pluck(files, 'content');
         saveFilesToServer(paths, data, function(err) {
           var msg;
           if (err) {
@@ -2138,7 +2013,7 @@
       } else if (files.length == 1) {
         saveBlobToDownloadFolder(files[0].filename, new Blob([files[0].content]), done);
       } else {
-        filename = internal.getCommonFileBase(utils$1.pluck(files, 'filename')) || "output";
+        filename = internal.getCommonFileBase(utils.pluck(files, 'filename')) || "output";
         saveZipFile(filename + ".zip", files, done);
       }
     });
@@ -2160,10 +2035,10 @@
         // try to match import filename of this dataset
         if (d.info.input_files[0] == src) return d;
         // try to match name of a layer in this dataset
-        lyr = utils$1.find(d.layers, function(lyr) {return lyr.name == src;});
+        lyr = utils.find(d.layers, function(lyr) {return lyr.name == src;});
         return lyr ? internal.isolateLayer(lyr, d) : null;
       }, null);
-      if (!retn) stop$1("Missing data layer [" + src + "]");
+      if (!retn) stop("Missing data layer [" + src + "]");
       return retn;
     }
 
@@ -2172,7 +2047,7 @@
       // Return a copy with layers duplicated, so changes won't affect original layers
       // This makes an (unsafe) assumption that the dataset arcs won't be changed...
       // need to rethink this.
-      return utils$1.defaults({
+      return utils.defaults({
         layers: dataset.layers.map(internal.copyLayer)
       }, dataset);
     });
@@ -2244,7 +2119,7 @@
   }
 
   function projectPointsForDisplay(lyr, src, dest) {
-    var copy = utils$1.extend({}, lyr);
+    var copy = utils.extend({}, lyr);
     var proj = internal.getProjTransform2(src, dest);
     copy.shapes = internal.cloneShapes(lyr.shapes);
     internal.projectPointLayer(copy, proj);
@@ -2642,7 +2517,7 @@
         } else if (cmd == 'history') {
           toLog(gui.session.toCommandLineString());
         } else if (cmd == 'layers') {
-          message$1("Available layers:",
+          message("Available layers:",
             internal.getFormattedLayerList(model));
         } else if (cmd == 'close' || cmd == 'exit' || cmd == 'quit') {
           turnOff();
@@ -2731,7 +2606,7 @@
     }
 
     function onError(err) {
-      if (utils$1.isString(err)) {
+      if (utils.isString(err)) {
         consoleStop(err);
       } else if (err.name == 'UserError') {
         // stop() has already been called, don't need to log
@@ -2746,7 +2621,7 @@
     function consoleStop() {
       var msg = GUI.formatMessageArgs(arguments);
       consoleWarning(msg);
-      throw new UserError$1(msg);
+      throw new UserError(msg);
     }
 
     function consoleWarning() {
@@ -2910,7 +2785,7 @@
         // console.log("first intersection:", internal.getIntersectionDebugData(XX[0], arcs));
         pointLyr = {geometry_type: 'point', shapes: [internal.getIntersectionPoints(XX)]};
         map.setIntersectionLayer(pointLyr, {layers:[pointLyr]});
-        readout.html(utils$1.format('<span class="icon"></span>%s line intersection%s <img class="close-btn" src="images/close.png">', n, utils$1.pluralSuffix(n)));
+        readout.html(utils.format('<span class="icon"></span>%s line intersection%s <img class="close-btn" src="images/close.png">', n, utils.pluralSuffix(n)));
         readout.findChild('.close-btn').on('click', dismiss);
       } else {
         map.setIntersectionLayer(null);
@@ -2919,7 +2794,7 @@
     }
   }
 
-  utils$1.inherit(RepairControl, EventDispatcher);
+  utils.inherit(RepairControl, EventDispatcher);
 
   function filterLayerByIds(lyr, ids) {
     var shapes;
@@ -2927,7 +2802,7 @@
       shapes = ids.map(function(id) {
         return lyr.shapes[id];
       });
-      return utils$1.defaults({shapes: shapes, data: null}, lyr);
+      return utils.defaults({shapes: shapes, data: null}, lyr);
     }
     return lyr;
   }
@@ -2980,7 +2855,7 @@
       });
 
       internal.writeFiles = function() {
-        error$1(unsupportedMsg);
+        error(unsupportedMsg);
       };
     } else {
       new SimpleButton(menu.findChild('.save-btn').addClass('default-btn')).on('click', onExportClick);
@@ -3016,7 +2891,7 @@
       setTimeout(function() {
         exportMenuSelection(layers, function(err) {
           if (err) {
-            if (utils$1.isString(err)) {
+            if (utils.isString(err)) {
               gui.alert(err);
             } else {
               // stack seems to change if Error is logged directly
@@ -3063,7 +2938,7 @@
         // without changing its name elsewhere
         layer: Object.assign({}, o.layer)
       };
-      var html = utils$1.format(template, i + 1, target.layer.name || '[unnamed layer]');
+      var html = utils.format(template, i + 1, target.layer.name || '[unnamed layer]');
       // return {layer: o.layer, html: html};
       var el = El('div').html(html).addClass('layer-item');
       var box = el.findChild('input').node();
@@ -3173,9 +3048,9 @@
 
     function initFormatMenu() {
       var defaults = ['shapefile', 'geojson', 'topojson', 'json', 'dsv', 'svg'];
-      var formats = utils$1.uniq(defaults.concat(getInputFormats()));
+      var formats = utils.uniq(defaults.concat(getInputFormats()));
       var items = formats.map(function(fmt) {
-        return utils$1.format('<div><label><input type="radio" name="format" value="%s"' +
+        return utils.format('<div><label><input type="radio" name="format" value="%s"' +
           ' class="radio">%s</label></div>', fmt, internal.getFormatName(fmt));
       });
       menu.findChild('.export-formats').html(items.join('\n'));
@@ -3338,7 +3213,7 @@
         // can be used as unique identifiers for caching rendered HTML, and as
         // an id for layer menu event handlers
         if (!lyr.menu_id || uniqIds[lyr.menu_id]) {
-          lyr.menu_id = utils$1.getUniqueName();
+          lyr.menu_id = utils.getUniqueName();
         }
         uniqIds[lyr.menu_id] = true;
         if (isPinnable(lyr)) pinnableCount++;
@@ -3493,7 +3368,7 @@
       GUI.onClick(entry, function() {
         var target = findLayerById(id);
         // don't select if user is typing or dragging
-        if (!GUI.getInputElement() && !dragging) {
+        if (!GUI.textIsSelected() && !dragging) {
           gui.clearMode();
           if (!map.isActiveLayer(target.layer)) {
             model.selectLayer(target.layer, target.dataset);
@@ -3511,1795 +3386,172 @@
         type = lyr.geometry_type + ' feature';
       }
       if (type) {
-        str = utils$1.format('%,d %s%s', n, type, utils$1.pluralSuffix(n));
+        str = utils.format('%,d %s%s', n, type, utils.pluralSuffix(n));
       } else {
         str = "[empty]";
       }
       return str;
     }
 
-    function getWarnings(lyr, dataset) {
-      var file = internal.getLayerSourceFile(lyr, dataset);
-      var missing = [];
-      var msg;
-      if (utils$1.endsWith(file, '.shp') && lyr == dataset.layers[0]) {
-        if (!lyr.data) {
-          missing.push('.dbf');
-        }
-        if (!dataset.info.prj && !dataset.info.crs) {
-          missing.push('.prj');
-        }
-      }
-      if (missing.length) {
-        msg = 'missing ' + missing.join(' and ') + ' data';
-      }
-      return msg;
-    }
-
-    function describeSrc(lyr, dataset) {
-      return internal.getLayerSourceFile(lyr, dataset);
-    }
-
-
-    function isPinnable(lyr) {
-      return internal.layerHasGeometry(lyr) || internal.layerHasFurniture(lyr);
-    }
-
-
-
-    function rowHTML(c1, c2, cname) {
-      return utils$1.format('<div class="row%s"><div class="col1">%s</div>' +
-        '<div class="col2">%s</div></div>', cname ? ' ' + cname : '', c1, c2);
-    }
-  }
-
-  function SessionHistory(gui) {
-    var commands = [];
-    // commands that can be ignored when checking for unsaved changes
-    var nonEditingCommands = 'i,target,info,version,verbose,projections,inspect,help,h,encodings,calc'.split(',');
-
-    this.unsavedChanges = function() {
-      var cmd, cmdName;
-      for (var i=commands.length - 1; i >= 0; i--) {
-        cmdName = getCommandName(commands[i]);
-        if (cmdName == 'o') break;
-        if (nonEditingCommands.includes(cmdName)) continue;
-        return true;
-      }
-      return false;
-    };
-
-    this.fileImported = function(file, optStr) {
-      var cmd = '-i ' + file;
-      if (optStr) {
-        cmd += ' ' + optStr;
-      }
-      commands.push(cmd);
-    };
-
-    this.layerRenamed = function(lyr, name) {
-      var currTarget = getCurrentTarget();
-      var layerTarget = getTargetFromLayer(lyr);
-      if (currTarget == layerTarget) {
-        commands.push('-rename-layers ' + name);
-      } else {
-        commands.push('-rename-layers ' + name + ' target=' + layerTarget);
-        commands.push('-target ' + currTarget);
-      }
-    };
-
-    this.consoleCommands = function(str) {
-      commands.push(str); // todo: split commands?
-    };
-
-    this.simplificationApplied = function(optStr) {
-      commands.push('-simplify ' + optStr);
-    };
-
-    this.simplificationRepair = function() {
-      //  TODO: improve this... repair does not necessarily apply to most recent
-      //  simplification command
-      //  consider adding a (hidden) repair command to handle this event
-      var i = indexOfLastCommand('-simplify');
-      if (i > -1) {
-        commands[i] = commands[i].replace(' no-repair', '');
-      }
-    };
-
-    this.updateSimplificationPct = function(pct) {
-      var i = indexOfLastCommand('-simplify');
-      if (i > -1) {
-        commands[i] = commands[i].replace(/percentage=[^ ]+/, 'percentage=' + pct);
-      }
-    };
-
-    this.dataValueUpdated = function(id, field, value) {
-      var cmd = `-each 'd[${JSON.stringify(field)}] = ${JSON.stringify(value)}' where='this.id == ${id}'`;
-      commands.push(cmd);
-    };
-
-    this.layersExported = function(ids, optStr) {
-      var layers = gui.model.getLayers();
-      var cmd = '-o';
-      if (layers.length > 1) {
-        cmd += ' target=' + ids.map(getTargetFromId).join(',');
-      }
-      if (optStr) {
-        cmd += ' ' + optStr;
-      }
-      commands.push(cmd);
-    };
-
-    this.setTargetLayer = function(lyr) {
-      var layers = gui.model.getLayers();
-      if (layers.length > 1) {
-        if (indexOfLastCommand('-target') == commands.length - 1) {
-          commands.pop(); // if last commands was -target, remove it
-        }
-        commands.push('-target ' + getTargetFromLayer(lyr));
-      }
-    };
-
-    this.toCommandLineString = function() {
-      var str = commands.join(' \\\n  ');
-      return 'mapshaper ' + str;
-    };
-
-    function getCommandName(cmd) {
-      var rxp = /^-([a-z0-9-]+)/;
-      var match = rxp.exec(cmd);
-      return match ? match[1] : null;
-    }
-
-    function getCurrentTarget() {
-      return getTargetFromLayer(gui.model.getActiveLayer().layer);
-    }
-
-    function indexOfLastCommand(cmd) {
-      return commands.reduce(function(memo, str, i) {
-        return str.indexOf(cmd) === 0 ? i : memo;
-      }, -1);
-    }
-
-    function getTargetFromId(id) {
-      var layers = gui.model.getLayers();
-      return getTargetFromLayer(layers[id - 1].layer);
-    }
-
-    function getTargetFromLayer(lyr) {
-      var id = internal.getLayerTargetId(gui.model, lyr);
-      return internal.formatOptionValue(id);
-    }
-  }
-
-  var Buffer = require('buffer').Buffer; // works with browserify
-
-  var uniqCount = 0;
-  function getUniqueName(prefix) {
-    return (prefix || "__id_") + (++uniqCount);
-  }
-
-  function isFunction(obj) {
-    return typeof obj == 'function';
-  }
-
-  function isObject(obj) {
-    return obj === Object(obj); // via underscore
-  }
-
-  function clamp(val, min, max) {
-    return val < min ? min : (val > max ? max : val);
-  }
-
-  function isArray(obj) {
-    return Array.isArray(obj);
-  }
-
-  // Is obj a valid number or NaN? (test if obj is type number)
-  function isNumber(obj) {
-    return obj != null && obj.constructor == Number;
-  }
-
-  function isValidNumber(val) {
-    return isNumber(val) && !isNaN(val);
-  }
-
-  // Similar to isFinite() but does not coerce strings or other types
-  function isFiniteNumber(val) {
-    return isValidNumber(val) && val !== Infinity && val !== -Infinity;
-  }
-
-  // This uses type conversion
-  // export function isFiniteNumber(val) {
-  //   return val > -Infinity && val < Infinity;
-  // }
-
-  function isNonNegNumber(val) {
-    return isNumber(val) && val >= 0;
-  }
-
-  function isInteger(obj) {
-    return isNumber(obj) && ((obj | 0) === obj);
-  }
-
-  function isEven(obj) {
-    return (obj % 2) === 0;
-  }
-
-  function isOdd(obj) {
-    return (obj % 2) === 1;
-  }
-
-  function isString(obj) {
-    return obj != null && obj.toString === String.prototype.toString;
-    // TODO: replace w/ something better.
-  }
-
-  function isDate(obj) {
-    return !!obj && obj.getTime === Date.prototype.getTime;
-  }
-
-  function isBoolean(obj) {
-    return obj === true || obj === false;
-  }
-
-  function formatDateISO(d) {
-    if (!isDate(d)) return '';
-    return d.toISOString().replace(':00.000Z', 'Z');
-  }
-
-  // Convert an array-like object to an Array, or make a copy if @obj is an Array
-  function toArray(obj) {
-    var arr;
-    if (!isArrayLike(obj)) error("toArray() requires an array-like object");
-    try {
-      arr = Array.prototype.slice.call(obj, 0); // breaks in ie8
-    } catch(e) {
-      // support ie8
-      arr = [];
-      for (var i=0, n=obj.length; i<n; i++) {
-        arr[i] = obj[i];
-      }
-    }
-    return arr;
-  }
-
-  // Array like: has length property, is numerically indexed and mutable.
-  // TODO: try to detect objects with length property but no indexed data elements
-  function isArrayLike(obj) {
-    if (!obj) return false;
-    if (isArray(obj)) return true;
-    if (isString(obj)) return false;
-    if (obj.length === 0) return true;
-    if (obj.length > 0) return true;
-    return false;
-  }
-
-  // See https://raw.github.com/kvz/phpjs/master/functions/strings/addslashes.js
-  function addslashes(str) {
-    return (str + '').replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0');
-  }
-
-  // Escape a literal string to use in a regexp.
-  // Ref.: http://simonwillison.net/2006/Jan/20/escape/
-  function regexEscape(str) {
-    return str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-  }
-
-
-  // See https://github.com/janl/mustache.js/blob/master/mustache.js
-  var entityMap = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#39;',
-    '/': '&#x2F;'
-  };
-  function htmlEscape(s) {
-    return String(s).replace(/[&<>"'\/]/g, function(s) {
-      return entityMap[s];
-    });
-  }
-
-  function defaults(dest) {
-    for (var i=1, n=arguments.length; i<n; i++) {
-      var src = arguments[i] || {};
-      for (var key in src) {
-        if (key in dest === false && src.hasOwnProperty(key)) {
-          dest[key] = src[key];
-        }
-      }
-    }
-    return dest;
-  }
-
-  function extend(o) {
-    var dest = o || {},
-        n = arguments.length,
-        key, i, src;
-    for (i=1; i<n; i++) {
-      src = arguments[i] || {};
-      for (key in src) {
-        if (src.hasOwnProperty(key)) {
-          dest[key] = src[key];
-        }
-      }
-    }
-    return dest;
-  }
-
-  // Pseudoclassical inheritance
-  //
-  // Inherit from a Parent function:
-  //    inherit(Child, Parent);
-  // Call parent's constructor (inside child constructor):
-  //    this.__super__([args...]);
-  function inherit(targ, src) {
-    var f = function() {
-      if (this.__super__ == f) {
-        // add __super__ of parent to front of lookup chain
-        // so parent class constructor can call its parent using this.__super__
-        this.__super__ = src.prototype.__super__;
-        // call parent constructor function. this.__super__ now points to parent-of-parent
-        src.apply(this, arguments);
-        // remove temp __super__, expose targ.prototype.__super__ again
-        delete this.__super__;
-      }
-    };
-
-    f.prototype = src.prototype || src; // added || src to allow inheriting from objects as well as functions
-    // Extend targ prototype instead of wiping it out --
-    //   in case inherit() is called after targ.prototype = {stuff}; statement
-    targ.prototype = extend(new f(), targ.prototype); //
-    targ.prototype.constructor = targ;
-    targ.prototype.__super__ = f;
-  }
-
-
-  // Call @iter on each member of an array (similar to Array#reduce(iter))
-  //    iter: function(memo, item, callback)
-  // Call @done when all members have been processed or if an error occurs
-  //    done: function(err, memo)
-  // @memo: Initial value
-  //
-  function reduceAsync(arr, memo, iter, done) {
-    var call = typeof setImmediate == 'undefined' ? setTimeout : setImmediate;
-    var i=0;
-    next(null, memo);
-
-    function next(err, memo) {
-      // Detach next operation from call stack to prevent overflow
-      // Don't use setTimeout(, 0) if setImmediate is available
-      // (setTimeout() can introduce a long delay if previous operation was slow,
-      //    as of Node 0.10.32 -- a bug?)
-      if (err) {
-        return done(err, null);
-      }
-      call(function() {
-        if (i < arr.length === false) {
-          done(null, memo);
-        } else {
-          iter(memo, arr[i++], next);
-        }
-      }, 0);
-    }
-  }
-
-
-  // Append elements of @src array to @dest array
-  function merge(dest, src) {
-    if (!isArray(dest) || !isArray(src)) {
-      error("Usage: merge(destArray, srcArray);");
-    }
-    for (var i=0, n=src.length; i<n; i++) {
-      dest.push(src[i]);
-    }
-    return dest;
-  }
-
-  // Returns elements in arr and not in other
-  // (similar to underscore diff)
-  function difference(arr, other) {
-    var index = arrayToIndex(other);
-    return arr.filter(function(el) {
-      return !Object.prototype.hasOwnProperty.call(index, el);
-    });
-  }
-
-  // Return the intersection of two arrays
-  function intersection(a, b) {
-    return a.filter(function(el) {
-      return b.includes(el);
-    });
-  }
-
-  function indexOf(arr, item) {
-    var nan = item !== item;
-    for (var i = 0, len = arr.length || 0; i < len; i++) {
-      if (arr[i] === item) return i;
-      if (nan && arr[i] !== arr[i]) return i;
-    }
-    return -1;
-  }
-
-  // Test a string or array-like object for existence of substring or element
-  function contains(container, item) {
-    if (isString(container)) {
-      return container.indexOf(item) != -1;
-    }
-    else if (isArrayLike(container)) {
-      return indexOf(container, item) != -1;
-    }
-    error("Expected Array or String argument");
-  }
-
-  function some(arr, test) {
-    return arr.reduce(function(val, item) {
-      return val || test(item); // TODO: short-circuit?
-    }, false);
-  }
-
-  function every(arr, test) {
-    return arr.reduce(function(val, item) {
-      return val && test(item);
-    }, true);
-  }
-
-  function find(arr, test, ctx) {
-    var matches = arr.filter(test, ctx);
-    return matches.length === 0 ? null : matches[0];
-  }
-
-  function range(len, start, inc) {
-    var arr = [],
-        v = start === void 0 ? 0 : start,
-        i = inc === void 0 ? 1 : inc;
-    while(len--) {
-      arr.push(v);
-      v += i;
-    }
-    return arr;
-  }
-
-  function repeat(times, func) {
-    var values = [],
-        val;
-    for (var i=0; i<times; i++) {
-      val = func(i);
-      if (val !== void 0) {
-        values[i] = val;
-      }
-    }
-    return values.length > 0 ? values : void 0;
-  }
-
-  // Calc sum, skip falsy and NaN values
-  // Assumes: no other non-numeric objects in array
-  //
-  function sum(arr, info) {
-    if (!isArrayLike(arr)) error ("sum() expects an array, received:", arr);
-    var tot = 0,
-        nan = 0,
-        val;
-    for (var i=0, n=arr.length; i<n; i++) {
-      val = arr[i];
-      if (val) {
-        tot += val;
-      } else if (isNaN(val)) {
-        nan++;
-      }
-    }
-    if (info) {
-      info.nan = nan;
-    }
-    return tot;
-  }
-
-  // Calculate min and max values of an array, ignoring NaN values
-  function getArrayBounds(arr) {
-    var min = Infinity,
-      max = -Infinity,
-      nan = 0, val;
-    for (var i=0, len=arr.length; i<len; i++) {
-      val = arr[i];
-      if (val !== val) nan++;
-      if (val < min) min = val;
-      if (val > max) max = val;
-    }
-    return {
-      min: min,
-      max: max,
-      nan: nan
-    };
-  }
-
-  // export function uniq(src) {
-  //   var index = {};
-  //   return src.reduce(function(memo, el) {
-  //     if (el in index === false) {
-  //       index[el] = true;
-  //       memo.push(el);
-  //     }
-  //     return memo;
-  //   }, []);
-  // }
-
-  function uniq(src) {
-    var index = new Set();
-    var arr = [];
-    var item;
-    for (var i=0, n=src.length; i<n; i++) {
-      item = src[i];
-      if (!index.has(item)) {
-        arr.push(item);
-        index.add(item);
-      }
-    }
-    return arr;
-  }
-
-  function pluck(arr, key) {
-    return arr.map(function(obj) {
-      return obj[key];
-    });
-  }
-
-  function countValues(arr) {
-    return arr.reduce(function(memo, val) {
-      memo[val] = (val in memo) ? memo[val] + 1 : 1;
-      return memo;
-    }, {});
-  }
-
-  function indexOn(arr, k) {
-    return arr.reduce(function(index, o) {
-      index[o[k]] = o;
-      return index;
-    }, {});
-  }
-
-  function groupBy(arr, k) {
-    return arr.reduce(function(index, o) {
-      var keyval = o[k];
-      if (keyval in index) {
-        index[keyval].push(o);
-      } else {
-        index[keyval] = [o];
-      }
-      return index;
-    }, {});
-  }
-
-  function arrayToIndex(arr, val) {
-    var init = arguments.length > 1;
-    return arr.reduce(function(index, key) {
-      index[key] = init ? val : true;
-      return index;
-    }, {});
-  }
-
-  // Support for iterating over array-like objects, like typed arrays
-  function forEach(arr, func, ctx) {
-    if (!isArrayLike(arr)) {
-      throw new Error("#forEach() takes an array-like argument. " + arr);
-    }
-    for (var i=0, n=arr.length; i < n; i++) {
-      func.call(ctx, arr[i], i);
-    }
-  }
-
-  function forEachProperty(o, func, ctx) {
-    Object.keys(o).forEach(function(key) {
-      func.call(ctx, o[key], key);
-    });
-  }
-
-  function initializeArray(arr, init) {
-    for (var i=0, len=arr.length; i<len; i++) {
-      arr[i] = init;
-    }
-    return arr;
-  }
-
-  function replaceArray(arr, arr2) {
-    arr.splice(0, arr.length);
-    for (var i=0, n=arr2.length; i<n; i++) {
-      arr.push(arr2[i]);
-    }
-  }
-
-  function repeatString(src, n) {
-    var str = "";
-    for (var i=0; i<n; i++)
-      str += src;
-    return str;
-  }
-
-  function splitLines(str) {
-    return str.split(/\r?\n/);
-  }
-
-  function pluralSuffix(count) {
-    return count != 1 ? 's' : '';
-  }
-
-  function endsWith(str, ending) {
-      return str.indexOf(ending, str.length - ending.length) !== -1;
-  }
-
-  function lpad(str, size, pad) {
-    pad = pad || ' ';
-    str = String(str);
-    return repeatString(pad, size - str.length) + str;
-  }
-
-  function rpad(str, size, pad) {
-    pad = pad || ' ';
-    str = String(str);
-    return str + repeatString(pad, size - str.length);
-  }
-
-  function trim(str) {
-    return ltrim(rtrim(str));
-  }
-
-  var ltrimRxp = /^\s+/;
-  function ltrim(str) {
-    return str.replace(ltrimRxp, '');
-  }
-
-  var rtrimRxp = /\s+$/;
-  function rtrim(str) {
-    return str.replace(rtrimRxp, '');
-  }
-
-  function addThousandsSep(str) {
-    var fmt = '',
-        start = str[0] == '-' ? 1 : 0,
-        dec = str.indexOf('.'),
-        end = str.length,
-        ins = (dec == -1 ? end : dec) - 3;
-    while (ins > start) {
-      fmt = ',' + str.substring(ins, end) + fmt;
-      end = ins;
-      ins -= 3;
-    }
-    return str.substring(0, end) + fmt;
-  }
-
-  function numToStr(num, decimals) {
-    return decimals >= 0 ? num.toFixed(decimals) : String(num);
-  }
-
-  function formatNumber(val) {
-    return val + '';
-  }
-
-  function formatIntlNumber(val) {
-    var str = formatNumber(val);
-    return '"' + str.replace('.', ',') + '"'; // need to quote if comma-delimited
-  }
-
-  function formatNumberForDisplay(num, decimals, nullStr, showPos) {
-    var fmt;
-    if (isNaN(num)) {
-      fmt = nullStr || '-';
-    } else {
-      fmt = numToStr(num, decimals);
-      fmt = addThousandsSep(fmt);
-      if (showPos && parseFloat(fmt) > 0) {
-        fmt = "+" + fmt;
-      }
-    }
-    return fmt;
-  }
-
-  function shuffle(arr) {
-    var tmp, i, j;
-    for (i = arr.length - 1; i > 0; i--) {
-      j = Math.floor(Math.random() * (i + 1));
-      tmp = arr[i];
-      arr[i] = arr[j];
-      arr[j] = tmp;
-    }
-  }
-
-  // Sort an array of objects based on one or more properties.
-  // Usage: sortOn(array, key1, asc?[, key2, asc? ...])
-  //
-  function sortOn(arr) {
-    var comparators = [];
-    for (var i=1; i<arguments.length; i+=2) {
-      comparators.push(getKeyComparator(arguments[i], arguments[i+1]));
-    }
-    arr.sort(function(a, b) {
-      var cmp = 0,
-          i = 0,
-          n = comparators.length;
-      while (i < n && cmp === 0) {
-        cmp = comparators[i](a, b);
-        i++;
-      }
-      return cmp;
-    });
-    return arr;
-  }
-
-  // Sort array of values that can be compared with < > operators (strings, numbers)
-  // null, undefined and NaN are sorted to the end of the array
-  // default order is ascending
-  //
-  function genericSort(arr, ascending) {
-    var compare = getGenericComparator(ascending);
-    Array.prototype.sort.call(arr, compare);
-    return arr;
-  }
-
-  function getSortedIds(arr, asc) {
-    var ids = range(arr.length);
-    sortArrayIndex(ids, arr, asc);
-    return ids;
-  }
-
-  function sortArrayIndex(ids, arr, asc) {
-    var compare = getGenericComparator(asc);
-    ids.sort(function(i, j) {
-      // added i, j comparison to guarantee that sort is stable
-      var cmp = compare(arr[i], arr[j]);
-      return cmp > 0 || cmp === 0 && i > j ? 1 : -1;
-    });
-  }
-
-  function reorderArray(arr, idxs) {
-    var len = idxs.length;
-    var arr2 = [];
-    for (var i=0; i<len; i++) {
-      var idx = idxs[i];
-      if (idx < 0 || idx >= len) error("Out-of-bounds array idx");
-      arr2[i] = arr[idx];
-    }
-    replaceArray(arr, arr2);
-  }
-
-  function getKeyComparator(key, asc) {
-    var compare = getGenericComparator(asc);
-    return function(a, b) {
-      return compare(a[key], b[key]);
-    };
-  }
-
-  function getGenericComparator(asc) {
-    asc = asc !== false;
-    return function(a, b) {
-      var retn = 0;
-      if (b == null) {
-        retn = a == null ? 0 : -1;
-      } else if (a == null) {
-        retn = 1;
-      } else if (a < b) {
-        retn = asc ? -1 : 1;
-      } else if (a > b) {
-        retn = asc ? 1 : -1;
-      } else if (a !== a) {
-        retn = 1;
-      } else if (b !== b) {
-        retn = -1;
-      }
-      return retn;
-    };
-  }
-
-
-  // Generic in-place sort (null, NaN, undefined not handled)
-  function quicksort(arr, asc) {
-    quicksortPartition(arr, 0, arr.length-1);
-    if (asc === false) Array.prototype.reverse.call(arr); // Works with typed arrays
-    return arr;
-  }
-
-  // Moved out of quicksort() (saw >100% speedup in Chrome with deep recursion)
-  function quicksortPartition (a, lo, hi) {
-    var i = lo,
-        j = hi,
-        pivot, tmp;
-    while (i < hi) {
-      pivot = a[lo + hi >> 1]; // avoid n^2 performance on sorted arrays
-      while (i <= j) {
-        while (a[i] < pivot) i++;
-        while (a[j] > pivot) j--;
-        if (i <= j) {
-          tmp = a[i];
-          a[i] = a[j];
-          a[j] = tmp;
-          i++;
-          j--;
-        }
-      }
-      if (lo < j) quicksortPartition(a, lo, j);
-      lo = i;
-      j = hi;
-    }
-  }
-
-
-  function findRankByValue(arr, value) {
-    if (isNaN(value)) return arr.length;
-    var rank = 1;
-    for (var i=0, n=arr.length; i<n; i++) {
-      if (value > arr[i]) rank++;
-    }
-    return rank;
-  }
-
-  function findValueByPct(arr, pct) {
-    var rank = Math.ceil((1-pct) * (arr.length));
-    return findValueByRank(arr, rank);
-  }
-
-  // See http://ndevilla.free.fr/median/median/src/wirth.c
-  // Elements of @arr are reordered
-  //
-  function findValueByRank(arr, rank) {
-    if (!arr.length || rank < 1 || rank > arr.length) error("[findValueByRank()] invalid input");
-
-    rank = clamp(rank | 0, 1, arr.length);
-    var k = rank - 1, // conv. rank to array index
-        n = arr.length,
-        l = 0,
-        m = n - 1,
-        i, j, val, tmp;
-
-    while (l < m) {
-      val = arr[k];
-      i = l;
-      j = m;
-      do {
-        while (arr[i] < val) {i++;}
-        while (val < arr[j]) {j--;}
-        if (i <= j) {
-          tmp = arr[i];
-          arr[i] = arr[j];
-          arr[j] = tmp;
-          i++;
-          j--;
-        }
-      } while (i <= j);
-      if (j < k) l = i;
-      if (k < i) m = j;
-    }
-    return arr[k];
-  }
-
-  //
-  //
-  function findMedian(arr) {
-    var n = arr.length,
-        rank = Math.floor(n / 2) + 1,
-        median = findValueByRank(arr, rank);
-    if ((n & 1) == 0) {
-      median = (median + findValueByRank(arr, rank - 1)) / 2;
-    }
-    return median;
-  }
-
-
-  function mean(arr) {
-    var count = 0,
-        avg = NaN,
-        val;
-    for (var i=0, n=arr.length; i<n; i++) {
-      val = arr[i];
-      if (isNaN(val)) continue;
-      avg = ++count == 1 ? val : val / count + (count - 1) / count * avg;
-    }
-    return avg;
-  }
-
-
-  /*
-  A simplified version of printf formatting
-  Format codes: %[flags][width][.precision]type
-
-  supported flags:
-    +   add '+' before positive numbers
-    0   left-pad with '0'
-    '   Add thousands separator
-  width: 1 to many
-  precision: .(1 to many)
-  type:
-    s     string
-    di    integers
-    f     decimal numbers
-    xX    hexidecimal (unsigned)
-    %     literal '%'
-
-  Examples:
-    code    val    formatted
-    %+d     1      '+1'
-    %4i     32     '  32'
-    %04i    32     '0032'
-    %x      255    'ff'
-    %.2f    0.125  '0.13'
-    %'f     1000   '1,000'
-  */
-
-  // Usage: format(formatString, [values])
-  // Tip: When reusing the same format many times, use formatter() for 5x - 10x better performance
-  //
-  function format(fmt) {
-    var fn = formatter(fmt);
-    var str = fn.apply(null, Array.prototype.slice.call(arguments, 1));
-    return str;
-  }
-
-  function formatValue(val, matches) {
-    var flags = matches[1];
-    var padding = matches[2];
-    var decimals = matches[3] ? parseInt(matches[3].substr(1)) : void 0;
-    var type = matches[4];
-    var isString = type == 's',
-        isHex = type == 'x' || type == 'X',
-        isInt = type == 'd' || type == 'i',
-        isFloat = type == 'f',
-        isNumber = !isString;
-
-    var sign = "",
-        padDigits = 0,
-        isZero = false,
-        isNeg = false;
-
-    var str, padChar, padStr;
-    if (isString) {
-      str = String(val);
-    }
-    else if (isHex) {
-      str = val.toString(16);
-      if (type == 'X')
-        str = str.toUpperCase();
-    }
-    else if (isNumber) {
-      // str = formatNumberForDisplay(val, isInt ? 0 : decimals);
-      str = numToStr(val, decimals);
-      if (str[0] == '-') {
-        isNeg = true;
-        str = str.substr(1);
-      }
-      isZero = parseFloat(str) == 0;
-      if (flags.indexOf("'") != -1 || flags.indexOf(',') != -1) {
-        str = addThousandsSep(str);
-      }
-      if (!isZero) { // BUG: sign is added when num rounds to 0
-        if (isNeg) {
-          sign = "\u2212"; // U+2212
-        } else if (flags.indexOf('+') != -1) {
-          sign = '+';
-        }
-      }
-    }
-
-    if (padding) {
-      var strLen = str.length + sign.length;
-      var minWidth = parseInt(padding, 10);
-      if (strLen < minWidth) {
-        padDigits = minWidth - strLen;
-        padChar = flags.indexOf('0') == -1 ? ' ' : '0';
-        padStr = repeatString(padChar, padDigits);
-      }
-    }
-
-    if (padDigits == 0) {
-      str = sign + str;
-    } else if (padChar == '0') {
-      str = sign + padStr + str;
-    } else {
-      str = padStr + sign + str;
-    }
-    return str;
-  }
-
-  // Get a function for interpolating formatted values into a string.
-  function formatter(fmt) {
-    var codeRxp = /%([\',+0]*)([1-9]?)((?:\.[1-9])?)([sdifxX%])/g;
-    var literals = [],
-        formatCodes = [],
-        startIdx = 0,
-        prefix = "",
-        matches = codeRxp.exec(fmt),
-        literal;
-
-    while (matches) {
-      literal = fmt.substring(startIdx, codeRxp.lastIndex - matches[0].length);
-      if (matches[0] == '%%') {
-        prefix += literal + '%';
-      } else {
-        literals.push(prefix + literal);
-        prefix = '';
-        formatCodes.push(matches);
-      }
-      startIdx = codeRxp.lastIndex;
-      matches = codeRxp.exec(fmt);
-    }
-    literals.push(prefix + fmt.substr(startIdx));
-
-    return function() {
-      var str = literals[0],
-          n = arguments.length;
-      if (n != formatCodes.length) {
-        error("[format()] Data does not match format string; format:", fmt, "data:", arguments);
-      }
-      for (var i=0; i<n; i++) {
-        str += formatValue(arguments[i], formatCodes[i]) + literals[i+1];
-      }
-      return str;
-    };
-  }
-
-  function wildcardToRegExp(name) {
-    var rxp = name.split('*').map(function(str) {
-      return regexEscape(str);
-    }).join('.*');
-    return new RegExp('^' + rxp + '$');
-  }
-
-  function createBuffer(arg, arg2) {
-    if (isInteger(arg)) {
-      return Buffer.allocUnsafe ? Buffer.allocUnsafe(arg) : new Buffer(arg);
-    } else {
-      // check allocUnsafe to make sure Buffer.from() will accept strings (it didn't before Node v5.10)
-      return Buffer.from && Buffer.allocUnsafe ? Buffer.from(arg, arg2) : new Buffer(arg, arg2);
-    }
-  }
-
-  function expandoBuffer(constructor, rate) {
-    var capacity = 0,
-        k = rate >= 1 ? rate : 1.2,
-        buf;
-    return function(size) {
-      if (size > capacity) {
-        capacity = Math.ceil(size * k);
-        buf = constructor ? new constructor(capacity) : createBuffer(capacity);
-      }
-      return buf;
-    };
-  }
-
-  function copyElements(src, i, dest, j, n, rev) {
-    if (src === dest && j > i) error ("copy error");
-    var inc = 1,
-        offs = 0;
-    if (rev) {
-      inc = -1;
-      offs = n - 1;
-    }
-    for (var k=0; k<n; k++, offs += inc) {
-      dest[k + j] = src[i + offs];
-    }
-  }
-
-  function extendBuffer(src, newLen, copyLen) {
-    var len = Math.max(src.length, newLen);
-    var n = copyLen || src.length;
-    var dest = new src.constructor(len);
-    copyElements(src, 0, dest, 0, n);
-    return dest;
-  }
-
-  function mergeNames(name1, name2) {
-    var merged;
-    if (name1 && name2) {
-      merged = findStringPrefix(name1, name2).replace(/[-_]$/, '');
-    }
-    return merged || '';
-  }
-
-  function findStringPrefix(a, b) {
-    var i = 0;
-    for (var n=a.length; i<n; i++) {
-      if (a[i] !== b[i]) break;
-    }
-    return a.substr(0, i);
-  }
-
-  function parsePercent(o) {
-    var str = String(o);
-    var isPct = str.indexOf('%') > 0;
-    var pct;
-    if (isPct) {
-      pct = Number(str.replace('%', '')) / 100;
-    } else {
-      pct = Number(str);
-    }
-    if (!(pct >= 0 && pct <= 1)) {
-      stop(format("Invalid percentage: %s", str));
-    }
-    return pct;
-  }
-
-  function formatVersionedName(name, i) {
-    var suffix = String(i);
-    if (/[0-9]$/.test(name)) {
-      suffix = '-' + suffix;
-    }
-    return name + suffix;
-  }
-
-  function uniqifyNames(names, formatter) {
-    var counts = countValues(names),
-        format = formatter || formatVersionedName,
-        names2 = [];
-
-    names.forEach(function(name) {
-      var i = 0,
-          candidate = name,
-          versionedName;
-      while (
-          names2.indexOf(candidate) > -1 || // candidate name has already been used
-          candidate == name && counts[candidate] > 1 || // duplicate unversioned names
-          candidate != name && counts[candidate] > 0) { // versioned name is a preexisting name
-        i++;
-        versionedName = format(name, i);
-        if (!versionedName || versionedName == candidate) {
-          throw new Error("Naming error"); // catch buggy versioning function
-        }
-        candidate = versionedName;
-      }
-      names2.push(candidate);
-    });
-    return names2;
-  }
-
-
-  // Assume: @raw is string, undefined or null
-  function parseString(raw) {
-    return raw ? raw : "";
-  }
-
-  // Assume: @raw is string, undefined or null
-  // Use null instead of NaN for unparsable values
-  // (in part because if NaN is used, empty strings get converted to "NaN"
-  // when re-exported).
-  function parseNumber(raw) {
-    return parseToNum(raw, cleanNumericString);
-  }
-
-  function parseIntlNumber(raw) {
-    return parseToNum(raw, convertIntlNumString);
-  }
-
-  function parseToNum(raw, clean) {
-    var str = String(raw).trim();
-    var parsed = str ? Number(clean(str)) : NaN;
-    return isNaN(parsed) ? null : parsed;
-  }
-
-  // Remove comma separators from strings
-  function cleanNumericString(str) {
-    return (str.indexOf(',') > 0) ? str.replace(/,([0-9]{3})/g, '$1') : str;
-  }
-
-  function convertIntlNumString(str) {
-    str = str.replace(/[ .]([0-9]{3})/g, '$1');
-    return str.replace(',', '.');
-  }
-
-  function trimQuotes(raw) {
-    var len = raw.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);
-      }
-    }
-    return raw;
-  }
-
-  var context = createContext(); // command context (persist for the current command cycle)
-
-  function runningInBrowser() {
-    return typeof window !== 'undefined' && typeof window.document !== 'undefined';
-  }
-
-  function getStateVar(key) {
-    return context[key];
-  }
-
-  function setStateVar(key, val) {
-    context[key] = val;
-  }
-
-  function createContext() {
-    return {
-      DEBUG: false,
-      QUIET: false,
-      VERBOSE: false,
-      defs: {},
-      input_files: []
-    };
-  }
-
-  // Install a new set of context variables, clear them when an async callback is called.
-  // @cb callback function to wrap
-  // returns wrapped callback function
-  function createAsyncContext(cb) {
-    context = createContext();
-    return function() {
-      cb.apply(null, utils.toArray(arguments));
-      // clear context after cb(), so output/errors can be handled in current context
-      context = createContext();
-    };
-  }
-
-  // Save the current context, restore it when an async callback is called
-  // @cb callback function to wrap
-  // returns wrapped callback function
-  function preserveContext(cb) {
-    var ctx = context;
-    return function() {
-      context = ctx;
-      cb.apply(null, utils.toArray(arguments));
-    };
-  }
-
-  var LOGGING = false;
-  var STDOUT = false; // use stdout for status messages
-
-  // These three functions can be reset by GUI using setLoggingFunctions();
-  var _error = function() {
-    var msg = utils.toArray(arguments).join(' ');
-    throw new Error(msg);
-  };
-
-  var _stop = function() {
-    throw new UserError(formatLogArgs(arguments));
-  };
-
-  var _interrupt = function() {
-    throw new NonFatalError(formatLogArgs(arguments));
-  };
-
-  var _message = function() {
-    logArgs(arguments);
-  };
-
-  function enableLogging() {
-    LOGGING = true;
-  }
-
-  function loggingEnabled() {
-    return !!LOGGING;
-  }
-
-  // Handle an unexpected condition (internal error)
-  function error() {
-    _error.apply(null, utils.toArray(arguments));
-  }
-
-  // Handle an error caused by invalid input or misuse of API
-  function stop() {
-    _stop.apply(null, utils.toArray(arguments));
-  }
-
-  function interrupt() {
-    _interrupt.apply(null, utils.toArray(arguments));
-  }
-
-  // Print a status message
-  function message() {
-    _message.apply(null, messageArgs(arguments));
-  }
-
-  // A way for the GUI to replace the CLI logging functions
-  function setLoggingFunctions(message, error, stop) {
-    _message = message;
-    _error = error;
-    _stop = stop;
-  }
-
-
-  // print a message to stdout
-  function print() {
-    STDOUT = true; // tell logArgs() to print to stdout, not stderr
-    message.apply(null, arguments);
-    STDOUT = false;
-  }
-
-  function verbose() {
-    // verbose can be set globally with the -verbose command or separately for each command
-    if (getStateVar('VERBOSE') || getStateVar('verbose')) {
-      message.apply(null, arguments);
-    }
-  }
-
-  function debug() {
-    if (getStateVar('DEBUG') || getStateVar('debug')) {
-      logArgs(arguments);
-    }
-  }
-
-  function printError(err) {
-    var msg;
-    if (!LOGGING) return;
-    if (utils.isString(err)) {
-      err = new UserError(err);
-    }
-    if (err.name == 'NonFatalError') {
-      console.error(messageArgs([err.message]).join(' '));
-    } else if (err.name == 'UserError') {
-      msg = err.message;
-      if (!/Error/.test(msg)) {
-        msg = "Error: " + msg;
-      }
-      console.error(messageArgs([msg]).join(' '));
-      console.error("Run mapshaper -h to view help");
-    } else {
-      // not a user error (i.e. a bug in mapshaper)
-      console.error(err);
-      // throw err;
-    }
-  }
-
-  function UserError(msg) {
-    var err = new Error(msg);
-    err.name = 'UserError';
-    return err;
-  }
-
-  function NonFatalError(msg) {
-    var err = new Error(msg);
-    err.name = 'NonFatalError';
-    return err;
-  }
-
-  function formatColumns(arr, alignments) {
-    var widths = arr.reduce(function(memo, line) {
-      return line.map(function(str, i) {
-        return memo ? Math.max(memo[i], str.length) : str.length;
-      });
-    }, null);
-    return arr.map(function(line) {
-      line = line.map(function(str, i) {
-        var rt = alignments && alignments[i] == 'right';
-        var pad = (rt ? str.padStart : str.padEnd).bind(str);
-        return pad(widths[i], ' ');
-      });
-      return '  ' + line.join(' ');
-    }).join('\n');
-  }
-
-  // Format an array of (preferably short) strings in columns for console logging.
-  function formatStringsAsGrid(arr) {
-    // TODO: variable column width
-    var longest = arr.reduce(function(len, str) {
-          return Math.max(len, str.length);
-        }, 0),
-        colWidth = longest + 2,
-        perLine = Math.floor(80 / colWidth) || 1;
-    return arr.reduce(function(memo, name, i) {
-      var col = i % perLine;
-      if (i > 0 && col === 0) memo += '\n';
-      if (col < perLine - 1) { // right-pad all but rightmost column
-        name = utils.rpad(name, colWidth - 2, ' ');
-      }
-      return memo +  '  ' + name;
-    }, '');
-  }
-
-  // expose so GUI can use it
-  function formatLogArgs(args) {
-    return utils.toArray(args).join(' ');
-  }
-
-  function messageArgs(args) {
-    var arr = utils.toArray(args);
-    var cmd = getStateVar('current_command');
-    if (cmd && cmd != 'help') {
-      arr.unshift('[' + cmd + ']');
-    }
-    return arr;
-  }
-
-  function logArgs(args) {
-    if (!LOGGING || getStateVar('QUIET') || !utils.isArrayLike(args)) return;
-    var msg = formatLogArgs(args);
-    if (STDOUT) console.log(msg);
-    else console.error(msg);
-  }
-
-  // Utility functions for both paths and points
-
-  // @shp An element of the layer.shapes array
-  //   (may be null, or, depending on layer type, an array of points or an array of arrays of arc ids)
-  function cloneShape(shp) {
-    if (!shp) return null;
-    return shp.map(function(part) {
-      return part.concat();
-    });
-  }
-
-  function cloneShapes(arr) {
-    return utils.isArray(arr) ? arr.map(cloneShape) : null;
-  }
-
-  function forEachShapePart(paths, cb) {
-    editShapeParts(paths, cb);
-  }
-
-  // Updates shapes array in-place.
-  // editPart: callback function
-  function editShapes(shapes, editPart) {
-    for (var i=0, n=shapes.length; i<n; i++) {
-      shapes[i] = editShapeParts(shapes[i], editPart);
-    }
-  }
-
-  // @parts: geometry of a feature (array of paths, array of points or null)
-  // @cb: function(part, i, parts)
-  //    If @cb returns an array, it replaces the existing value
-  //    If @cb returns null, the path is removed from the feature
-  //
-  function editShapeParts(parts, cb) {
-    if (!parts) return null; // null geometry not edited
-    if (!utils.isArray(parts)) error("Expected an array, received:", parts);
-    var nulls = 0,
-        n = parts.length,
-        retn;
-
-    for (var i=0; i<n; i++) {
-      retn = cb(parts[i], i, parts);
-      if (retn === null) {
-        nulls++;
-        parts[i] = null;
-      } else if (utils.isArray(retn)) {
-        parts[i] = retn;
-      }
-    }
-    if (nulls == n) {
-      return null;
-    } else if (nulls > 0) {
-      return parts.filter(function(part) {return !!part;});
-    } else {
-      return parts;
-    }
-  }
-
-  // Get max number of parts in a single shape from an array of shapes.
-  // Caveat: polygon holes are counted as separate parts.
-  function findMaxPartCount(shapes) {
-    var maxCount = 0, shp;
-    for (var i=0, n=shapes.length; i<n; i++) {
-      shp = shapes[i];
-      if (shp && shp.length > maxCount) {
-        maxCount = shp.length;
+    function getWarnings(lyr, dataset) {
+      var file = internal.getLayerSourceFile(lyr, dataset);
+      var missing = [];
+      var msg;
+      if (utils.endsWith(file, '.shp') && lyr == dataset.layers[0]) {
+        if (!lyr.data) {
+          missing.push('.dbf');
+        }
+        if (!dataset.info.prj && !dataset.info.crs) {
+          missing.push('.prj');
+        }
       }
+      if (missing.length) {
+        msg = 'missing ' + missing.join(' and ') + ' data';
+      }
+      return msg;
     }
-    return maxCount;
-  }
-
-  // List of encodings supported by iconv-lite:
-  // https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings
-
-  var iconv = require('iconv-lite');
-  var toUtf8 = getNativeEncoder('utf8');
-  var fromUtf8 = getNativeDecoder('utf8');
-
-  // Return list of supported encodings
-  function getEncodings() {
-    iconv.encodingExists('ascii'); // make iconv load its encodings
-    return Object.keys(iconv.encodings);
-  }
 
-  function validateEncoding(enc) {
-    if (!encodingIsSupported(enc)) {
-      stop("Unknown encoding:", enc, "\nRun the -encodings command see a list of supported encodings");
+    function describeSrc(lyr, dataset) {
+      return internal.getLayerSourceFile(lyr, dataset);
     }
-    return enc;
-  }
 
-  function stringsAreAscii(arr) {
-    return stringIsAscii(arr.join(''));
-  }
 
-  function stringIsAscii(str) {
-    var c;
-    for (var i=0, n=str.length; i<n; i++) {
-      c = str.charCodeAt(i);
-      if (c >= 128) return false;
+    function isPinnable(lyr) {
+      return internal.layerHasGeometry(lyr) || internal.layerHasFurniture(lyr);
     }
-    return true;
-  }
-
-  function encodingIsUtf8(enc) {
-    // treating utf-8 as default
-    return !enc || /^utf-?8$/i.test(String(enc));
-  }
-
-  // Identify the most common encodings that are supersets of ascii at the
-  // single-byte level (meaning that bytes in 0 - 0x7f range must be ascii)
-  // (this allows identifying line breaks and other ascii patterns in buffers)
-  function encodingIsAsciiCompat(enc) {
-    enc = standardizeEncodingName(enc);
-    // gb.* selects the Guo Biao encodings
-    // big5 in not compatible -- second byte starts at 0x40
-    return !enc || /^(win|latin|utf8|ascii|iso88|gb)/.test(enc);
-  }
 
-  // Ex. convert UTF-8 to utf8
-  function standardizeEncodingName(enc) {
-    return (enc || '').toLowerCase().replace(/[_-]/g, '');
-  }
 
-  // Similar to Buffer#toString(); tries to speed up utf8 conversion in
-  // web browser (when using browserify Buffer shim)
-  function bufferToString(buf, enc, start, end) {
-    if (start >= 0) {
-      buf = buf.slice(start, end);
-    }
-    return decodeString(buf, enc);
-  }
 
-  function getNativeEncoder(enc) {
-    var encoder = null;
-    enc = standardizeEncodingName(enc);
-    if (enc != 'utf8') {
-      // TODO: support more encodings if TextEncoder is available
-      return null;
-    }
-    if (typeof TextEncoder != 'undefined') {
-      encoder = new TextEncoder(enc);
+    function rowHTML(c1, c2, cname) {
+      return utils.format('<div class="row%s"><div class="col1">%s</div>' +
+        '<div class="col2">%s</div></div>', cname ? ' ' + cname : '', c1, c2);
     }
-    return function(str) {
-      // Convert Uint8Array from encoder to Buffer (fix for issue #216)
-      return encoder ? Buffer.from(encoder.encode(str).buffer) : utils.createBuffer(str, enc);
-    };
   }
 
-  function encodeString(str, enc) {
-    // TODO: faster ascii encoding?
-    var buf;
-    if (encodingIsUtf8(enc)) {
-      buf = toUtf8(str);
-    } else {
-      buf = iconv.encode(str, enc);
-    }
-    return buf;
-  }
+  function SessionHistory(gui) {
+    var commands = [];
+    // commands that can be ignored when checking for unsaved changes
+    var nonEditingCommands = 'i,target,info,version,verbose,projections,inspect,help,h,encodings,calc'.split(',');
 
-  function getNativeDecoder(enc) {
-    var decoder = null;
-    enc = standardizeEncodingName(enc);
-    if (enc != 'utf8') {
-      // TODO: support more encodings if TextDecoder is available
-      return null;
-    }
-    if (typeof TextDecoder != 'undefined') {
-      decoder = new TextDecoder(enc);
-    }
-    return function(buf) {
-      return decoder ? decoder.decode(buf) : buf.toString(enc);
+    this.unsavedChanges = function() {
+      var cmd, cmdName;
+      for (var i=commands.length - 1; i >= 0; i--) {
+        cmdName = getCommandName(commands[i]);
+        if (cmdName == 'o') break;
+        if (nonEditingCommands.includes(cmdName)) continue;
+        return true;
+      }
+      return false;
     };
-  }
 
-  // @buf a Node Buffer
-  function decodeString(buf, enc) {
-    var str;
-    if (encodingIsUtf8(enc)) {
-      str = fromUtf8(buf);
-    } else {
-      str = iconv.decode(buf, enc);
-    }
-    return str;
-  }
+    this.fileImported = function(file, optStr) {
+      var cmd = '-i ' + file;
+      if (optStr) {
+        cmd += ' ' + optStr;
+      }
+      commands.push(cmd);
+    };
 
-  function encodingIsSupported(raw) {
-    var enc = standardizeEncodingName(raw);
-    return getEncodings().includes(enc);
-  }
+    this.layerRenamed = function(lyr, name) {
+      var currTarget = getCurrentTarget();
+      var layerTarget = getTargetFromLayer(lyr);
+      if (currTarget == layerTarget) {
+        commands.push('-rename-layers ' + name);
+      } else {
+        commands.push('-rename-layers ' + name + ' target=' + layerTarget);
+        commands.push('-target ' + currTarget);
+      }
+    };
 
-  function trimBOM(str) {
-    // remove BOM if present
-    if (str.charCodeAt(0) == 0xfeff) {
-      str = str.substr(1);
-    }
-    return str;
-  }
+    this.consoleCommands = function(str) {
+      commands.push(str); // todo: split commands?
+    };
 
-  function printEncodings() {
-    var encodings = getEncodings().filter(function(name) {
-      // filter out some aliases and non-applicable encodings
-      return !/^(_|cs|internal|ibm|isoir|singlebyte|table|[0-9]|l[0-9]|windows)/.test(name);
-    });
-    encodings.sort();
-    print("Supported encodings:\n" + formatStringsAsGrid(encodings));
-  }
+    this.simplificationApplied = function(optStr) {
+      commands.push('-simplify ' + optStr);
+    };
 
-  // Not a general-purpose deep copy function
-  function copyRecord(o) {
-    var o2 = {}, key, val;
-    if (!o) return null;
-    for (key in o) {
-      if (o.hasOwnProperty(key)) {
-        val = o[key];
-        if (val == o) {
-          // avoid infinite recursion if val is a circular reference, by copying all properties except key
-          val = utils.extend({}, val);
-          delete val[key];
-        }
-        o2[key] = val && val.constructor === Object ? copyRecord(val) : val;
+    this.simplificationRepair = function() {
+      //  TODO: improve this... repair does not necessarily apply to most recent
+      //  simplification command
+      //  consider adding a (hidden) repair command to handle this event
+      var i = indexOfLastCommand('-simplify');
+      if (i > -1) {
+        commands[i] = commands[i].replace(' no-repair', '');
       }
-    }
-    return o2;
-  }
+    };
 
-  function getValueType(val) {
-    var type = null;
-    if (utils.isString(val)) {
-      type = 'string';
-    } else if (utils.isNumber(val)) {
-      type = 'number';
-    } else if (utils.isBoolean(val)) {
-      type = 'boolean';
-    } else if (utils.isDate(val)) {
-      type = 'date';
-    } else if (utils.isObject(val)) {
-      type = 'object';
-    }
-    return type;
-  }
+    this.updateSimplificationPct = function(pct) {
+      var i = indexOfLastCommand('-simplify');
+      if (i > -1) {
+        commands[i] = commands[i].replace(/percentage=[^ ]+/, 'percentage=' + pct);
+      }
+    };
 
-  // Fill out a data table with undefined values
-  // The undefined members will disappear when records are exported as JSON,
-  // but will show up when fields are listed using Object.keys()
-  function fixInconsistentFields(records) {
-    var fields = findIncompleteFields(records);
-    patchMissingFields(records, fields);
-  }
+    this.dataValueUpdated = function(id, field, value) {
+      var cmd = `-each 'd[${JSON.stringify(field)}] = ${JSON.stringify(value)}' where='this.id == ${id}'`;
+      commands.push(cmd);
+    };
 
-  function findIncompleteFields(records) {
-    var counts = {},
-        i, j, keys;
-    for (i=0; i<records.length; i++) {
-      keys = Object.keys(records[i] || {});
-      for (j=0; j<keys.length; j++) {
-        counts[keys[j]] = (counts[keys[j]] | 0) + 1;
+    this.layersExported = function(ids, optStr) {
+      var layers = gui.model.getLayers();
+      var cmd = '-o';
+      if (layers.length > 1) {
+        cmd += ' target=' + ids.map(getTargetFromId).join(',');
       }
-    }
-    return Object.keys(counts).filter(function(k) {return counts[k] < records.length;});
-  }
+      if (optStr) {
+        cmd += ' ' + optStr;
+      }
+      commands.push(cmd);
+    };
 
-  function patchMissingFields(records, fields) {
-    var rec, i, j, f;
-    for (i=0; i<records.length; i++) {
-      rec = records[i] || (records[i] = {});
-      for (j=0; j<fields.length; j++) {
-        f = fields[j];
-        if (f in rec === false) {
-          rec[f] = undefined;
+    this.setTargetLayer = function(lyr) {
+      var layers = gui.model.getLayers();
+      if (layers.length > 1) {
+        if (indexOfLastCommand('-target') == commands.length - 1) {
+          commands.pop(); // if last commands was -target, remove it
         }
+        commands.push('-target ' + getTargetFromLayer(lyr));
       }
-    }
-  }
+    };
 
-  function fieldListContainsAll(list, fields) {
-    return list.indexOf('*') > -1 || utils.difference(fields, list).length === 0;
-  }
+    this.toCommandLineString = function() {
+      var str = commands.join(' \\\n  ');
+      return 'mapshaper ' + str;
+    };
 
-  function getColumnType(key, records) {
-    var type = null,
-        rec;
-    for (var i=0, n=records.length; i<n; i++) {
-      rec = records[i];
-      type = rec ? getValueType(rec[key]) : null;
-      if (type) break;
+    function getCommandName(cmd) {
+      var rxp = /^-([a-z0-9-]+)/;
+      var match = rxp.exec(cmd);
+      return match ? match[1] : null;
     }
-    return type;
-  }
-
-  function deleteFields(table, test) {
-    table.getFields().forEach(function(name) {
-      if (test(name)) {
-        table.deleteField(name);
-      }
-    });
-  }
-
-  function isInvalidFieldName(f) {
-    // Reject empty and all-whitespace strings. TODO: consider other criteria
-    return /^\s*$/.test(f);
-  }
-
-  // Resolve name conflicts in field names by appending numbers
-  // @fields Array of field names
-  // @maxLen (optional) Maximum chars in name
-  //
-  function getUniqFieldNames(fields, maxLen, encoding) {
-    var used = {};
-    return fields.map(function(name) {
-      var i = 0,
-          validName;
-      do {
-        validName = encoding && encoding != 'ascii' ?
-          adjustEncodedFieldName(name, maxLen, i, encoding) :
-          adjustFieldName(name, maxLen, i);
-        i++;
-      } while ((validName in used) ||
-        // don't replace an existing valid field name with a truncated name
-        name != validName && utils.contains(fields, validName));
-      used[validName] = true;
-      return validName;
-    });
-  }
-
-  function getFieldValues(records, field) {
-    return records.map(function(rec) {
-      return rec ? rec[field] : undefined;
-    });
-  }
-
-  function getUniqFieldValues(records, field) {
-    var index = {};
-    var values = [];
-    records.forEach(function(rec) {
-      var val = rec[field];
-      if (val in index === false) {
-        index[val] = true;
-        values.push(val);
-      }
-    });
-    return values;
-  }
 
-  // Truncate and/or uniqify a name (if relevant params are present)
-  function adjustFieldName(name, maxLen, i) {
-    var name2, suff;
-    maxLen = maxLen || 256;
-    if (!i) {
-      name2 = name.substr(0, maxLen);
-    } else {
-      suff = String(i);
-      if (suff.length == 1) {
-        suff = '_' + suff;
-      }
-      name2 = name.substr(0, maxLen - suff.length) + suff;
+    function getCurrentTarget() {
+      return getTargetFromLayer(gui.model.getActiveLayer().layer);
     }
-    return name2;
-  }
 
-  // Truncate and/or uniqify a name (if relevant params are present)
-  function adjustEncodedFieldName(name, maxLen, i, encoding) {
-    var suff = i ? String(i) : '';
-    var name2 = name + suff;
-    var buf = encodeString(name2, encoding);
-    if (buf.length > (maxLen || 256)) {
-      name = name.substr(0, name.length - 1);
-      return adjustEncodedFieldName(name, maxLen, i, encoding);
+    function indexOfLastCommand(cmd) {
+      return commands.reduce(function(memo, str, i) {
+        return str.indexOf(cmd) === 0 ? i : memo;
+      }, -1);
     }
-    return name2;
-  }
 
-  function applyFieldOrder(arr, option) {
-    if (option == 'ascending') {
-      arr.sort(function(a, b) {
-        return a.toLowerCase() < b.toLowerCase() ? -1 : 1;
-      });
+    function getTargetFromId(id) {
+      var layers = gui.model.getLayers();
+      return getTargetFromLayer(layers[id - 1].layer);
     }
-    return arr;
-  }
 
-  function getFirstNonEmptyRecord(records) {
-    for (var i=0, n=records ? records.length : 0; i<n; i++) {
-      if (records[i]) return records[i];
+    function getTargetFromLayer(lyr) {
+      var id = internal.getLayerTargetId(gui.model, lyr);
+      return internal.formatOptionValue(id);
     }
-    return null;
   }
 
-  function findFieldNames(records, order) {
-    var first = getFirstNonEmptyRecord(records);
-    var names = first ? Object.keys(first) : [];
-    return applyFieldOrder(names, order);
-  }
+  // import { cloneShape } from '../paths/mapshaper-shape-utils';
+  // import { copyRecord } from '../datatable/mapshaper-data-utils';
+  var snapVerticesToPoint$1 = internal.snapVerticesToPoint;
+  var cloneShape = internal.cloneShape;
+  var copyRecord = internal.copyRecord;
 
   function Undo(gui) {
     var history, offset, stashedUndo;
@@ -5311,9 +3563,6 @@
       offset = 0;
     }
 
-    function refreshMap() {
-      gui.dispatchEvent('undo_redo');
-    }
 
     function isUndoEvt(e) {
       return (e.ctrlKey || e.metaKey) && !e.shiftKey && e.key == 'z';
@@ -5361,6 +3610,28 @@
       this.addHistoryState(stashedUndo, redo);
     }, this);
 
+    // undo/redo data editing
+    // TODO: consider setting selected feature to the undo/redo target feature
+    //
+    gui.on('data_preupdate', function(e) {
+      stashedUndo = this.makeDataSetter(e.FID);
+    }, this);
+
+    gui.on('data_postupdate', function(e) {
+      var redo = this.makeDataSetter(e.FID);
+      this.addHistoryState(stashedUndo, redo);
+    }, this);
+
+    // undo/redo vertex dragging
+    gui.on('vertex_dragstart', function(e) {
+      stashedUndo = this.makeVertexSetter(e.FID, e.vertex_ids);
+    }, this);
+
+    gui.on('vertex_dragend', function(e) {
+      var redo = this.makeVertexSetter(e.FID, e.vertex_ids);
+      this.addHistoryState(stashedUndo, redo);
+    }, this);
+
     this.clear = function() {
       reset();
     };
@@ -5373,7 +3644,6 @@
       };
     };
 
-
     this.makeDataSetter = function(id) {
       var target = gui.model.getActiveLayer();
       var rec = copyRecord(target.layer.data.getRecordAt(id));
@@ -5383,6 +3653,14 @@
       };
     };
 
+    this.makeVertexSetter = function(fid, ids) {
+      var target = gui.model.getActiveLayer();
+      var arcs = target.dataset.arcs;
+      var p = internal.getVertexCoords(ids[0], arcs);
+      return function() {
+        snapVerticesToPoint$1(ids, p, arcs, true);
+      };
+    };
 
     this.addHistoryState = function(undo, redo) {
       if (offset > 0) {
@@ -5397,7 +3675,7 @@
       if (item) {
         offset++;
         item.undo();
-        refreshMap();
+        gui.dispatchEvent('map-needs-refresh');
       }
     };
 
@@ -5406,7 +3684,7 @@
       offset--;
       var item = getHistoryItem();
       item.redo();
-      refreshMap();
+      gui.dispatchEvent('map-needs-refresh');
     };
 
     function getHistoryItem() {
@@ -5513,7 +3791,7 @@
     };
   }
 
-  utils$1.inherit(ModeSwitcher, EventDispatcher);
+  utils.inherit(ModeSwitcher, EventDispatcher);
 
   function KeyboardEvents(gui) {
     var self = this;
@@ -5541,12 +3819,13 @@
     };
   }
 
-  utils$1.inherit(KeyboardEvents, EventDispatcher);
+  utils.inherit(KeyboardEvents, EventDispatcher);
 
   function InteractionMode(gui) {
 
     var menus = {
       standard: ['info', 'selection', 'data', 'box'],
+      polygons: ['info', 'selection', 'data', 'box', 'vertices'],
       lines: ['info', 'selection', 'data', 'box', 'vertices'],
       table: ['info', 'selection', 'data'],
       labels: ['info', 'selection', 'data', 'box', 'labels', 'location'],
@@ -5658,6 +3937,9 @@
       if (internal.layerHasPaths(o.layer) && o.layer.geometry_type == 'polyline') {
         return menus.lines;
       }
+      if (internal.layerHasPaths(o.layer) && o.layer.geometry_type == 'polygon') {
+        return menus.polygons;
+      }
       return menus.standard;
     }
 
@@ -5730,7 +4012,9 @@
     }
 
     function onModeChange() {
-      gui.dispatchEvent('interaction_mode_change', {mode: getInteractionMode()});
+      var mode = getInteractionMode();
+      gui.state.interaction_mode = mode;
+      gui.dispatchEvent('interaction_mode_change', {mode: mode});
     }
 
     // Update button highlight and selected menu item highlight (if any)
@@ -5757,7 +4041,7 @@
   function Model(gui) {
     var self = new internal.Catalog();
     var deleteLayer = self.deleteLayer;
-    utils$1.extend(self, EventDispatcher.prototype);
+    utils.extend(self, EventDispatcher.prototype);
 
     // override Catalog method (so -drop command will work in web console)
     self.deleteLayer = function(lyr, dataset) {
@@ -5791,7 +4075,7 @@
       if (flags.select) {
         self.dispatchEvent('select', active);
       }
-      self.dispatchEvent('update', utils$1.extend({flags: flags}, active));
+      self.dispatchEvent('update', utils.extend({flags: flags}, active));
     };
 
     self.selectLayer = function(lyr, dataset) {
@@ -5826,7 +4110,7 @@
     } else if (geoType == 'polygon') {
       test = polygonTest;
     } else {
-      error$1("Unexpected geometry type:", geoType);
+      error("Unexpected geometry type:", geoType);
     }
     return test;
 
@@ -5893,7 +4177,7 @@
       for (var i=0; i<cands.length; i++) {
         cands[i].dist = geom.getPointToShapeDistance(x, y, cands[i].shape, arcs);
       }
-      utils$1.sortOn(cands, 'dist');
+      utils.sortOn(cands, 'dist');
     }
 
     function pointTest(x, y) {
@@ -5919,7 +4203,7 @@
         }
       });
       // console.log(hitThreshold, bullseye);
-      return utils$1.uniq(hits); // multipoint features can register multiple hits
+      return utils.uniq(hits); // multipoint features can register multiple hits
     }
 
     function getRadiusFunction(style) {
@@ -6126,9 +4410,9 @@
       };
       var svgData = svgTest(e); // null or a data object
       if (svgData) { // mouse is over an SVG symbol
-        utils$1.extend(data, svgData);
+        utils.extend(data, svgData);
         // placing symbol id in front of any other hits
-        data.ids = utils$1.uniq([svgData.targetId].concat(data.ids));
+        data.ids = utils.uniq([svgData.targetId].concat(data.ids));
       }
       data.id = data.ids.length > 0 ? data.ids[0] : -1;
       return data;
@@ -6161,7 +4445,7 @@
       }
 
       // ignore keypress if no feature is selected or user is editing text
-      if (pinnedId() == -1 || GUI.getInputElement()) return;
+      if (pinnedId() == -1 || GUI.textIsSelected()) return;
 
       if (e.keyCode == 37 || e.keyCode == 39) {
         // L/R arrow keys
@@ -6229,8 +4513,8 @@
 
     self.addSelectionIds = function(ids) {
       turnOn('selection');
-      selectionIds = utils$1.uniq(selectionIds.concat(ids));
-      ids = utils$1.uniq(storedData.ids.concat(ids));
+      selectionIds = utils.uniq(selectionIds.concat(ids));
+      ids = utils.uniq(storedData.ids.concat(ids));
       updateSelectionState({ids: ids});
     };
 
@@ -6319,6 +4603,7 @@
 
     // Hits are re-detected on 'hover' (if hit detection is active)
     mouse.on('hover', function(e) {
+      handlePointerEvent(e);
       if (storedData.pinned || !hitTest || !active) return;
       if (e.hover && isOverMap(e)) {
         // mouse is hovering directly over map area -- update hit detection
@@ -6388,7 +4673,7 @@
 
     function toggleId(id, ids) {
       if (ids.indexOf(id) > -1) {
-        return utils$1.difference(ids, [id]);
+        return utils.difference(ids, [id]);
       }
       return [id].concat(ids);
     }
@@ -6440,9 +4725,9 @@
     // d: event data (may be a pointer event object, an ordinary object or null)
     function triggerHitEvent(type, d) {
       // Merge stored hit data into the event data
-      var eventData = utils$1.extend({mode: interactionMode}, d || {}, storedData);
+      var eventData = utils.extend({mode: interactionMode}, d || {}, storedData);
       if (transientIds.length) {
-        eventData.ids = utils$1.uniq(transientIds.concat(eventData.ids || []));
+        eventData.ids = utils.uniq(transientIds.concat(eventData.ids || []));
       }
       self.dispatchEvent(type, eventData);
     }
@@ -6576,7 +4861,7 @@
     }
   }
 
-  utils$1.inherit(Timer, EventDispatcher);
+  utils.inherit(Timer, EventDispatcher);
 
   function Tween(ease) {
     var self = this,
@@ -6598,7 +4883,7 @@
     }
   }
 
-  utils$1.inherit(Tween, EventDispatcher);
+  utils.inherit(Tween, EventDispatcher);
 
   Tween.sineInOut = function(n) {
     return 0.5 - Math.cos(n * Math.PI) / 2;
@@ -6666,7 +4951,7 @@
     update();
   }
 
-  utils$1.inherit(ElementPosition, EventDispatcher);
+  utils.inherit(ElementPosition, EventDispatcher);
 
   function MouseWheelDirection() {
     var prevTime = 0;
@@ -6764,13 +5049,13 @@
           // Decelerate towards the end of the sustain interval (for smoother zooming)
           multiplier *= Tween.quadraticOut(1 - fadeFactor);
         }
-        obj = utils$1.extend({direction: wheelDirection, multiplier: multiplier}, mouse.mouseData());
+        obj = utils.extend({direction: wheelDirection, multiplier: multiplier}, mouse.mouseData());
         self.dispatchEvent('mousewheel', obj);
       }
     }
   }
 
-  utils$1.inherit(MouseWheel, EventDispatcher);
+  utils.inherit(MouseWheel, EventDispatcher);
 
 
   function MouseArea(element, pos) {
@@ -6824,7 +5109,7 @@
     };
 
     this.mouseData = function() {
-      return utils$1.extend({}, _prevEvt);
+      return utils.extend({}, _prevEvt);
     };
 
     function onAreaDown(e) {
@@ -6883,7 +5168,7 @@
           dragX: evt.pageX - _downEvt.pageX,
           dragY: evt.pageY - _downEvt.pageY
         };
-        _self.dispatchEvent('drag', utils$1.extend(obj, evt));
+        _self.dispatchEvent('drag', utils.extend(obj, evt));
       } else {
         _self.dispatchEvent('hover', evt);
       }
@@ -6915,7 +5200,7 @@
     }
   }
 
-  utils$1.inherit(MouseArea, EventDispatcher);
+  utils.inherit(MouseArea, EventDispatcher);
 
   function initVariableClick(node, cb) {
     var downEvent = null;
@@ -7062,7 +5347,7 @@
           maxScale = 4,
           minTime = 100,
           maxTime = 800,
-          time = utils$1.clamp(clickTime || 200, minTime, maxTime),
+          time = utils.clamp(clickTime || 200, minTime, maxTime),
           k = (time - minTime) / (maxTime - minTime),
           scale = minScale + k * (maxScale - minScale);
       return 1 + scale * zoomScaleMultiplier;
@@ -7289,7 +5574,7 @@
           rows = 0;
       // self.hide(); // clean up if panel is already open
       el.empty(); // clean up if panel is already open
-      utils$1.forEachProperty(rec, function(v, k) {
+      utils.forEachProperty(rec, function(v, k) {
         var type;
         // missing GeoJSON fields are set to undefined on import; skip these
         if (v !== undefined) {
@@ -7317,7 +5602,7 @@
         // Some individual features can have undefined values for some or all of
         // their data properties (properties are set to undefined when an input JSON file
         // has inconsistent fields, or after force-merging layers with inconsistent fields).
-        el.html(utils$1.format('<div class="note">This %s is missing attribute data.</div>',
+        el.html(utils.format('<div class="note">This %s is missing attribute data.</div>',
             table && table.getFields().length > 0 ? 'feature': 'layer'));
       }
     }
@@ -7328,7 +5613,7 @@
       var str = formatInspectorValue(val, type);
       var cell = El('tr')
           .appendTo(table)
-          .html(utils$1.format(rowHtml, key, utils$1.htmlEscape(str)))
+          .html(utils.format(rowHtml, key, utils.htmlEscape(str)))
           .findChild('.value');
       setFieldClass(cell, val, type);
       if (editable) {
@@ -7337,7 +5622,7 @@
     }
 
     function setFieldClass(el, val, type) {
-      var isNum = type ? type == 'number' : utils$1.isNumber(val);
+      var isNum = type ? type == 'number' : utils.isNumber(val);
       var isNully = val === undefined || val === null || val !== val;
       var isEmpty = val === '';
       el.classed('num-field', isNum);
@@ -7363,7 +5648,9 @@
         } else {
           // field content has changed
           strval = strval2;
+          gui.dispatchEvent('data_preupdate', {FID: currId}); // for undo/redo
           rec[key] = val2;
+          gui.dispatchEvent('data_postupdate', {FID: currId});
           input.value(strval);
           setFieldClass(el, val2, type);
           self.dispatchEvent('update', {field: key, value: val2, id: currId});
@@ -7375,7 +5662,7 @@
   function formatInspectorValue(val, type) {
     var str;
     if (type == 'date') {
-      str = utils$1.formatDateISO(val);
+      str = utils.formatDateISO(val);
     } else if (type == 'object') {
       str = val ? JSON.stringify(val) : "";
     } else {
@@ -7574,11 +5861,13 @@
   // handle either numeric strings or numbers in fields
   function applyDelta(rec, key, delta) {
     var currVal = rec[key];
-    var isString = utils$1.isString(currVal);
+    var isString = utils.isString(currVal);
     var newVal = (+currVal + delta) || 0;
     rec[key] = isString ? String(newVal) : newVal;
   }
 
+  var snapVerticesToPoint = internal.snapVerticesToPoint;
+
   function getDisplayCoordsById(id, layer, ext) {
     var coords = getPointCoordsById(id, layer);
     return ext.translateCoords(coords[0], coords[1]);
@@ -7599,7 +5888,7 @@
   }
 
 
-  function SymbolDragging2(gui, ext, hit) {
+  function InteractiveEditor(gui, ext, hit) {
     // var targetTextNode; // text node currently being dragged
     var dragging = false;
     var activeRecord;
@@ -7681,6 +5970,7 @@
           triggerGlobalEvent('symbol_dragstart', e);
           startDragging();
         } else if (vertexEditingEnabled()) {
+          onVertexDragStart(e);
           triggerGlobalEvent('vertex_dragstart', e);
           startDragging();
         }
@@ -7704,7 +5994,8 @@
           triggerGlobalEvent('label_dragend', e);
           stopDragging();
         } else if (vertexEditingEnabled()) {
-          onVertexDragEnd(e);
+          // kludge to get dataset to recalculate internal bounding boxes
+          hit.getHitTarget().arcs.transformPoints(function() {});
           triggerGlobalEvent('vertex_dragend', e);
           stopDragging();
         }
@@ -7712,42 +6003,62 @@
 
       hit.on('click', function(e) {
         if (labelEditingEnabled()) {
+          var target = hit.getHitTarget();
           onLabelClick(e);
         }
       });
 
+      // TODO: highlight hit vertex in path edit mode
+      if (false) hit.on('hover', function(e) {
+        if (vertexEditingEnabled() && !dragging) {
+          onVertexHover(e);
+        }
+      }, null, 100);
+
+      function onVertexHover(e) {
+        // hovering in vertex edit mode: find vertex insertion point
+        var target = hit.getHitTarget();
+        var shp = target.layer.shapes[e.id];
+        var p = ext.translatePixelCoords(e.x, e.y);
+        var o = internal.findInsertionPoint(p, shp, target.arcs, ext.getPixelSize());
+      }
+
+
+      function getVertexEventData(e) {
+        return {
+          FID: activeId,
+          vertexIds: activeVertexIds
+        };
+      }
 
       function onLocationDrag(e) {
         var lyr = hit.getHitTarget().layer;
-        var p = getPointCoordsById(e.id, hit.getHitTarget().layer);
+        var p = getPointCoordsById(e.id, lyr);
         if (!p) return;
         var diff = translateDeltaDisplayCoords(e.dx, e.dy, ext);
         p[0] += diff[0];
         p[1] += diff[1];
-        self.dispatchEvent('location_change'); // signal map to redraw
+        triggerRedraw();
         triggerGlobalEvent('symbol_drag', e);
       }
 
-      function onVertexDrag(e) {
+      function onVertexDragStart(e) {
         var target = hit.getHitTarget();
+        var shp = target.layer.shapes[e.id];
         var p = ext.translatePixelCoords(e.x, e.y);
-        if (!activeVertexIds) {
-          activeVertexIds = internal.findNearestVertices(p, target.layer.shapes[e.id], target.arcs);
-        }
+        activeVertexIds = internal.findNearestVertices(p, shp, target.arcs);
+        activeId = e.id;
+      }
+
+      function onVertexDrag(e) {
+        var target = hit.getHitTarget();
         if (!activeVertexIds) return; // ignore error condition
+        var p = ext.translatePixelCoords(e.x, e.y);
         if (gui.keyboard.shiftIsPressed()) {
           internal.snapPointToArcEndpoint(p, activeVertexIds, target.arcs);
         }
-        activeVertexIds.forEach(function(idx) {
-          internal.setVertexCoords(p[0], p[1], idx, target.arcs);
-        });
-        self.dispatchEvent('location_change'); // signal map to redraw
-      }
-
-      function onVertexDragEnd(e) {
-        // kludge to get dataset to recalculate internal bounding boxes
-        hit.getHitTarget().arcs.transformPoints(function() {});
-        activeVertexIds = null;
+        snapVerticesToPoint(activeVertexIds, p, target.arcs);
+        triggerRedraw();
       }
 
       function onLabelClick(e) {
@@ -7760,11 +6071,19 @@
         }
       }
 
+      function triggerRedraw() {
+        gui.dispatchEvent('map-needs-refresh');
+      }
+
       function triggerGlobalEvent(type, e) {
-        if (e.id >= 0) {
-          // fire event to signal external editor that symbol coords have changed
-          gui.dispatchEvent(type, {FID: e.id, layer_name: hit.getHitTarget().layer.name});
-        }
+        if (e.id >= 0 === false) return;
+        var o = {
+          FID: e.id,
+          layer_name: hit.getHitTarget().layer.name,
+          vertex_ids: activeVertexIds
+        };
+        // fire event to signal external editor that symbol coords have changed
+        gui.dispatchEvent(type, o);
       }
 
       function getLabelRecordById(id) {
@@ -7798,7 +6117,7 @@
         var textNode;
         if (!dragging) return;
         if (e.id != activeId) {
-          error$1("Mismatched hit ids:", e.id, activeId);
+          error("Mismatched hit ids:", e.id, activeId);
         }
         applyDelta(activeRecord, 'dx', e.dx / scale);
         applyDelta(activeRecord, 'dy', e.dy / scale);
@@ -7839,80 +6158,6 @@
         }
         return el.tagName == 'text' ? el : null;
       }
-
-      // svg.addEventListener('mousedown', function(e) {
-      //   var textTarget = getTextTarget(e);
-      //   downEvt = e;
-      //   if (!textTarget) {
-      //     stopEditing();
-      //   } else if (!editing) {
-      //     // nop
-      //   } else if (textTarget == targetTextNode) {
-      //     startDragging();
-      //   } else {
-      //     startDragging();
-      //     editTextNode(textTarget);
-      //   }
-      // });
-
-      // up event on svg
-      // a: currently dragging text
-      //   -> stop dragging
-      // b: clicked on a text feature
-      //   -> start editing it
-
-
-      // svg.addEventListener('mouseup', function(e) {
-      //   var textTarget = getTextTarget(e);
-      //   var isClick = isClickEvent(e, downEvt);
-      //   if (isClick && textTarget && textTarget == targetTextNode &&
-      //       activeRecord && isMultilineLabel(targetTextNode)) {
-      //     toggleTextAlign(targetTextNode, activeRecord);
-      //     updateSymbol();
-      //   }
-      //   if (dragging) {
-      //     stopDragging();
-      //    } else if (isClick && textTarget) {
-      //     editTextNode(textTarget);
-      //   }
-      // });
-
-      // block dbl-click navigation when editing
-      // mouse.on('dblclick', function(e) {
-      //   if (editing) e.stopPropagation();
-      // }, null, eventPriority);
-
-      // mouse.on('dragstart', function(e) {
-      //   onLabelDrag(e);
-      // }, null, eventPriority);
-
-      // mouse.on('drag', function(e) {
-      //   var scale = ext.getSymbolScale() || 1;
-      //   onLabelDrag(e);
-      //   if (!dragging || !activeRecord) return;
-      //   applyDelta(activeRecord, 'dx', e.dx / scale);
-      //   applyDelta(activeRecord, 'dy', e.dy / scale);
-      //   if (!isMultilineLabel(targetTextNode)) {
-      //     // update anchor position of single-line labels based on label position
-      //     // relative to anchor point, for better placement when eventual display font is
-      //     // different from mapshaper's font.
-      //     updateTextAnchor(targetTextNode, activeRecord);
-      //   }
-      //   // updateSymbol(targetTextNode, activeRecord);
-      //   targetTextNode = updateSymbol2(targetTextNode, activeRecord, activeId);
-      // }, null, eventPriority);
-
-      // mouse.on('dragend', function(e) {
-      //   onLabelDrag(e);
-      //   stopDragging();
-      // }, null, eventPriority);
-
-
-      // function onLabelDrag(e) {
-      //   if (dragging) {
-      //     e.stopPropagation();
-      //   }
-      // }
     }
 
     function startDragging() {
@@ -7923,8 +6168,7 @@
       dragging = false;
       activeId = -1;
       activeRecord = null;
-      // targetTextNode = null;
-      // svg.removeAttribute('class');
+      activeVertexIds = null;
     }
 
     function isClickEvent(up, down) {
@@ -7978,7 +6222,7 @@
           dotSize: 2.5
         }, polyline: {
           strokeColor: black,
-          strokeWidth: 2.5
+          strokeWidth: 2.5,
         }
       },
       unselectedHoverStyles = {
@@ -8040,7 +6284,7 @@
   }
 
   function getDefaultStyle(lyr, baseStyle) {
-    var style = utils$1.extend({}, baseStyle);
+    var style = utils.extend({}, baseStyle);
     // reduce the dot size of large point layers
     if (lyr.geometry_type == 'point' && style.dotSize > 0) {
       style.dotSize *= getDotScale$1(lyr);
@@ -8106,7 +6350,7 @@
     var topId = o.id; // pinned id (if pinned) or hover id
     var topIdx = -1;
     var styler = function(o, i) {
-      utils$1.extend(o, i === topIdx ? topStyle: baseStyle);
+      utils.extend(o, i === topIdx ? topStyle: baseStyle);
     };
     var baseStyle = getDefaultStyle(lyr, selectionStyles[geomType]);
     var topStyle;
@@ -8219,7 +6463,7 @@
     if (lyr.geometry_type == 'point') {
       return fields.indexOf('r') > -1; // require 'r' field for point symbols
     }
-    return utils$1.difference(fields, ['opacity', 'class']).length > 0;
+    return utils.difference(fields, ['opacity', 'class']).length > 0;
   }
 
 
@@ -8292,6 +6536,7 @@
 
     this.maxScale = maxScale;
 
+    // Display scale, e.g. meters per pixel or degrees per pixel
     this.getPixelSize = function() {
       return 1 / this.getTransform().mx;
     };
@@ -8375,7 +6620,7 @@
     }
 
     function maxAbs() {
-      return Math.max.apply(null, utils$1.toArray(arguments).map(Math.abs));
+      return Math.max.apply(null, utils.toArray(arguments).map(Math.abs));
     }
 
     function limitScale(scale) {
@@ -8429,7 +6674,7 @@
     }
   }
 
-  utils$1.inherit(MapExtent, EventDispatcher);
+  utils.inherit(MapExtent, EventDispatcher);
 
   // TODO: consider moving this upstream
   function getArcsForRendering(obj, ext) {
@@ -8483,7 +6728,10 @@
     } else {
       arcs = getArcsForRendering(obj, ext);
       filter = getShapeFilter(arcs, ext);
-      canv.drawPathShapes(layer.shapes, arcs, style, filter);
+      canv.drawStyledPaths(layer.shapes, arcs, style, filter);
+      if (style.vertices) {
+        canv.drawVertices(layer.shapes, arcs, style, filter);
+      }
     }
   }
 
@@ -8557,7 +6805,7 @@
 
     /*
     // Original function, not optimized
-    _self.drawPathShapes = function(shapes, arcs, style) {
+    _self.drawStyledPaths = function(shapes, arcs, style) {
       var startPath = getPathStart(_ext),
           drawPath = getShapePencil(arcs, _ext),
           styler = style.styler || null;
@@ -8570,8 +6818,28 @@
     };
     */
 
+    _self.drawVertices = function(shapes, arcs, style, filter) {
+      var iter = new internal.ShapeIter(arcs);
+      var t = getScaledTransform(_ext);
+      var radius = (style.strokeWidth * 0.9 || 2.2) * GUI.getPixelRatio() * getScaledLineScale(_ext);
+      var color = style.strokeColor || 'black';
+      var shp;
+      _ctx.beginPath();
+      _ctx.fillStyle = color;
+      for (var i=0; i<shapes.length; i++) {
+        shp = shapes[i];
+        if (!shp || filter && !filter(shp)) continue;
+        iter.init(shp);
+        while (iter.hasNext()) {
+          drawCircle(iter.x * t.mx + t.bx, iter.y * t.my + t.by, radius, _ctx);
+        }
+      }
+      _ctx.fill();
+      _ctx.closePath();
+    };
+
     // Optimized to draw paths in same-style batches (faster Canvas drawing)
-    _self.drawPathShapes = function(shapes, arcs, style, filter) {
+    _self.drawStyledPaths = function(shapes, arcs, style, filter) {
       var styleIndex = {};
       var batchSize = 1500;
       var startPath = getPathStart(_ext, getScaledLineScale(_ext));
@@ -8590,7 +6858,7 @@
         key = getStyleKey(style);
         if (key in styleIndex === false) {
           styleIndex[key] = {
-            style: utils$1.defaults({}, style),
+            style: utils.defaults({}, style),
             shapes: []
           };
         }
@@ -8699,7 +6967,7 @@
       }
     }
 
-    // TODO: consider using drawPathShapes(), which draws paths in batches
+    // TODO: consider using drawStyledPaths(), which draws paths in batches
     // for faster Canvas rendering. Downside: changes stacking order, which
     // is bad if circles are graduated.
     _self.drawPoints = function(shapes, style) {
@@ -9064,7 +7332,7 @@
     var frame = ext.getFrame(); // frame should be set if we're rendering a furniture layer
     var obj = internal.getEmptyLayerForSVG(lyr, {});
     if (!frame) {
-      stop$1('Missing map frame data');
+      stop('Missing map frame data');
     }
     obj.properties.transform = getSvgFurnitureTransform(ext);
     obj.properties.class = 'mapshaper-svg-furniture';
@@ -9092,7 +7360,7 @@
       var html = '';
       // generate a unique id so layer can be identified when symbols are repositioned
       // use it as a class name to avoid id collisions
-      var id = utils$1.getUniqueName();
+      var id = utils.getUniqueName();
       var classNames = [id, 'mapshaper-svg-layer', 'mapshaper-' + type + '-layer'];
       g.setAttribute('class', classNames.join(' '));
       target.svg_id = id;
@@ -9543,7 +7811,7 @@
     }
 
     if (obj.tabular) {
-      utils$1.extend(obj, getDisplayLayerForTable(layer.data));
+      utils.extend(obj, getDisplayLayerForTable(layer.data));
     }
 
     // dynamic reprojection (arcs were already reprojected above)
@@ -9601,7 +7869,7 @@
     return ids;
   }
 
-  utils$1.inherit(MshpMap, EventDispatcher);
+  utils.inherit(MshpMap, EventDispatcher);
 
   function MshpMap(gui) {
     var opts = gui.options,
@@ -9639,7 +7907,7 @@
       _mouse.disable();
     });
 
-    gui.on('undo_redo', function() {
+    gui.on('map-needs-refresh', function() {
       drawLayers();
     });
 
@@ -9695,7 +7963,7 @@
     this.setDisplayCRS = function(crs) {
       // TODO: update bounds of frame layer, if there is a frame layer
       var oldCRS = this.getDisplayCRS();
-      var newCRS = utils$1.isString(crs) ? internal.getCRS(crs) : crs;
+      var newCRS = utils.isString(crs) ? internal.getCRS(crs) : crs;
       // TODO: handle case that old and new CRS are the same
       _dynamicCRS = newCRS;
       if (!_activeLyr) return; // stop here if no layers have been selected
@@ -9801,13 +8069,7 @@
         });
       }
 
-      if (true) { // TODO: add option to disable?
-        _editor = new SymbolDragging2(gui, _ext, _hit);
-        _editor.on('location_change', function(e) {
-          // TODO: look into optimizing, so only changed symbol is redrawn
-          drawLayers();
-        });
-      }
+      _editor = new InteractiveEditor(gui, _ext, _hit);
 
       _ext.on('change', function(e) {
         if (e.reset) return; // don't need to redraw map here if extent has been reset
@@ -9827,7 +8089,11 @@
     function updateOverlayLayer(e) {
       var style = getOverlayStyle(_activeLyr.layer, e);
       if (style) {
-        _overlayLyr = utils$1.defaults({
+        // kludge to show vertices when editing path shapes
+        if (gui.state.interaction_mode == 'vertices') {
+          style.vertices = true;
+        }
+        _overlayLyr = utils.defaults({
           layer: filterLayerByIds(_activeLyr.layer, style.ids),
           style: style
         }, _activeLyr);
@@ -9992,7 +8258,7 @@
             // kludge to hide ghosted layers when reference layers are present
             // TODO: consider never showing ghosted layers (which appear after
             // commands like dissolve and filter).
-            mapLayer.style = utils$1.defaults({
+            mapLayer.style = utils.defaults({
               strokeColors: [null, mapLayer.style.strokeColors[1]]
             }, mapLayer.style);
           }
@@ -10048,7 +8314,7 @@
 
   function GuiInstance(container, opts) {
     var gui = new ModeSwitcher();
-    opts = utils$1.extend({
+    opts = utils.extend({
       // defaults
       homeControl: true,
       zoomControl: true,
@@ -10067,6 +8333,7 @@
     gui.interaction = new InteractionMode(gui);
     gui.session = new SessionHistory(gui);
     gui.undo = new Undo(gui);
+    gui.state = {};
 
     gui.showProgressMessage = function(msg) {
       if (!gui.progressMessage) {
@@ -10150,6 +8417,7 @@
     opts.display_all = vars['display-all'] || vars.a || !!manifest.display_all;
     opts.quick_view = vars['quick-view'] || vars.q || !!manifest.quick_view;
     opts.target = vars.target || manifest.target || null;
+    opts.name = vars.name || manifest.name || null;
     return opts;
   }