mapshaper 0.7.20 → 0.7.22

package/bin/mapshaper-gui

@@ -14,6 +14,7 @@ var defaultPort = 5555,
       .option('-n, --name <name(s)>', 'rename input layer or layers')
       .option('-c, --commands <string>', 'console commands to run initially')
       .option('-t, --target <name>', 'name of layer to select initially')
+      .option('-w, --watch', 'watch input files and reload the browser on change')
       .addOption(new commander.Option('-b, --blurb <text>',
         'replace the default blurb on the import screen').hideHelp())
       .argument('[file...]', 'data files to load')
@@ -30,9 +31,26 @@ var defaultPort = 5555,
     port = parseInt(opts.port, 10) || defaultPort,
     dataFiles = expandShapefiles(program.args),
     probeCount = 0,
-    sessionId = null;
+    sessionId = null,
+    sseClients = [],
+    reloadTimer = null;
 validateFiles(dataFiles);
 
+if (opts.watch && dataFiles.length > 0) {
+  dataFiles.forEach(function(file) {
+    if (isUrl(file)) return;
+    fs.watch(file, function() {
+      // debounce: editors often write files in multiple steps
+      clearTimeout(reloadTimer);
+      reloadTimer = setTimeout(function() {
+        sseClients.forEach(function(res) {
+          try { res.write('event: reload\ndata: changed\n\n'); } catch(e) {}
+        });
+      }, 150);
+    });
+  });
+}
+
 process.on('uncaughtException', function(err) {
   // added 'code' for Node.js v16
   if (err.errno === 'EADDRINUSE' || err.code === 'EADDRINUSE') {
@@ -99,6 +117,18 @@ function startServer(port) {
       serveFile(getDataFilePath(uri), response);
     } else if (uri.indexOf('/save') === 0) {
       saveContent(request, response);
+    } else if (uri == '/sse' && opts.watch) {
+      // Server-Sent Events endpoint for file-watch reload notifications
+      response.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive'
+      });
+      response.write('data: connected\n\n');
+      sseClients.push(response);
+      request.on('close', function() {
+        sseClients = sseClients.filter(function(c) { return c !== response; });
+      });
     } else {
       // serve a file from the web root. Translate directory paths (any URI
       // ending in '/') to their index.html so that links like '/docs/' work
@@ -106,7 +136,21 @@ function startServer(port) {
       if (uri.endsWith('/')) {
         uri += 'index.html';
       }
-      serveFile(getAssetFilePath(uri), response);
+      if (opts.watch && uri == '/index.html') {
+        // inject SSE reload script into index.html
+        var htmlPath = getAssetFilePath('/index.html');
+        fs.readFile(htmlPath, 'utf8', function(err, content) {
+          if (err) return serve404(response);
+          var script = '<script>(function(){' +
+            'var es=new EventSource("/sse");' +
+            'es.addEventListener("reload",function(){location.reload();});' +
+            '})();</script>';
+          content = content.replace('</body>', script + '\n</body>');
+          serveContent(content, response, 'text/html');
+        });
+      } else {
+        serveFile(getAssetFilePath(uri), response);
+      }
     }
   }).listen(port, 'localhost', function() {
     if (process.env.MAPSHAPER_GUI_NO_OPEN) return;
@@ -165,7 +209,7 @@ function serveContent(content, response, mimeType) {
   }
   response.setHeader('Cache-Control', 'no-cache');
   response.writeHead(200);
-  response.write(content, "binary");
+  response.write(content, Buffer.isBuffer(content) ? undefined : "utf8");
   response.end();
 }
 

package/mapshaper.js

@@ -7417,7 +7417,7 @@
           i = fw ? arcId : ~arcId,
           iter = _zz && _zlimit ? _filteredArcIter : _arcIter;
       if (i >= _nn.length) {
-        error("#getArcId() out-of-range arc id:", arcId);
+        error("#getArcId() out-of-range arc id:", arcId, `(max id: ${_nn.length - 1})`);
       }
       return iter.init(_ii[i], _nn[i], fw, _zlimit);
     };
