mapshaper 0.6.93 → 0.6.95

package/mapshaper.js

@@ -236,8 +236,7 @@
     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;
+    if (obj.length === 0 || obj.length > 0) return true;
     return false;
   }
 
@@ -4660,11 +4659,14 @@
 
   var mproj$1 = require$1('mproj');
 
-  // A compound projection, consisting of a default projection and one or more rectangular frames
-  // that are projected separately and affine transformed.
+  // Constructor function for a compound projection consisting of a default
+  //   projection and one or more rectangular frames that are projected separately
+  //   and affine transformed.
   // @mainParams: parameters for main projection, including:
   //    proj: Proj string
   //    bbox: lat-lon bounding box
+  // Returns a mproj CRS object for the main CRS with the CRS objects of the
+  //    embedded projections attached.
   function MixedProjection(mainParams, options) {
     var mainFrame = initFrame(mainParams);
     var mainP = mainFrame.crs;
@@ -5056,6 +5058,9 @@
     return str in projectionAliases;
   }
 
+  // str: projection string in a variety of forms accepted by the -proj command
+  //   (e.g. alias, EPSG:XXXX, Proj.4 string, bare Proj.4 projection name)
+  // Returns a properly formatted Proj.4 string or an instantiated mproj object
   function getProjDefn(str) {
     var defn;
     // prepend '+proj=' to bare proj names
@@ -7701,7 +7706,7 @@
   			if (currentUnpackr.mapsAsObjects) {
   				let object = {};
   				for (let i = 0; i < token; i++) {
-  					let key = readKey$1();
+  					let key = readKey();
   					if (key === '__proto__')
   						key = '__proto_';
   					object[key] = read();
@@ -8063,7 +8068,7 @@
   	if (currentUnpackr.mapsAsObjects) {
   		let object = {};
   		for (let i = 0; i < length; i++) {
-  			let key = readKey$1();
+  			let key = readKey();
   			if (key === '__proto__')
   				key = '__proto_';
   			object[key] = read();
@@ -8286,7 +8291,7 @@
   }
 
   var keyCache = new Array(4096);
-  function readKey$1() {
+  function readKey() {
   	let length = src[position$1++];
   	if (length >= 0xa0 && length < 0xc0) {
   		// fixstr, potentially use key cache
@@ -11316,9 +11321,11 @@
   function guessInputFileType(file) {
     var ext = getFileExtension(file || '').toLowerCase(),
         type = null;
-    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml' || ext == 'cpg') {
+    if (ext == 'dbf' || ext == 'shp' || ext == 'kml') {
       type = ext;
-    } else if (/json$/.test(ext)) {
+    } else if (isAuxiliaryInputFileType(ext)) {
+      type = ext;
+    } else if (/json$/.test(ext)) { // matches topojson, geojson, json
       type = 'json';
     } else if (ext == 'csv' || ext == 'tsv' || ext == 'txt' || ext == 'tab') {
       type = 'text';
@@ -11328,6 +11335,11 @@
     return type;
   }
 
+  // File types that can be imported but are not convertible to datasets
+  function isAuxiliaryInputFileType(type) {
+    return type == 'prj' || type == 'shx' || type == 'cpg';
+  }
+
   function guessInputContentType(content) {
     var type = null;
     if (utils.isString(content)) {
@@ -11428,6 +11440,7 @@
   var FileTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
     guessInputFileType: guessInputFileType,
+    isAuxiliaryInputFileType: isAuxiliaryInputFileType,
     guessInputContentType: guessInputContentType,
     guessInputType: guessInputType,
     stringLooksLikeJSON: stringLooksLikeJSON,
@@ -28085,13 +28098,13 @@ ${svg}
 
   var EOF; // undefined is used as an EOF marker
 
-  var RESERVE = 0X1000; // RESERVE is the number of bytes to keep in read buffer
+  var RESERVE = 4096; // RESERVE is the number of bytes to keep in read buffer
   var BUFLEN = 1e7; // buffer chunk size
   var MAX_STRLEN = 5e6; // max byte len of a value string (object keys are shorter)
 
-  // Parse from a Buffer -- similar to JSON.parse(), used for testing
-  function parse(buf) {
-    var reader = new BufferReader(buf);
+  // Parse from a Buffer or FileReader
+  function parseJSON(arg) {
+    var reader = isArrayLike(arg) ? new BufferReader(arg) : arg;
     var src = ByteReader(reader, 0);
     skipWS(src);
     var val = readValue(src);
@@ -28102,16 +28115,43 @@ ${svg}
     return val;
   }
 
-  // Read and parse JSON objects from a FileReader
-  function parseObjects(reader, offset, cb) {
-    var src = ByteReader(reader, offset);
-    seekObjectStart(src);
+  // Parse data from:
+  //  * FeatureCollection
+  //  * GeometryCollection
+  //  * Single Feature or Geometry
+  //  * WS-delimited sequence of Features or geometries
+  //
+  // reader: FileReader or compatible reader
+  // cb: callback function, called once for each parsed Feature or bare geometry
+  //
+  // Returns:
+  //  * collections - top-level object with features/geometries array set to null
+  //  * others - null
+  //
+  function parseGeoJSON(reader, cb) {
+    var src = ByteReader(reader, 0);
+    var isObject = seekObjectStart(src);
+    if (!isObject) {
+      stop('File is not GeoJSON');
+    }
+    var obj = readObject(src, cb);
+    if (obj.type == 'FeatureCollection' || obj.type == 'GeometryCollection') {
+      return obj;
+    }
+    if (!obj.type) { // TODO: validate type
+      stop('Invalid GeoJSON');
+    }
+    cb(obj);
+    // try to read newline-delimited GeoJSON
+    skipWS(src);
     while (src.peek() == LBRACE) {
-      cb(readObject(src));
-      readToken(src, COMMA);
+      cb(readObject(src, cb));
+      skipWS(src);
     }
+    return null;
   }
 
+
   function parseError(msg, i) {
     if (i >= 0) {
       msg += ' at position ' + i;
@@ -28166,15 +28206,26 @@ ${svg}
   function readArray(src) {
     var arr = [], c;
     eatChar(src, LBRACK);
-    c = readToken(src, RBRACK);
+    c = scanForSyntaxChar(src, RBRACK);
     while (c != RBRACK) {
       src.refresh();
       arr.push(readArrayElement(src));
-      c = readAorB(src, COMMA, RBRACK);
+      c = scanForAorB(src, COMMA, RBRACK);
     }
     return arr;
   }
 
+  function readCollectionArray(src, cb) {
+    var c;
+    eatChar(src, LBRACK);
+    c = scanForSyntaxChar(src, RBRACK);
+    while (c != RBRACK) {
+      src.refresh();
+      cb(readArrayElement(src));
+      c = scanForAorB(src, COMMA, RBRACK);
+    }
+  }
+
   // Using this function instead of readValue() to read array elements
   // gives up to a 25% reduction in overall processing time when parsing
   // coordinate-heavy GeoJSON files.
@@ -28205,7 +28256,7 @@ ${svg}
     do {
       src.refresh(); // make make sure long arrays of numbers don't overflow
       arr.push(readValue(src));
-    } while(readAorB(src, COMMA, RBRACK) == COMMA);
+    } while(scanForAorB(src, COMMA, RBRACK) == COMMA);
     return arr;
   }
 
@@ -28226,7 +28277,7 @@ ${svg}
   // Reads and returns tok if tok is the next non-whitespace byte,
   // else returns null.
   // Scans past WS chars, both before and after tok
-  function readToken(src, tok) {
+  function scanForSyntaxChar(src, tok) {
     skipWS(src);
     var c = src.peek();
     if (c === tok) {
@@ -28237,7 +28288,7 @@ ${svg}
     return null;
   }
 
-  // assumes no leading WS
+  // Assumes next char is the first char of a data object (not WS "," ":" "}" "]" etc)
   function readValue(src) {
     var c = src.peek();
     var val;
@@ -28245,14 +28296,29 @@ ${svg}
     else if (c == LBRACK) val = readArray(src);
     else if (c == DQUOTE) val = readString(src);
     else if (c == LBRACE) val = readObject(src);
-    else if (c == 110) val = eatChars(src, "null") && null;
-    else if (c == 116) val = eatChars(src, "true") && true;
-    else if (c == 102) val = eatChars(src, "false") && false;
+    else if (c == 110) val = readNull(src); // "n" -> null
+    else if (c == 116) val = readTrue(src); // "t" -> true
+    else if (c == 102) val = readFalse(src); // "f" -> false
     else unexpectedCharAt(c, src.index());
     return val;
   }
 
-  function readAorB(src, a, b) {
+  function readTrue(src) {
+    eatChars(src, 'true');
+    return true;
+  }
+
+  function readFalse(src) {
+    eatChars(src, 'false');
+    return false;
+  }
+
+  function readNull(src) {
+    eatChars(src, 'null');
+    return null;
+  }
+
+  function scanForAorB(src, a, b) {
     skipWS(src);
     var c = src.getChar();
     if (c != a && c != b) unexpectedCharAt(c, src.index() - 1);
@@ -28260,21 +28326,30 @@ ${svg}
     return c;
   }
 
-  function readObject(src) {
+
+  // cb: optional callback for returning GeoJSON features or geometries
+  //
+  function readObject(src, cb) {
     var o = {};
     var key, c;
     eatChar(src, LBRACE);
-    c = readToken(src, RBRACE);
+    c = scanForSyntaxChar(src, RBRACE);
     while (c != RBRACE) {
       src.refresh();
-      key = readKey(src); // use caching for faster key parsing
+      key = readKeywordString(src); // optimization: use caching with object keys
       skipWS(src);
-      eatChar(src, 58);
+      eatChar(src, 58); // ":"
       skipWS(src);
-      // use caching with GeoJSON "type" params
-      o[key] = key == 'type' && src.peek() == DQUOTE ?
-        readKey(src) : readValue(src);
-      c = readAorB(src, COMMA, RBRACE);
+      if ((key == 'features' || key == 'geometries') &&
+          src.peek() == LBRACK && cb) {
+        readCollectionArray(src, cb);
+        o[key] = null;
+      } else if (key == 'type' && src.peek() == DQUOTE) {
+        o[key] = readKeywordString(src); // use caching with GeoJSON "type" params
+      } else {
+        o[key] = readValue(src);
+      }
+      c = scanForAorB(src, COMMA, RBRACE);
     }
     return o;
   }
@@ -28287,7 +28362,7 @@ ${svg}
   // Uses caching to speed up parsing of repeated strings.
   // The caching scheme used here can give a 20% overall speed improvement
   // when parsing files consisting mostly of attribute data (e.g. typical Point features)
-  function readKey(src) {
+  function readKeywordString(src) {
     var MAXLEN = 2000; // must be less than RESERVE
     var i = src.index();
     var cache = src.cache;
@@ -28528,28 +28603,6 @@ ${svg}
     }
   }
 
-  // Read GeoJSON Features or geometry objects from a file
-  // @reader: a FileReader
-  function GeoJSONReader(reader) {
-
-    // Read objects synchronously, with callback
-    this.readObjects = function(onObject) {
-      // Search first x bytes of file for features|geometries key
-      // 300 bytes not enough... GeoJSON files can have additional non-standard properties, e.g. 'metadata'
-      // var bytesToSearch = 300;
-      var bytesToSearch = 5000;
-      var start = reader.findString('"features"', bytesToSearch) ||
-          reader.findString('"geometries"', bytesToSearch);
-      // Assume single Feature or geometry if collection not found
-      // (this works for ndjson files too)
-      var offset = start ? start.offset : 0;
-      T$1.start();
-      parseObjects(reader, offset, onObject);
-      // parseObjects_native(reader, offset, onObject);
-      debug('Parse GeoJSON', T$1.stop());
-    };
-  }
-
   // Identify JSON type from the initial subset of a JSON string
   function identifyJSONString(str, opts) {
     var maxChars = 1000;
@@ -28583,7 +28636,8 @@ ${svg}
 
   function importGeoJSONFile(fileReader, opts) {
     var importer = new GeoJSONParser(opts);
-    new GeoJSONReader(fileReader).readObjects(importer.parseObject);
+    parseGeoJSON(fileReader, importer.parseObject);
+    // TODO: examine top-level objects, like crs
     return importer.done();
   }
 
@@ -28880,7 +28934,7 @@ ${svg}
     }
 
     return {
-      info: importInfo(obj.info || {}),
+      info: await importInfo(obj.info || {}),
       layers: layers,
       arcs: arcs
     };
@@ -28920,8 +28974,10 @@ ${svg}
     return arcs;
   }
 
-  function importInfo(o) {
+  async function importInfo(o) {
     if (o.crs_string) {
+      // load external files (e.g. epsg definitions) if needed in GUI
+      await initProjLibrary({crs: o.crs_string});
       o.crs = parseCrsString(o.crs_string);
     } else if (o.prj) {
       o.crs = parsePrj(o.prj);
@@ -29068,7 +29124,7 @@ ${svg}
         // don't import .dbf separately if .shp is present
         if (replaceFileExtension(filename, 'shp') in cache) return false;
       }
-      return type == 'text' || type == 'json' || type == 'shp' || type == 'dbf' || type == 'kml';
+      return type && !isAuxiliaryInputFileType(type);
     });
   }
 
@@ -45616,7 +45672,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.93";
+  var version = "0.6.95";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.
@@ -46248,8 +46304,8 @@ ${svg}
     Dbf,
     DbfReader,
     DouglasPeucker,
-    geojson: GeoJSON,
-    json: { parse: parse },
+    parseGeoJSON,
+    json: { parse: parseJSON },
     ShpType,
     topojson: TopoJSON,
     Visvalingam,
@@ -46259,7 +46315,6 @@ ${svg}
     CommandParser,
     DataTable,
     editArcs,
-    GeoJSONReader,
     Heap,
     IdLookupIndex,
     NodeCollection,

package/package.json

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

package/www/mapshaper-gui.js

@@ -3707,7 +3707,13 @@
     // init simplify button and mode
     gui.addMode('simplify', turnOn, turnOff, menuBtn);
 
-    model.on('update', function() {
+    model.on('update', function(e) {
+      // exit simplify mode if data has been changed from outside the simplify
+      // tool
+      // (TODO: try to only respond to changes that might affect simplification)
+      if (e.flags.simplify_method || e.flags.simplify_amount) {
+        return;
+      }
       menuBtn.classed('disabled', !model.getActiveLayer());
       if (gui.getMode() == 'simplify') gui.clearMode();
     });
@@ -5890,7 +5896,7 @@
 
     var menus = {
       standard: ['info', 'selection', 'box'],
-      empty: ['edit_points', 'edit_lines', 'edit_polygons', 'box'],
+      empty: ['edit_polygons', 'edit_lines', 'edit_points', 'box'],
       polygons: ['info', 'selection', 'box', 'edit_polygons'],
       rectangles: ['info', 'selection', 'box', 'rectangles', 'edit_polygons'],
       lines: ['info', 'selection', 'box' , 'edit_lines'],
@@ -5908,11 +5914,11 @@
     // mode name -> menu text lookup
     var labels = {
       info: 'inspect features',
-      box: 'shift-drag box tool',
+      box: 'rectangle tool',
       data: 'edit attributes',
       labels: 'position labels',
-      edit_points: 'draw/edit points',
-      edit_lines: 'draw/edit lines',
+      edit_points: 'add/edit points',
+      edit_lines: 'draw/edit polylines',
       edit_polygons: 'draw/edit polygons',
       vertices: 'edit vertices',
       selection: 'selection tool',
@@ -6531,8 +6537,7 @@
     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;
+    if (obj.length === 0 || obj.length > 0) return true;
     return false;
   }
 
@@ -8830,12 +8835,12 @@
     element.addEventListener('mousedown', onAreaDown);
     element.addEventListener('dblclick', onAreaDblClick);
     document.addEventListener('contextmenu', function(e) {
-      if (!e.ctrlKey) {
+      if (!(e.ctrlKey && e.altKey)) {
         e.preventDefault();
       }
     });
     element.addEventListener('contextmenu', function(e) {
-      if (!e.ctrlKey) {
+      if (!(e.ctrlKey && e.altKey)) {
         _self.dispatchEvent('contextmenu', procMouseEvent(e));
       }
     });
@@ -12142,6 +12147,8 @@
     var popup = gui.container.findChild('.box-tool-options');
     var coords = popup.findChild('.box-coords');
     var _on = false;
+    var instructionsShown = false;
+    var alert;
 
     var infoBtn = new SimpleButton(popup.findChild('.info-btn')).on('click', function() {
       if (coords.visible()) hideCoords(); else showCoords();
@@ -12188,6 +12195,10 @@
     gui.on('interaction_mode_change', function(e) {
       if (e.mode === 'box') {
         gui.enterMode('box_tool');
+        if (!instructionsShown) {
+          instructionsShown = true;
+          showInstructions();
+        }
       } else if (_on) {
         turnOff();
       }
@@ -12198,7 +12209,10 @@
     });
 
     box.on('dragend', function(e) {
-      if (_on) popup.show();
+      if (_on) {
+        hideInstructions();
+        popup.show();
+      }
     });
 
     box.on('handle_drag', function() {
@@ -12207,6 +12221,19 @@
       }
     });
 
+    function showInstructions() {
+      var isMac = navigator.userAgent.includes('Mac');
+      var symbol = isMac ? '⌘' : '^';
+      var msg = `Instructions: Shift-drag to draw a rectangle. Drag handles to resize. Shift-drag handles to resize symmetrically.`;
+      alert = showPopupAlert(msg, null, { non_blocking: true, max_width: '360px'});
+    }
+
+    function hideInstructions() {
+      if (!alert) return;
+      alert.close('fade');
+      alert = null;
+    }
+
     function inZoomMode() {
       return !_on && gui.getMode() != 'selection_tool';
     }
@@ -12242,6 +12269,7 @@
 
     function turnOff() {
       box.turnOff();
+      hideInstructions();
       if (gui.interaction.getMode() == 'box') {
         // mode change was not initiated by interactive menu -- turn off interactivity
         gui.interaction.turnOff();

package/www/mapshaper.js

@@ -236,8 +236,7 @@
     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;
+    if (obj.length === 0 || obj.length > 0) return true;
     return false;
   }
 
@@ -4660,11 +4659,14 @@
 
   var mproj$1 = require$1('mproj');
 
-  // A compound projection, consisting of a default projection and one or more rectangular frames
-  // that are projected separately and affine transformed.
+  // Constructor function for a compound projection consisting of a default
+  //   projection and one or more rectangular frames that are projected separately
+  //   and affine transformed.
   // @mainParams: parameters for main projection, including:
   //    proj: Proj string
   //    bbox: lat-lon bounding box
+  // Returns a mproj CRS object for the main CRS with the CRS objects of the
+  //    embedded projections attached.
   function MixedProjection(mainParams, options) {
     var mainFrame = initFrame(mainParams);
     var mainP = mainFrame.crs;
@@ -5056,6 +5058,9 @@
     return str in projectionAliases;
   }
 
+  // str: projection string in a variety of forms accepted by the -proj command
+  //   (e.g. alias, EPSG:XXXX, Proj.4 string, bare Proj.4 projection name)
+  // Returns a properly formatted Proj.4 string or an instantiated mproj object
   function getProjDefn(str) {
     var defn;
     // prepend '+proj=' to bare proj names
@@ -7701,7 +7706,7 @@
   			if (currentUnpackr.mapsAsObjects) {
   				let object = {};
   				for (let i = 0; i < token; i++) {
-  					let key = readKey$1();
+  					let key = readKey();
   					if (key === '__proto__')
   						key = '__proto_';
   					object[key] = read();
@@ -8063,7 +8068,7 @@
   	if (currentUnpackr.mapsAsObjects) {
   		let object = {};
   		for (let i = 0; i < length; i++) {
-  			let key = readKey$1();
+  			let key = readKey();
   			if (key === '__proto__')
   				key = '__proto_';
   			object[key] = read();
@@ -8286,7 +8291,7 @@
   }
 
   var keyCache = new Array(4096);
-  function readKey$1() {
+  function readKey() {
   	let length = src[position$1++];
   	if (length >= 0xa0 && length < 0xc0) {
   		// fixstr, potentially use key cache
@@ -11316,9 +11321,11 @@
   function guessInputFileType(file) {
     var ext = getFileExtension(file || '').toLowerCase(),
         type = null;
-    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml' || ext == 'cpg') {
+    if (ext == 'dbf' || ext == 'shp' || ext == 'kml') {
       type = ext;
-    } else if (/json$/.test(ext)) {
+    } else if (isAuxiliaryInputFileType(ext)) {
+      type = ext;
+    } else if (/json$/.test(ext)) { // matches topojson, geojson, json
       type = 'json';
     } else if (ext == 'csv' || ext == 'tsv' || ext == 'txt' || ext == 'tab') {
       type = 'text';
@@ -11328,6 +11335,11 @@
     return type;
   }
 
+  // File types that can be imported but are not convertible to datasets
+  function isAuxiliaryInputFileType(type) {
+    return type == 'prj' || type == 'shx' || type == 'cpg';
+  }
+
   function guessInputContentType(content) {
     var type = null;
     if (utils.isString(content)) {
@@ -11428,6 +11440,7 @@
   var FileTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
     guessInputFileType: guessInputFileType,
+    isAuxiliaryInputFileType: isAuxiliaryInputFileType,
     guessInputContentType: guessInputContentType,
     guessInputType: guessInputType,
     stringLooksLikeJSON: stringLooksLikeJSON,
@@ -28085,13 +28098,13 @@ ${svg}
 
   var EOF; // undefined is used as an EOF marker
 
-  var RESERVE = 0X1000; // RESERVE is the number of bytes to keep in read buffer
+  var RESERVE = 4096; // RESERVE is the number of bytes to keep in read buffer
   var BUFLEN = 1e7; // buffer chunk size
   var MAX_STRLEN = 5e6; // max byte len of a value string (object keys are shorter)
 
-  // Parse from a Buffer -- similar to JSON.parse(), used for testing
-  function parse(buf) {
-    var reader = new BufferReader(buf);
+  // Parse from a Buffer or FileReader
+  function parseJSON(arg) {
+    var reader = isArrayLike(arg) ? new BufferReader(arg) : arg;
     var src = ByteReader(reader, 0);
     skipWS(src);
     var val = readValue(src);
@@ -28102,16 +28115,43 @@ ${svg}
     return val;
   }
 
-  // Read and parse JSON objects from a FileReader
-  function parseObjects(reader, offset, cb) {
-    var src = ByteReader(reader, offset);
-    seekObjectStart(src);
+  // Parse data from:
+  //  * FeatureCollection
+  //  * GeometryCollection
+  //  * Single Feature or Geometry
+  //  * WS-delimited sequence of Features or geometries
+  //
+  // reader: FileReader or compatible reader
+  // cb: callback function, called once for each parsed Feature or bare geometry
+  //
+  // Returns:
+  //  * collections - top-level object with features/geometries array set to null
+  //  * others - null
+  //
+  function parseGeoJSON(reader, cb) {
+    var src = ByteReader(reader, 0);
+    var isObject = seekObjectStart(src);
+    if (!isObject) {
+      stop('File is not GeoJSON');
+    }
+    var obj = readObject(src, cb);
+    if (obj.type == 'FeatureCollection' || obj.type == 'GeometryCollection') {
+      return obj;
+    }
+    if (!obj.type) { // TODO: validate type
+      stop('Invalid GeoJSON');
+    }
+    cb(obj);
+    // try to read newline-delimited GeoJSON
+    skipWS(src);
     while (src.peek() == LBRACE) {
-      cb(readObject(src));
-      readToken(src, COMMA);
+      cb(readObject(src, cb));
+      skipWS(src);
     }
+    return null;
   }
 
+
   function parseError(msg, i) {
     if (i >= 0) {
       msg += ' at position ' + i;
@@ -28166,15 +28206,26 @@ ${svg}
   function readArray(src) {
     var arr = [], c;
     eatChar(src, LBRACK);
-    c = readToken(src, RBRACK);
+    c = scanForSyntaxChar(src, RBRACK);
     while (c != RBRACK) {
       src.refresh();
       arr.push(readArrayElement(src));
-      c = readAorB(src, COMMA, RBRACK);
+      c = scanForAorB(src, COMMA, RBRACK);
     }
     return arr;
   }
 
+  function readCollectionArray(src, cb) {
+    var c;
+    eatChar(src, LBRACK);
+    c = scanForSyntaxChar(src, RBRACK);
+    while (c != RBRACK) {
+      src.refresh();
+      cb(readArrayElement(src));
+      c = scanForAorB(src, COMMA, RBRACK);
+    }
+  }
+
   // Using this function instead of readValue() to read array elements
   // gives up to a 25% reduction in overall processing time when parsing
   // coordinate-heavy GeoJSON files.
@@ -28205,7 +28256,7 @@ ${svg}
     do {
       src.refresh(); // make make sure long arrays of numbers don't overflow
       arr.push(readValue(src));
-    } while(readAorB(src, COMMA, RBRACK) == COMMA);
+    } while(scanForAorB(src, COMMA, RBRACK) == COMMA);
     return arr;
   }
 
@@ -28226,7 +28277,7 @@ ${svg}
   // Reads and returns tok if tok is the next non-whitespace byte,
   // else returns null.
   // Scans past WS chars, both before and after tok
-  function readToken(src, tok) {
+  function scanForSyntaxChar(src, tok) {
     skipWS(src);
     var c = src.peek();
     if (c === tok) {
@@ -28237,7 +28288,7 @@ ${svg}
     return null;
   }
 
-  // assumes no leading WS
+  // Assumes next char is the first char of a data object (not WS "," ":" "}" "]" etc)
   function readValue(src) {
     var c = src.peek();
     var val;
@@ -28245,14 +28296,29 @@ ${svg}
     else if (c == LBRACK) val = readArray(src);
     else if (c == DQUOTE) val = readString(src);
     else if (c == LBRACE) val = readObject(src);
-    else if (c == 110) val = eatChars(src, "null") && null;
-    else if (c == 116) val = eatChars(src, "true") && true;
-    else if (c == 102) val = eatChars(src, "false") && false;
+    else if (c == 110) val = readNull(src); // "n" -> null
+    else if (c == 116) val = readTrue(src); // "t" -> true
+    else if (c == 102) val = readFalse(src); // "f" -> false
     else unexpectedCharAt(c, src.index());
     return val;
   }
 
-  function readAorB(src, a, b) {
+  function readTrue(src) {
+    eatChars(src, 'true');
+    return true;
+  }
+
+  function readFalse(src) {
+    eatChars(src, 'false');
+    return false;
+  }
+
+  function readNull(src) {
+    eatChars(src, 'null');
+    return null;
+  }
+
+  function scanForAorB(src, a, b) {
     skipWS(src);
     var c = src.getChar();
     if (c != a && c != b) unexpectedCharAt(c, src.index() - 1);
@@ -28260,21 +28326,30 @@ ${svg}
     return c;
   }
 
-  function readObject(src) {
+
+  // cb: optional callback for returning GeoJSON features or geometries
+  //
+  function readObject(src, cb) {
     var o = {};
     var key, c;
     eatChar(src, LBRACE);
-    c = readToken(src, RBRACE);
+    c = scanForSyntaxChar(src, RBRACE);
     while (c != RBRACE) {
       src.refresh();
-      key = readKey(src); // use caching for faster key parsing
+      key = readKeywordString(src); // optimization: use caching with object keys
       skipWS(src);
-      eatChar(src, 58);
+      eatChar(src, 58); // ":"
       skipWS(src);
-      // use caching with GeoJSON "type" params
-      o[key] = key == 'type' && src.peek() == DQUOTE ?
-        readKey(src) : readValue(src);
-      c = readAorB(src, COMMA, RBRACE);
+      if ((key == 'features' || key == 'geometries') &&
+          src.peek() == LBRACK && cb) {
+        readCollectionArray(src, cb);
+        o[key] = null;
+      } else if (key == 'type' && src.peek() == DQUOTE) {
+        o[key] = readKeywordString(src); // use caching with GeoJSON "type" params
+      } else {
+        o[key] = readValue(src);
+      }
+      c = scanForAorB(src, COMMA, RBRACE);
     }
     return o;
   }
@@ -28287,7 +28362,7 @@ ${svg}
   // Uses caching to speed up parsing of repeated strings.
   // The caching scheme used here can give a 20% overall speed improvement
   // when parsing files consisting mostly of attribute data (e.g. typical Point features)
-  function readKey(src) {
+  function readKeywordString(src) {
     var MAXLEN = 2000; // must be less than RESERVE
     var i = src.index();
     var cache = src.cache;
@@ -28528,28 +28603,6 @@ ${svg}
     }
   }
 
-  // Read GeoJSON Features or geometry objects from a file
-  // @reader: a FileReader
-  function GeoJSONReader(reader) {
-
-    // Read objects synchronously, with callback
-    this.readObjects = function(onObject) {
-      // Search first x bytes of file for features|geometries key
-      // 300 bytes not enough... GeoJSON files can have additional non-standard properties, e.g. 'metadata'
-      // var bytesToSearch = 300;
-      var bytesToSearch = 5000;
-      var start = reader.findString('"features"', bytesToSearch) ||
-          reader.findString('"geometries"', bytesToSearch);
-      // Assume single Feature or geometry if collection not found
-      // (this works for ndjson files too)
-      var offset = start ? start.offset : 0;
-      T$1.start();
-      parseObjects(reader, offset, onObject);
-      // parseObjects_native(reader, offset, onObject);
-      debug('Parse GeoJSON', T$1.stop());
-    };
-  }
-
   // Identify JSON type from the initial subset of a JSON string
   function identifyJSONString(str, opts) {
     var maxChars = 1000;
@@ -28583,7 +28636,8 @@ ${svg}
 
   function importGeoJSONFile(fileReader, opts) {
     var importer = new GeoJSONParser(opts);
-    new GeoJSONReader(fileReader).readObjects(importer.parseObject);
+    parseGeoJSON(fileReader, importer.parseObject);
+    // TODO: examine top-level objects, like crs
     return importer.done();
   }
 
@@ -28880,7 +28934,7 @@ ${svg}
     }
 
     return {
-      info: importInfo(obj.info || {}),
+      info: await importInfo(obj.info || {}),
       layers: layers,
       arcs: arcs
     };
@@ -28920,8 +28974,10 @@ ${svg}
     return arcs;
   }
 
-  function importInfo(o) {
+  async function importInfo(o) {
     if (o.crs_string) {
+      // load external files (e.g. epsg definitions) if needed in GUI
+      await initProjLibrary({crs: o.crs_string});
       o.crs = parseCrsString(o.crs_string);
     } else if (o.prj) {
       o.crs = parsePrj(o.prj);
@@ -29068,7 +29124,7 @@ ${svg}
         // don't import .dbf separately if .shp is present
         if (replaceFileExtension(filename, 'shp') in cache) return false;
       }
-      return type == 'text' || type == 'json' || type == 'shp' || type == 'dbf' || type == 'kml';
+      return type && !isAuxiliaryInputFileType(type);
     });
   }
 
@@ -45616,7 +45672,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.93";
+  var version = "0.6.95";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.
@@ -46248,8 +46304,8 @@ ${svg}
     Dbf,
     DbfReader,
     DouglasPeucker,
-    geojson: GeoJSON,
-    json: { parse: parse },
+    parseGeoJSON,
+    json: { parse: parseJSON },
     ShpType,
     topojson: TopoJSON,
     Visvalingam,
@@ -46259,7 +46315,6 @@ ${svg}
     CommandParser,
     DataTable,
     editArcs,
-    GeoJSONReader,
     Heap,
     IdLookupIndex,
     NodeCollection,