@@ -17446,9 +17446,14 @@
     var layers = layersArg.filter(getFeatureCount); // ignore empty layers
     var merged = {};
     opts = opts || {};
+    if (!layers.length && layersArg.length > 1) {
+      layers = layersArg; // merge all-empty layer sets
+    }
     if (!layers.length) return null;
     if (layers.length == 1) {
-      message('Use the target= option to specify multiple layers for merging');
+      if (layersArg.length == 1) {
+        message('Use the target= option to specify multiple layers for merging');
+      }
       return layers.concat();
     }
     merged.data = mergeDataFromLayers(layers, opts);
@@ -34262,7 +34267,8 @@ ${svg}
 
   var EOF; // undefined is used as an EOF marker
 
-  var RESERVE = 4096; // RESERVE is the number of bytes to keep in read buffer
+  // Default number of bytes to keep in the read buffer.
+  var RESERVE_DEFAULT = 4096;
   var BUFLEN = 1e7; // buffer chunk size
   var MAX_STRLEN = 5e6; // max byte len of a value string (object keys are shorter)
 
@@ -34295,12 +34301,10 @@ ${svg}
   function parseGeoJSON(reader, cb) {
     var src = ByteReader(reader, 0);
     var isObject = seekObjectStart(src);
-    var type;
     if (!isObject) {
       stop$1('File is not GeoJSON');
     }
-    type = readTopLevelType(src);
-    var obj = readObject(src, cb, type);
+    var obj = readObject(src, cb);
     if (obj.type == 'FeatureCollection' || obj.type == 'GeometryCollection') {
       return obj;
     }
@@ -34349,8 +34353,9 @@ ${svg}
 
   function seekObjectStart(src) {
     var c = src.getChar();
+    var reserve = src.getReserve();
     var i = 0;
-    while (c != EOF && i < RESERVE) {
+    while (c != EOF && i < reserve) {
       i++;
       if (c == LBRACE) {
         src.back();
@@ -34381,17 +34386,6 @@ ${svg}
     return arr;
   }
 
-  function skipArray(src) {
-    var c;
-    eatChar(src, LBRACK);
-    c = scanForSyntaxChar(src, RBRACK);
-    while (c != RBRACK) {
-      src.refresh();
-      skipValue(src);
-      c = scanForAorB(src, COMMA, RBRACK);
-    }
-  }
-
   function readCollectionArray(src, cb) {
     var c;
     eatChar(src, LBRACK);
@@ -34480,18 +34474,6 @@ ${svg}
     return val;
   }
 
-  function skipValue(src) {
-    var c = src.peek();
-    if (isFirstNumChar(c)) readNumber(src);
-    else if (c == LBRACK) skipArray(src);
-    else if (c == DQUOTE) readString(src);
-    else if (c == LBRACE) skipObject(src);
-    else if (c == 110) readNull(src); // "n" -> null
-    else if (c == 116) readTrue(src); // "t" -> true
-    else if (c == 102) readFalse(src); // "f" -> false
-    else unexpectedCharAt(c, src.index());
-  }
-
   function readTrue(src) {
     eatChars(src, 'true');
     return true;
@@ -34518,7 +34500,7 @@ ${svg}
 
   // cb: optional callback for returning GeoJSON features or geometries
   //
-  function readObject(src, cb, type) {
+  function readObject(src, cb) {
     var o = {};
     var key, c;
     eatChar(src, LBRACE);
@@ -34529,8 +34511,7 @@ ${svg}
       skipWS(src);
       eatChar(src, 58); // ":"
       skipWS(src);
-      if ((type == 'FeatureCollection' && key == 'features' ||
-          type == 'GeometryCollection' && key == 'geometries') &&
+      if ((key == 'features' || key == 'geometries') &&
           src.peek() == LBRACK && cb) {
         readCollectionArray(src, cb);
         o[key] = null;
@@ -34544,53 +34525,11 @@ ${svg}
     return o;
   }
 
-  function skipObject(src) {
-    var c;
-    eatChar(src, LBRACE);
-    c = scanForSyntaxChar(src, RBRACE);
-    while (c != RBRACE) {
-      src.refresh();
-      readKeywordString(src);
-      skipWS(src);
-      eatChar(src, 58); // ":"
-      skipWS(src);
-      skipValue(src);
-      c = scanForAorB(src, COMMA, RBRACE);
-    }
-  }
-
-  function readTopLevelType(src) {
-    var i = src.index();
-    var type, key, c;
-    eatChar(src, LBRACE);
-    c = scanForSyntaxChar(src, RBRACE);
-    while (c != RBRACE) {
-      src.refresh();
-      key = readKeywordString(src);
-      skipWS(src);
-      eatChar(src, 58); // ":"
-      skipWS(src);
-      if (key == 'type' && src.peek() == DQUOTE) {
-        type = readKeywordString(src);
-        break;
-      }
-      skipValue(src);
-      c = scanForAorB(src, COMMA, RBRACE);
-    }
-    src.index(i);
-    return type;
-  }
-
-  function growReserve() {
-    RESERVE *= 2;
-    return RESERVE <= MAX_STRLEN;
-  }
-
   // 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 readKeywordString(src) {
-    var MAXLEN = 2000; // must be less than RESERVE
+    var MAXLEN = 2000; // must be less than RESERVE_DEFAULT
     var i = src.index();
     var cache = src.cache;
     var escapeNext = false;
@@ -34648,7 +34587,7 @@ ${svg}
   // Fallback for reading long strings, escaped strings, non-ascii strings, etc.
   function readString_slow(src) {
     src.refresh();
-    var LIMIT = RESERVE - 2;
+    var LIMIT = src.getReserve() - 2;
     var i = src.index();
     var n = 0;
     var escapeNext = false;
@@ -34660,7 +34599,7 @@ ${svg}
       if (n > LIMIT) {
         // we've exceeded the number of reserved bytes
         // expand the limit and try reading this string again
-        if (c == EOF || !growReserve()) {
+        if (c == EOF || !src.growReserve()) {
           stringOverflow(i, c);
         }
         src.index(i);
@@ -34778,9 +34717,10 @@ ${svg}
   function ByteReader(reader, start) {
     var fileLen = reader.size();
     var bufOffs = start;
+    var reserve = RESERVE_DEFAULT; // per-instance reserve; may grow (see growReserve)
     var buf = reader.readSync(bufOffs, BUFLEN);
     var i = 0;
-    var obj = { peek, getChar, advance, back, toString, index, refresh };
+    var obj = { peek, getChar, advance, back, toString, index, refresh, getReserve, growReserve };
     obj.cache = []; // kludgy place to put the key cache
     refresh();
     return obj;
@@ -34788,14 +34728,14 @@ ${svg}
     // This function should be called to make sure that the buffer has enough
     // bytes remaining to read any reasonable JSON content.
     function refresh() {
-      // if RESERVE bytes are still available in the buffer, no update is required
-      if (buf.length - i >= RESERVE) return;
+      // if reserve bytes are still available in the buffer, no update is required
+      if (buf.length - i >= reserve) return;
 
       // CHANGE: now using undefined as an EOF marker, so a bounds check is unneeded
       // // if we're close to the end of the file, start checking for overflow
       // // (we don't do this all the time because the bounds check on every read
       // // causes a significant slowdown, as much as 20%)
-      // if (fileLen - (bufOffs + i) < RESERVE) {
+      // if (fileLen - (bufOffs + i) < reserve) {
       //   obj.peek = safePeek;
       //   obj.getChar = safeGetChar;
       // }
@@ -34803,11 +34743,18 @@ ${svg}
       // if buffer reaches the end of the file, no update is required
       if (bufOffs + buf.length >= fileLen) return;
 
-      // fewer than RESERVE bytes are unread in buffer -- update the buffer
+      // fewer than reserve bytes are unread in buffer -- update the buffer
       bufOffs += i;
       i = 0;
       buf = reader.readSync(bufOffs, BUFLEN);
     }
+    function getReserve() {
+      return reserve;
+    }
+    function growReserve() {
+      reserve *= 2;
+      return reserve <= MAX_STRLEN;
+    }
     function peek() {
       return buf[i];
     }
@@ -34822,6 +34769,9 @@ ${svg}
     }
     function index(idx) {
       if (idx >= 0 === false) return i + bufOffs;
+      if (idx < bufOffs || idx > bufOffs + buf.length) {
+        error('JSON parser seek out of buffer range');
+      }
       i = idx - bufOffs;
     }
     function toString(idx, n) {
@@ -45286,23 +45236,23 @@ ${svg}
       profileEnd('clipLayers');
       return result;
     }
+    if (!usingPathClip) {
+      result = clipLayersByClipDataset(targetLayers, clipDataset, type, opts);
+      profileEnd('clipLayers');
+      return result;
+    }
     profileStart('mergeLayersForOverlay');
     mergedDataset = mergeLayersForOverlay2(targetLayers, targetDataset, clipDataset);
     profileEnd('mergeLayersForOverlay');
     clipLyr = mergedDataset.layers[mergedDataset.layers.length-1];
-    if (usingPathClip) {
-      nodes = addIntersectionCuts(mergedDataset, opts);
-      noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
-      targetDataset.arcs = mergedDataset.arcs;
-      markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
-      profileStart('clipDissolvePolygonLayer2');
-      clipLyr = utils.defaults({data: null}, clipLyr);
-      clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
-      profileEnd('clipDissolvePolygonLayer2');
-
-    } else {
-      nodes = new NodeCollection(mergedDataset.arcs);
-    }
+    nodes = addIntersectionCuts(mergedDataset, opts);
+    noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
+    targetDataset.arcs = mergedDataset.arcs;
+    markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
+    profileStart('clipDissolvePolygonLayer2');
+    clipLyr = utils.defaults({data: null}, clipLyr);
+    clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
+    profileEnd('clipDissolvePolygonLayer2');
 
     profileStart('clipLayersByLayer');
     result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
@@ -45311,6 +45261,16 @@ ${svg}
     return result;
   }
 
+  function clipLayersByClipDataset(targetLayers, clipDataset, type, opts) {
+    var clipLyr = clipDataset.layers[0];
+    var nodes = new NodeCollection(clipDataset.arcs);
+    var result;
+    profileStart('clipLayersByLayer');
+    result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
+    profileEnd('clipLayersByLayer');
+    return result;
+  }
+
   function clipRasterLayers(targetLayers, clipSrc, targetDataset, type, opts) {
     var clipDataset, clipBounds, bbox;
     if (type != 'clip') {
@@ -58299,8 +58259,7 @@ ${svg}
           // TODO: consider replacing old layers as they are generated, for gc
           replaceLayers(targetDataset, targetLayers, outputLayers);
           // some operations leave unreferenced arcs that should be cleaned up
-          if ((name == 'clip' || name == 'erase' || name == 'rectangle' ||
-              name == 'rectangles' || name == 'filter' && opts.cleanup) && !opts.no_cleanup) {
+          if (commandNeedsArcDissolve(name, targetLayers, opts)) {
             dissolveArcs(targetDataset);
           }
         }
@@ -58347,7 +58306,15 @@ ${svg}
     });
   }
 
-  var version = "0.7.20";
+  function commandNeedsArcDissolve(name, targetLayers, opts) {
+    if (opts.no_cleanup) return false;
+    if (name == 'clip' || name == 'erase') {
+      return utils.some(targetLayers || [], layerHasPaths);
+    }
+    return name == 'rectangle' || name == 'rectangles' || name == 'filter' && opts.cleanup;
+  }
+
+  var version = "0.7.22";
 
   // 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.7.20",
+  "version": "0.7.22",
   "description": "A tool for editing geospatial data for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/mapshaper-gui.js

@@ -17024,6 +17024,9 @@
     }
 
     function selectStyleFeature(id, e) {
+      if (selectionIds.includes(id)) {
+        return utils$1.difference(selectionIds, [id]);
+      }
       return eventUsesAdditiveSelection(e) ?
         toggleId(id, selectionIds) :
         [id];

package/www/mapshaper.js

@@ -7417,7 +7417,7 @@
           i = fw ? arcId : ~arcId,
           iter = _zz && _zlimit ? _filteredArcIter : _arcIter;
       if (i >= _nn.length) {
-        error("#getArcId() out-of-range arc id:", arcId);
+        error("#getArcId() out-of-range arc id:", arcId, `(max id: ${_nn.length - 1})`);
       }
       return iter.init(_ii[i], _nn[i], fw, _zlimit);
     };
@@ -17446,9 +17446,14 @@
     var layers = layersArg.filter(getFeatureCount); // ignore empty layers
     var merged = {};
     opts = opts || {};
+    if (!layers.length && layersArg.length > 1) {
+      layers = layersArg; // merge all-empty layer sets
+    }
     if (!layers.length) return null;
     if (layers.length == 1) {
-      message('Use the target= option to specify multiple layers for merging');
+      if (layersArg.length == 1) {
+        message('Use the target= option to specify multiple layers for merging');
+      }
       return layers.concat();
     }
     merged.data = mergeDataFromLayers(layers, opts);
@@ -34262,7 +34267,8 @@ ${svg}
 
   var EOF; // undefined is used as an EOF marker
 
-  var RESERVE = 4096; // RESERVE is the number of bytes to keep in read buffer
+  // Default number of bytes to keep in the read buffer.
+  var RESERVE_DEFAULT = 4096;
   var BUFLEN = 1e7; // buffer chunk size
   var MAX_STRLEN = 5e6; // max byte len of a value string (object keys are shorter)
 
@@ -34295,12 +34301,10 @@ ${svg}
   function parseGeoJSON(reader, cb) {
     var src = ByteReader(reader, 0);
     var isObject = seekObjectStart(src);
-    var type;
     if (!isObject) {
       stop$1('File is not GeoJSON');
     }
-    type = readTopLevelType(src);
-    var obj = readObject(src, cb, type);
+    var obj = readObject(src, cb);
     if (obj.type == 'FeatureCollection' || obj.type == 'GeometryCollection') {
       return obj;
     }
@@ -34349,8 +34353,9 @@ ${svg}
 
   function seekObjectStart(src) {
     var c = src.getChar();
+    var reserve = src.getReserve();
     var i = 0;
-    while (c != EOF && i < RESERVE) {
+    while (c != EOF && i < reserve) {
       i++;
       if (c == LBRACE) {
         src.back();
@@ -34381,17 +34386,6 @@ ${svg}
     return arr;
   }
 
-  function skipArray(src) {
-    var c;
-    eatChar(src, LBRACK);
-    c = scanForSyntaxChar(src, RBRACK);
-    while (c != RBRACK) {
-      src.refresh();
-      skipValue(src);
-      c = scanForAorB(src, COMMA, RBRACK);
-    }
-  }
-
   function readCollectionArray(src, cb) {
     var c;
     eatChar(src, LBRACK);
@@ -34480,18 +34474,6 @@ ${svg}
     return val;
   }
 
-  function skipValue(src) {
-    var c = src.peek();
-    if (isFirstNumChar(c)) readNumber(src);
-    else if (c == LBRACK) skipArray(src);
-    else if (c == DQUOTE) readString(src);
-    else if (c == LBRACE) skipObject(src);
-    else if (c == 110) readNull(src); // "n" -> null
-    else if (c == 116) readTrue(src); // "t" -> true
-    else if (c == 102) readFalse(src); // "f" -> false
-    else unexpectedCharAt(c, src.index());
-  }
-
   function readTrue(src) {
     eatChars(src, 'true');
     return true;
@@ -34518,7 +34500,7 @@ ${svg}
 
   // cb: optional callback for returning GeoJSON features or geometries
   //
-  function readObject(src, cb, type) {
+  function readObject(src, cb) {
     var o = {};
     var key, c;
     eatChar(src, LBRACE);
@@ -34529,8 +34511,7 @@ ${svg}
       skipWS(src);
       eatChar(src, 58); // ":"
       skipWS(src);
-      if ((type == 'FeatureCollection' && key == 'features' ||
-          type == 'GeometryCollection' && key == 'geometries') &&
+      if ((key == 'features' || key == 'geometries') &&
           src.peek() == LBRACK && cb) {
         readCollectionArray(src, cb);
         o[key] = null;
@@ -34544,53 +34525,11 @@ ${svg}
     return o;
   }
 
-  function skipObject(src) {
-    var c;
-    eatChar(src, LBRACE);
-    c = scanForSyntaxChar(src, RBRACE);
-    while (c != RBRACE) {
-      src.refresh();
-      readKeywordString(src);
-      skipWS(src);
-      eatChar(src, 58); // ":"
-      skipWS(src);
-      skipValue(src);
-      c = scanForAorB(src, COMMA, RBRACE);
-    }
-  }
-
-  function readTopLevelType(src) {
-    var i = src.index();
-    var type, key, c;
-    eatChar(src, LBRACE);
-    c = scanForSyntaxChar(src, RBRACE);
-    while (c != RBRACE) {
-      src.refresh();
-      key = readKeywordString(src);
-      skipWS(src);
-      eatChar(src, 58); // ":"
-      skipWS(src);
-      if (key == 'type' && src.peek() == DQUOTE) {
-        type = readKeywordString(src);
-        break;
-      }
-      skipValue(src);
-      c = scanForAorB(src, COMMA, RBRACE);
-    }
-    src.index(i);
-    return type;
-  }
-
-  function growReserve() {
-    RESERVE *= 2;
-    return RESERVE <= MAX_STRLEN;
-  }
-
   // 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 readKeywordString(src) {
-    var MAXLEN = 2000; // must be less than RESERVE
+    var MAXLEN = 2000; // must be less than RESERVE_DEFAULT
     var i = src.index();
     var cache = src.cache;
     var escapeNext = false;
@@ -34648,7 +34587,7 @@ ${svg}
   // Fallback for reading long strings, escaped strings, non-ascii strings, etc.
   function readString_slow(src) {
     src.refresh();
-    var LIMIT = RESERVE - 2;
+    var LIMIT = src.getReserve() - 2;
     var i = src.index();
     var n = 0;
     var escapeNext = false;
@@ -34660,7 +34599,7 @@ ${svg}
       if (n > LIMIT) {
         // we've exceeded the number of reserved bytes
         // expand the limit and try reading this string again
-        if (c == EOF || !growReserve()) {
+        if (c == EOF || !src.growReserve()) {
           stringOverflow(i, c);
         }
         src.index(i);
@@ -34778,9 +34717,10 @@ ${svg}
   function ByteReader(reader, start) {
     var fileLen = reader.size();
     var bufOffs = start;
+    var reserve = RESERVE_DEFAULT; // per-instance reserve; may grow (see growReserve)
     var buf = reader.readSync(bufOffs, BUFLEN);
     var i = 0;
-    var obj = { peek, getChar, advance, back, toString, index, refresh };
+    var obj = { peek, getChar, advance, back, toString, index, refresh, getReserve, growReserve };
     obj.cache = []; // kludgy place to put the key cache
     refresh();
     return obj;
@@ -34788,14 +34728,14 @@ ${svg}
     // This function should be called to make sure that the buffer has enough
     // bytes remaining to read any reasonable JSON content.
     function refresh() {
-      // if RESERVE bytes are still available in the buffer, no update is required
-      if (buf.length - i >= RESERVE) return;
+      // if reserve bytes are still available in the buffer, no update is required
+      if (buf.length - i >= reserve) return;
 
       // CHANGE: now using undefined as an EOF marker, so a bounds check is unneeded
       // // if we're close to the end of the file, start checking for overflow
       // // (we don't do this all the time because the bounds check on every read
       // // causes a significant slowdown, as much as 20%)
-      // if (fileLen - (bufOffs + i) < RESERVE) {
+      // if (fileLen - (bufOffs + i) < reserve) {
       //   obj.peek = safePeek;
       //   obj.getChar = safeGetChar;
       // }
@@ -34803,11 +34743,18 @@ ${svg}
       // if buffer reaches the end of the file, no update is required
       if (bufOffs + buf.length >= fileLen) return;
 
-      // fewer than RESERVE bytes are unread in buffer -- update the buffer
+      // fewer than reserve bytes are unread in buffer -- update the buffer
       bufOffs += i;
       i = 0;
       buf = reader.readSync(bufOffs, BUFLEN);
     }
+    function getReserve() {
+      return reserve;
+    }
+    function growReserve() {
+      reserve *= 2;
+      return reserve <= MAX_STRLEN;
+    }
     function peek() {
       return buf[i];
     }
@@ -34822,6 +34769,9 @@ ${svg}
     }
     function index(idx) {
       if (idx >= 0 === false) return i + bufOffs;
+      if (idx < bufOffs || idx > bufOffs + buf.length) {
+        error('JSON parser seek out of buffer range');
+      }
       i = idx - bufOffs;
     }
     function toString(idx, n) {
@@ -45286,23 +45236,23 @@ ${svg}
       profileEnd('clipLayers');
       return result;
     }
+    if (!usingPathClip) {
+      result = clipLayersByClipDataset(targetLayers, clipDataset, type, opts);
+      profileEnd('clipLayers');
+      return result;
+    }
     profileStart('mergeLayersForOverlay');
     mergedDataset = mergeLayersForOverlay2(targetLayers, targetDataset, clipDataset);
     profileEnd('mergeLayersForOverlay');
     clipLyr = mergedDataset.layers[mergedDataset.layers.length-1];
-    if (usingPathClip) {
-      nodes = addIntersectionCuts(mergedDataset, opts);
-      noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
-      targetDataset.arcs = mergedDataset.arcs;
-      markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
-      profileStart('clipDissolvePolygonLayer2');
-      clipLyr = utils.defaults({data: null}, clipLyr);
-      clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
-      profileEnd('clipDissolvePolygonLayer2');
-
-    } else {
-      nodes = new NodeCollection(mergedDataset.arcs);
-    }
+    nodes = addIntersectionCuts(mergedDataset, opts);
+    noteDatasetWillChange(targetDataset, {operation: type, unit: 'arcs'});
+    targetDataset.arcs = mergedDataset.arcs;
+    markDatasetChanged(targetDataset, {operation: type, unit: 'arcs'});
+    profileStart('clipDissolvePolygonLayer2');
+    clipLyr = utils.defaults({data: null}, clipLyr);
+    clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
+    profileEnd('clipDissolvePolygonLayer2');
 
     profileStart('clipLayersByLayer');
     result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
@@ -45311,6 +45261,16 @@ ${svg}
     return result;
   }
 
+  function clipLayersByClipDataset(targetLayers, clipDataset, type, opts) {
+    var clipLyr = clipDataset.layers[0];
+    var nodes = new NodeCollection(clipDataset.arcs);
+    var result;
+    profileStart('clipLayersByLayer');
+    result = clipLayersByLayer(targetLayers, clipLyr, nodes, type, opts);
+    profileEnd('clipLayersByLayer');
+    return result;
+  }
+
   function clipRasterLayers(targetLayers, clipSrc, targetDataset, type, opts) {
     var clipDataset, clipBounds, bbox;
     if (type != 'clip') {
@@ -58299,8 +58259,7 @@ ${svg}
           // TODO: consider replacing old layers as they are generated, for gc
           replaceLayers(targetDataset, targetLayers, outputLayers);
           // some operations leave unreferenced arcs that should be cleaned up
-          if ((name == 'clip' || name == 'erase' || name == 'rectangle' ||
-              name == 'rectangles' || name == 'filter' && opts.cleanup) && !opts.no_cleanup) {
+          if (commandNeedsArcDissolve(name, targetLayers, opts)) {
             dissolveArcs(targetDataset);
           }
         }
@@ -58347,7 +58306,15 @@ ${svg}
     });
   }
 
-  var version = "0.7.20";
+  function commandNeedsArcDissolve(name, targetLayers, opts) {
+    if (opts.no_cleanup) return false;
+    if (name == 'clip' || name == 'erase') {
+      return utils.some(targetLayers || [], layerHasPaths);
+    }
+    return name == 'rectangle' || name == 'rectangles' || name == 'filter' && opts.cleanup;
+  }
+
+  var version = "0.7.22";
 
   // 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.