mapshaper 0.5.117 → 0.6.2

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.117";
+  var VERSION = "0.6.2";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -28,7 +28,7 @@
     get regexEscape () { return regexEscape; },
     get htmlEscape () { return htmlEscape; },
     get defaults () { return defaults; },
-    get extend () { return extend; },
+    get extend () { return extend$1; },
     get inherit () { return inherit; },
     get reduceAsync () { return reduceAsync; },
     get merge () { return merge; },
@@ -132,7 +132,8 @@
     clearStash: clearStash
   });
 
-  var Buffer = require('buffer').Buffer; // works with browserify
+  // Fall back to browserify's Buffer polyfill
+  var B$3 = typeof Buffer != 'undefined' ? Buffer : require('buffer').Buffer;
 
   var uniqCount = 0;
   function getUniqueName(prefix) {
@@ -257,7 +258,7 @@
     '/': '/'
   };
   function htmlEscape(s) {
-    return String(s).replace(/[&<>"'\/]/g, function(s) {
+    return String(s).replace(/[&<>"'/]/g, function(s) {
       return entityMap[s];
     });
   }
@@ -274,7 +275,7 @@
     return dest;
   }
 
-  function extend(o) {
+  function extend$1(o) {
     var dest = o || {},
         n = arguments.length,
         key, i, src;
@@ -311,7 +312,7 @@
     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 = extend$1(new f(), targ.prototype); //
     targ.prototype.constructor = targ;
     targ.prototype.__super__ = f;
   }
@@ -900,8 +901,8 @@
     var type = matches[4];
     var isString = type == 's',
         isHex = type == 'x' || type == 'X',
-        isInt = type == 'd' || type == 'i',
-        isFloat = type == 'f',
+        // isInt = type == 'd' || type == 'i',
+        // isFloat = type == 'f',
         isNumber = !isString;
 
     var sign = "",
@@ -960,7 +961,7 @@
 
   // Get a function for interpolating formatted values into a string.
   function formatter(fmt) {
-    var codeRxp = /%([\',+0]*)([1-9]?)((?:\.[1-9])?)([sdifxX%])/g;
+    var codeRxp = /%([',+0]*)([1-9]?)((?:\.[1-9])?)([sdifxX%])/g;
     var literals = [],
         formatCodes = [],
         startIdx = 0,
@@ -1004,10 +1005,10 @@
 
   function createBuffer(arg, arg2) {
     if (isInteger(arg)) {
-      return Buffer.allocUnsafe ? Buffer.allocUnsafe(arg) : new Buffer(arg);
+      return B$3.allocUnsafe ? B$3.allocUnsafe(arg) : new B$3(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);
+      return B$3.from && B$3.allocUnsafe ? B$3.from(arg, arg2) : new B$3(arg, arg2);
     }
   }
 
@@ -3513,10 +3514,31 @@
     findMaxPartCount: findMaxPartCount
   });
 
+  // Several dependencies are loaded via require() ... this module returns a
+  // stub function when require() does not exist as a global function,
+  // to avoid runtime errors (this should only happen in some tests when single
+  // modules are imported)
+  var f;
+  if (typeof require == 'function') {
+    f = require;
+  } else {
+    f = function() {
+      // console.error('Unable to load module', name);
+    };
+  }
+  var require$1 = f;
+
+  // import { createRequire } from "module";
+
+  var iconv = require$1('iconv-lite');
+
+  // import iconv from 'iconv-lite';
+  // import * as iconv from 'iconv-lite';
+  // import * as iconv from '../../node_modules/iconv-lite/lib/index.js';
+
   // 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');
 
@@ -3587,7 +3609,7 @@
     }
     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);
+      return encoder ? B$3.from(encoder.encode(str).buffer) : utils.createBuffer(str, enc);
     };
   }
 
@@ -4332,17 +4354,18 @@
     this.ty -= cy * (sy - 1);
   };
 
+  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.
   // @mainParams: parameters for main projection, including:
   //    proj: Proj string
   //    bbox: lat-lon bounding box
   function MixedProjection(mainParams, options) {
-    var mproj = require('mproj');
     var mainFrame = initFrame(mainParams);
     var mainP = mainFrame.crs;
     var frames = [mainFrame];
-    var mixedP = initMixedProjection(mproj);
+    var mixedP = initMixedProjection(mproj$1);
 
     // This CRS masquerades as the main projection... the version with
     // custom insets is exposed to savvy users
@@ -4386,7 +4409,7 @@
     function initFrame(params) {
       return {
         bounds: new Bounds(bboxToRadians(params.bbox)),
-        crs:  mproj.pj_init(params.proj)
+        crs:  mproj$1.pj_init(params.proj)
       };
     }
 
@@ -4398,7 +4421,7 @@
     }
 
     function projectFrameOrigin(origin, P) {
-      var xy = mproj.pj_fwd_deg({lam: origin[0], phi: origin[1]}, P);
+      var xy = mproj$1.pj_fwd_deg({lam: origin[0], phi: origin[1]}, P);
       return [xy.x, xy.y];
     }
 
@@ -4407,7 +4430,7 @@
       for (var i=0, n=frames.length; i<n; i++) {
         frame = frames[i];
         if (frame.bounds.containsPoint(lp.lam, lp.phi)) {
-          xy2 = mproj.pj_fwd(lp, frame.crs);
+          xy2 = mproj$1.pj_fwd(lp, frame.crs);
           if (frame.matrix) {
             frame.matrix.transformXY(xy2.x, xy2.y, xy2);
           }
@@ -4610,13 +4633,15 @@
     getAntimeridian: getAntimeridian
   });
 
+  var mproj = require$1('mproj');
+
   var asyncLoader = null;
 
   var projectionAliases = {
     robinson: '+proj=robin +datum=WGS84',
     webmercator: '+proj=merc +a=6378137 +b=6378137',
     wgs84: '+proj=longlat +datum=WGS84',
-    albersusa: new AlbersUSA() // with default parameters
+    albersusa: AlbersUSA
   };
 
   // This stub is replaced when loaded in GUI, which may need to load some files
@@ -4640,7 +4665,6 @@
   // if the transformation fails
   // src, dest: proj4 objects
   function getProjTransform(src, dest) {
-    var mproj = require('mproj');
     var clampSrc = isLatLngCRS(src);
     dest = dest.__mixed_crs || dest;
     return function(x, y) {
@@ -4659,8 +4683,7 @@
   // Same as getProjTransform(), but return null if projection fails
   // (also faster)
   function getProjTransform2(src, dest) {
-    var mproj = require('mproj'),
-        xx = [0],
+    var xx = [0],
         yy = [0],
         preK = src.is_latlong ? mproj.internal.DEG_TO_RAD : 1,
         postK = dest.is_latlong ? mproj.internal.RAD_TO_DEG : 1,
@@ -4707,13 +4730,13 @@
   }
 
   function crsToProj4(P) {
-    return require('mproj').internal.get_proj_defn(P);
+    return mproj.internal.get_proj_defn(P);
   }
 
   function crsToPrj(P) {
     var wkt;
     try {
-      wkt = require('mproj').internal.wkt_from_proj4(P);
+      wkt = mproj.internal.wkt_from_proj4(P);
     } catch(e) {
       // console.log(e)
     }
@@ -4725,8 +4748,11 @@
     return !!str && str == crsToProj4(b);
   }
 
+  function isProjAlias(str) {
+    return str in projectionAliases;
+  }
+
   function getProjDefn(str) {
-    var mproj = require('mproj');
     var defn;
     // prepend '+proj=' to bare proj names
     str = str.replace(/(^| )([\w]+)($| )/, function(a, b, c, d) {
@@ -4737,8 +4763,11 @@
     });
     if (looksLikeProj4String(str)) {
       defn = str;
-    } else if (str in projectionAliases) {
-      defn = projectionAliases[str];  // defn is a function
+    } else if (isProjAlias(str)) {
+      defn = projectionAliases[str];
+      if (utils.isFunction(defn)) {
+        defn = defn();
+      }
     } else if (looksLikeInitString(str)) {
       defn = '+init=' + str.toLowerCase();
     } else if (str in (getStashedVar('defs') || {})) {
@@ -4768,7 +4797,7 @@
       P = defn;
     } else {
       try {
-        P = require('mproj').pj_init(defn);
+        P = mproj.pj_init(defn);
       } catch(e) {
         stop('Unable to use projection', defn, '(' + e.message + ')');
       }
@@ -4822,10 +4851,9 @@
   // x, y: a point location in projected coordinates
   // Returns k, the ratio of coordinate distance to distance on the ground
   function getScaleFactorAtXY(x, y, crs) {
-    var proj = require('mproj');
     var dist = 1;
-    var lp = proj.pj_inv_deg({x: x, y: y}, crs);
-    var lp2 = proj.pj_inv_deg({x: x + dist, y: y}, crs);
+    var lp = mproj.pj_inv_deg({x: x, y: y}, crs);
+    var lp2 = mproj.pj_inv_deg({x: x + dist, y: y}, crs);
     var k = dist / geom.greatCircleDistance(lp.lam, lp.phi, lp2.lam, lp2.phi);
     return k;
   }
@@ -4863,7 +4891,7 @@
   }
 
   function printProjections() {
-    var index = require('mproj').internal.pj_list;
+    var index = mproj.internal.pj_list;
     var msg = 'Proj4 projections\n';
     Object.keys(index).sort().forEach(function(id) {
       msg += '  ' + utils.rpad(id, 7, ' ') + '  ' + index[id].name + '\n';
@@ -4878,7 +4906,7 @@
   function translatePrj(str) {
     var proj4;
     try {
-      proj4 = require('mproj').internal.wkt_to_proj4(str);
+      proj4 = mproj.internal.wkt_to_proj4(str);
     } catch(e) {
       stop('Unusable .prj file (' + e.message + ')');
     }
@@ -4902,6 +4930,7 @@
     crsToProj4: crsToProj4,
     crsToPrj: crsToPrj,
     crsAreEqual: crsAreEqual,
+    isProjAlias: isProjAlias,
     getProjDefn: getProjDefn,
     looksLikeProj4String: looksLikeProj4String,
     getCRS: getCRS,
@@ -6450,12 +6479,12 @@
     // Accessor function for arcs
     Object.defineProperty(this, 'arcs', {value: arcs});
 
-    var toArray = this.toArray = function() {
+    this.toArray = function() {
       var chains = getNodeChains(),
           flags = new Uint8Array(chains.length),
           arr = [];
       utils.forEach(chains, function(nextIdx, thisIdx) {
-        var node, x, y, p;
+        var node, p;
         if (flags[thisIdx] == 1) return;
         p = getEndpoint(thisIdx);
         if (!p) return; // endpoints of an excluded arc
@@ -7034,7 +7063,7 @@
     return typeof window !== 'undefined' && typeof window.document !== 'undefined';
   }
 
-  var State = /*#__PURE__*/Object.freeze({
+  var Env = /*#__PURE__*/Object.freeze({
     __proto__: null,
     runningInBrowser: runningInBrowser
   });
@@ -7145,13 +7174,13 @@
       content = cache[fname];
       delete cache[fname];
     } else if (fname == '/dev/stdin') {
-      content = require('rw').readFileSync(fname);
+      content = require$1('rw').readFileSync(fname);
     } else {
       // kludge to prevent overwriting of input files
       (getStashedVar('input_files') || []).push(fname);
-      content = require('fs').readFileSync(fname);
+      content = require$1('fs').readFileSync(fname);
     }
-    if (encoding && Buffer.isBuffer(content)) {
+    if (encoding && B$3.isBuffer(content)) {
       content = trimBOM(decodeString(content, encoding));
     }
     return content;
@@ -7161,7 +7190,7 @@
     var odir = parseLocalPath(fname).directory;
     if (!odir || cli.isDirectory(odir) || fname == '/dev/stdout') return;
     try {
-      require('fs').mkdirSync(odir, {recursive: true});
+      require$1('fs').mkdirSync(odir, {recursive: true});
       message('Created output directory:', odir);
     } catch(e) {
       stop('Unable to create output directory:', odir);
@@ -7170,7 +7199,7 @@
 
   // content: Buffer or string
   cli.writeFile = function(fname, content, cb) {
-    var fs = require('rw');
+    var fs = require$1('rw');
     cli.createDirIfNeeded(fname);
     if (cb) {
       fs.writeFile(fname, content, cb);
@@ -7198,8 +7227,8 @@
         files = [];
 
     try {
-      require('fs').readdirSync(dir).forEach(function(item) {
-        var path = require('path').join(dir, item);
+      require$1('fs').readdirSync(dir).forEach(function(item) {
+        var path = require$1('path').join(dir, item);
         if (rxp.test(item) && cli.isFile(path)) {
           files.push(path);
         }
@@ -7241,7 +7270,7 @@
   cli.statSync = function(fpath) {
     var obj = null;
     try {
-      obj = require('fs').statSync(fpath);
+      obj = require$1('fs').statSync(fpath);
     } catch(e) {}
     return obj;
   };
@@ -7293,7 +7322,7 @@
     var odir = opts.directory;
     if (odir) {
       files = files.map(function(file) {
-        return require('path').join(odir, file);
+        return require$1('path').join(odir, file);
       });
     }
     return files;
@@ -7315,7 +7344,7 @@
       // Unlike rbush, flatbush doesn't allow size 0 indexes; workaround
       return function() {return [];};
     }
-    Flatbush = require('flatbush');
+    Flatbush = require$1('flatbush');
     index = new Flatbush(boxes.length);
     boxes.forEach(function(ring) {
       var b = ring.bounds;
@@ -8791,10 +8820,10 @@
 
   // Returns undefined if not found
   function lookupColorName(str) {
-    return colors[str.toLowerCase().replace(/[ -]+/g, '')];
+    return colors$1[str.toLowerCase().replace(/[ -]+/g, '')];
   }
 
-  var colors = {
+  var colors$1 = {
     aliceblue: '#f0f8ff',
     antiquewhite: '#faebd7',
     aqua: '#00ffff',
@@ -12030,10 +12059,6 @@
   //   if point x,y falls on an endpoint
   // Assumes: i <= j
   function getCutPoint(x, y, i, j, xx, yy) {
-    var ix = xx[i],
-        iy = yy[i],
-        jx = xx[j],
-        jy = yy[j];
     if (j < i || j > i + 1) {
       error("Out-of-sequence arc ids:", i, j);
     }
@@ -13376,7 +13401,7 @@
       memo.push(buf);
       return memo;
     }, []);
-    return Buffer.concat(parts);
+    return B$3.concat(parts);
   };
 
   // collection: an array of individual GeoJSON Features or geometries as strings or buffers
@@ -13398,7 +13423,7 @@
       return memo;
     }, [utils.createBuffer(head, 'utf8')]);
     parts.push(utils.createBuffer(tail, 'utf8'));
-    return Buffer.concat(parts);
+    return B$3.concat(parts);
   };
 
   // export GeoJSON or TopoJSON point geometry
@@ -14019,18 +14044,18 @@
     // accept variations on type names (dot, dots, square, squares, hatch, hatches, hatched)
     if (first.startsWith('dot')) {
       parts[0] = 'dots';
-      obj = parseDots(parts, str);
+      obj = parseDots(parts);
     } else if (first.startsWith('square')) {
       parts[0] = 'squares';
-      obj = parseDots(parts, str);
+      obj = parseDots(parts);
     } else if (first.startsWith('hatch')) {
       parts[0] = 'hatches';
-      obj = parseHatches(parts, str);
+      obj = parseHatches(parts);
     } else if (first.startsWith('dash')) {
-      obj = parseDashes(parts, str);
+      obj = parseDashes(parts);
     } else if (!isNaN(parseFloat(first))) {
       parts.unshift('hatches');
-      obj = parseHatches(parts, str); // hatches is the default, name can be omitted
+      obj = parseHatches(parts); // hatches is the default, name can be omitted
     }
     if (!obj) {
       // consider
@@ -14039,7 +14064,7 @@
     return obj;
   }
 
-  function parseDashes(parts, str) {
+  function parseDashes(parts) {
     // format:
     // "dashes" dash-len dash-space width color1 [color2...] space bg-color
     // examples:
@@ -14080,7 +14105,7 @@
     };
   }
 
-  function parseHatches(parts, str) {
+  function parseHatches(parts) {
     // format:
     // [hatches] [rotation] width1 color1 [width2 color2 ...]
     // examples:
@@ -14107,7 +14132,7 @@
     return parseInt(str) > 0;
   }
 
-  function parseDots(parts, str) {
+  function parseDots(parts) {
     // format:
     // "dots"|"squares" [rotation] size color1 [color2 ...] spacing bg-color
     // examples:
@@ -14271,6 +14296,7 @@
     'stroke-opacity': 'number',
     'stroke-miterlimit': 'number',
     'fill-opacity': 'number',
+    'vector-effect': null,
     'text-anchor': null
   };
 
@@ -14300,7 +14326,7 @@
     effect: null // e.g. "fade"
   }, stylePropertyTypes);
 
-  var commonProperties = 'css,class,opacity,stroke,stroke-width,stroke-dasharray,stroke-opacity,fill-opacity'.split(',');
+  var commonProperties = 'css,class,opacity,stroke,stroke-width,stroke-dasharray,stroke-opacity,fill-opacity,vector-effect'.split(',');
 
   var propertiesBySymbolType = {
     polygon: utils.arrayToIndex(commonProperties.concat('fill', 'fill-pattern')),
@@ -14380,7 +14406,7 @@
   function mightBeExpression(str, fields) {
     fields = fields || [];
     if (fields.indexOf(str.trim()) > -1) return true;
-    return /[(){}./*?:&|=\[+-]/.test(str);
+    return /[(){}./*?:&|=[+-]/.test(str);
   }
 
   function getSymbolPropertyAccessor(val, svgName, lyr) {
@@ -14507,7 +14533,7 @@
 
   function importGeoJSONFeatures(features, opts) {
     opts = opts || {};
-    return features.map(function(obj, i) {
+    return features.map(function(obj) {
       var geom = obj.type == 'Feature' ? obj.geometry : obj; // could be null
       var geomType = geom && geom.type;
       var msType = GeoJSON.translateGeoJSONType(geomType);
@@ -14823,7 +14849,7 @@
   }
 
   // polyline coords are like GeoJSON MultiLineString coords: an array of 0 or more paths
-  function polyline(d, x, y) {
+  function polyline(d) {
     var coords = d.coordinates || [];
     var o = importMultiLineString(coords);
     applyStyleAttributes(o, 'polyline', d);
@@ -14831,7 +14857,7 @@
   }
 
   // polygon coords are an array of rings (and holes), like flattened MultiPolygon coords
-  function polygon(d, x, y) {
+  function polygon(d) {
     var coords = d.coordinates || [];
     var o = importPolygon(coords);
     applyStyleAttributes(o, 'polygon', d);
@@ -15175,7 +15201,7 @@
   var cache = {};
   function fetchFileSync(url) {
     if (url in cache) return cache[url];
-    var res  = require('sync-request')('GET', url, {timeout: 2000});
+    var res  = require$1('sync-request')('GET', url, {timeout: 2000});
     var content = res.getBody().toString();
     cache[url] = content;
     return content;
@@ -15246,8 +15272,8 @@
     var content;
     if (href.indexOf('http') === 0) {
       content = fetchFileSync(href);
-    } else if (require('fs').existsSync(href)) {
-      content = require('fs').readFileSync(href, 'utf8');
+    } else if (require$1('fs').existsSync(href)) {
+      content = require$1('fs').readFileSync(href, 'utf8');
     } else {
       stop("Invalid SVG location:", href);
     }
@@ -15378,7 +15404,6 @@ ${svg}
     var geojson = exportDatasetAsGeoJSON(d, opts);
     var features = geojson.features || geojson.geometries || (geojson.type ? [geojson] : []);
     var children = importGeoJSONFeatures(features, opts);
-    var data;
     if (opts.svg_data && lyr.data) {
       addDataAttributesToSVG(children, lyr.data, opts.svg_data);
     }
@@ -15558,12 +15583,13 @@ ${svg}
   function BinArray(buf, le) {
     if (utils.isNumber(buf)) {
       buf = new ArrayBuffer(buf);
-    } else if (typeof Buffer == 'function' && buf instanceof Buffer) {
+    } else if (buf instanceof ArrayBuffer) {
+      // we're good
+    } else if (typeof B$3 == 'function' && buf instanceof B$3) {
       // Since node 0.10, DataView constructor doesn't accept Buffers,
       //   so need to copy Buffer to ArrayBuffer
       buf = BinArray.toArrayBuffer(buf);
-    }
-    if (buf instanceof ArrayBuffer == false) {
+    } else {
       error("BinArray constructor takes an integer, ArrayBuffer or Buffer argument");
     }
     this._buffer = buf;
@@ -16306,7 +16332,7 @@ ${svg}
     return readFixedWidthRecordsFromString(str, opts);
   }
 
-  function readFixedWidthRecordsFromString(str, ops) {
+  function readFixedWidthRecordsFromString(str) {
     var fields = parseFixedWidthInfo(str.substring(0, 2000));
     if (!fields) return [];
     var lines = utils.splitLines(str);
@@ -16442,7 +16468,7 @@ ${svg}
         buffers.push(encodeString(str, encoding));
       }
     }
-    return Buffer.concat(buffers);
+    return B$3.concat(buffers);
   }
 
   function formatHeader(fields, formatRow) {
@@ -16453,11 +16479,6 @@ ${svg}
     return formatRow(rec);
   }
 
-  function formatDelimHeader(fields, delim) {
-    var formatValue = getDelimValueFormatter(delim);
-    return fields.map(formatValue).join(delim);
-  }
-
   function getDelimRowFormatter(fields, delim, opts) {
     var formatValue = getDelimValueFormatter(delim, opts);
     return function(rec) {
@@ -17215,7 +17236,7 @@ ${svg}
   function guessInputFileType(file) {
     var ext = getFileExtension(file || '').toLowerCase(),
         type = null;
-    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml') {
+    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml' || ext == 'cpg') {
       type = ext;
     } else if (/json$/.test(ext)) {
       type = 'json';
@@ -17659,7 +17680,7 @@ ${svg}
   }
 
   function FileReader(path, opts) {
-    var fs = require('fs'),
+    var fs = require$1('fs'),
         fileLen = fs.statSync(path).size,
         DEFAULT_CACHE_LEN = opts && opts.cacheSize || 0x1000000, // 16MB
         DEFAULT_BUFFER_LEN = opts && opts.bufferSize || 0x40000, // 256K
@@ -18140,8 +18161,7 @@ ${svg}
   // @chars String of chars to look for in @str
   function getCharScore(str, chars) {
     var index = {},
-        count = 0,
-        score;
+        count = 0;
     str = str.toLowerCase();
     for (var i=0, n=chars.length; i<n; i++) {
       index[chars[i]] = 1;
@@ -18162,7 +18182,7 @@ ${svg}
     // TODO: remove duplication with importJSON()
     var readFromFile = !data.content && data.content !== '',
         content = data.content,
-        filter, reader, records, delimiter, table, encoding;
+        reader, records, delimiter, table, encoding;
     opts = opts || {};
 
     // // read content of all but very large files into a buffer
@@ -18173,7 +18193,7 @@ ${svg}
 
     if (readFromFile) {
       reader = new FileReader(data.filename);
-    } else if (content instanceof ArrayBuffer || content instanceof Buffer) {
+    } else if (content instanceof ArrayBuffer || content instanceof B$3) {
       // Web API may import as ArrayBuffer, to support larger files
       reader = new BufferReader(content);
       content = null;
@@ -18404,43 +18424,19 @@ ${svg}
       }
     }
 
-    // var intervalStr = o.interval;
-    // if (intervalStr) {
-    //   o.interval = Number(intervalStr);
-    //   if (o.interval >= 0 === false) {
-    //     error(utils.format("Out-of-range interval value: %s", intervalStr));
-    //   }
-    // }
-
     if (!o.interval && !o.percentage && !o.resolution) {
       error("Command requires an interval, percentage or resolution parameter");
     }
   }
 
   function validateProjOpts(cmd) {
-    var _ = cmd._,
-        proj4 = [];
+    var _ = cmd._;
 
     if (_.length > 0 && !cmd.options.crs) {
       cmd.options.crs = _.join(' ');
       _ = [];
     }
 
-    // separate proj4 options
-    // _ = _.filter(function(arg) {
-    //   if (/^\+[a-z]/i.test(arg)) {
-    //     proj4.push(arg);
-    //     return false;
-    //   }
-    //   return true;
-    // });
-
-    // if (proj4.length > 0) {
-    //   cmd.options.crs = proj4.join(' ');
-    // } else if (_.length > 0) {
-    //   cmd.options.crs = _.shift();
-    // }
-
     if (_.length > 0) {
       error("Received one or more unexpected parameters: " + _.join(', '));
     }
@@ -18535,7 +18531,7 @@ ${svg}
     }
   }
 
-  var assignmentRxp = /^([a-z0-9_+-]+)=(?!\=)(.*)$/i; // exclude ==
+  var assignmentRxp = /^([a-z0-9_+-]+)=(?!=)(.*)$/i; // exclude ==
 
   function splitShellTokens(str) {
     var BAREWORD = '([^\'"\\s])+';
@@ -20923,6 +20919,10 @@ ${svg}
         // describe: (0-1) inset grid shapes by a percentage
         type: 'number'
       })
+      .option('aligned', {
+        // describe: all grids of a given cell size will be aligned
+        type: 'flag'
+      })
       .option('calc', calcOpt)
       .option('name', nameOpt)
       .option('target', targetOpt)
@@ -21069,6 +21069,9 @@ ${svg}
       })
       .option('target', targetOpt);
 
+    parser.command('stop')
+      .describe('stop processing (skip remaining commands)');
+
     parser.section('Informational commands');
 
     parser.command('calc')
@@ -21088,6 +21091,10 @@ ${svg}
     parser.command('colors')
       .describe('print list of color scheme names');
 
+    parser.command('comment')
+      .describe('add a comment to the sequence of commands')
+      .flag('multi_arg');
+
     parser.command('encodings')
       .describe('print list of supported text encodings (for .dbf import)');
 
@@ -21516,11 +21523,12 @@ ${svg}
 
       // Show a sample of decoded text if non-ascii-range text has been found
       if (encoding && samples.length > 0) {
+        msg = "Detected DBF text encoding: " + encoding + (encoding in encodingNames ? " (" + encodingNames[encoding] + ")" : "");
+        message(msg);
         msg = decodeSamples(encoding, samples);
         msg = formatStringsAsGrid(msg.split('\n'));
         msg = "\nSample text containing non-ascii characters:" + (msg.length > 60 ? '\n' : '') + msg;
-        msg = "Detected DBF text encoding: " + encoding + (encoding in encodingNames ? " (" + encodingNames[encoding] + ")" : "") + msg;
-        message(msg);
+        verbose(msg);
       }
       return encoding;
     }
@@ -22725,7 +22733,6 @@ ${svg}
         shapes = [], // topological ids
         types = [],
         dataNulls = 0,
-        shapeNulls = 0,
         collectionType = null,
         shapeId;
 
@@ -22742,15 +22749,12 @@ ${svg}
       if (geom.type) {
         this.addShape(geom);
       }
-      if (shapes[shapeId] === null) {
-        shapeNulls++;
-      }
     };
 
     this.addShape = function(geom) {
       var curr = shapes[shapeId];
       var type = GeoJSON.translateGeoJSONType(geom.type);
-      var shape, importer;
+      var shape;
       if (geom.type == "GeometryCollection") {
         geom.geometries.forEach(this.addShape, this);
       } else if (type) {
@@ -23510,8 +23514,8 @@ ${svg}
   });
 
   function importKML(str, opts) {
-    var togeojson = require("@tmcw/togeojson");
-    var Parser = typeof DOMParser == 'undefined' ? require("@xmldom/xmldom").DOMParser : DOMParser;
+    var togeojson = require$1("@tmcw/togeojson");
+    var Parser = typeof DOMParser == 'undefined' ? require$1("@xmldom/xmldom").DOMParser : DOMParser;
     var geojson = togeojson.kml(new Parser().parseFromString(str, "text/xml"));
     return importGeoJSON(geojson, opts || {});
   }
@@ -23612,6 +23616,10 @@ ${svg}
     if (obj.prj) {
       dataset.info.prj = obj.prj.content;
     }
+    if (obj.cpg) {
+      // TODO: consider using the input encoding as the default output encoding
+      dataset.info.cpg = obj.cpg.content;
+    }
     return dataset;
   }
 
@@ -24026,12 +24034,12 @@ ${svg}
   function Job(catalog) {
     var currentCmd;
 
-  	var job = {
+    var job = {
       catalog: catalog || new Catalog(),
       defs: {},
       settings: {},
       input_files: []
-  	};
+    };
 
     job.initSettings = function(o) {
       job.settings = o;
@@ -24061,6 +24069,7 @@ ${svg}
     clearStash();  // prevent errors from overwriting stash
     stashVar('current_command', cmd.name);
     stashVar('DEBUG', job.settings.DEBUG || cmd.debug);
+    stashVar('VERBOSE', job.settings.VERBOSE || cmd.verbose);
     stashVar('QUIET', job.settings.QUIET || cmd.quiet);
     stashVar('defs', job.defs);
     stashVar('input_files', job.input_files);
@@ -24209,10 +24218,10 @@ ${svg}
   const ccwerrboundB = (2 + 12 * epsilon) * epsilon;
   const ccwerrboundC = (9 + 64 * epsilon) * epsilon * epsilon;
 
-  const B$1 = vec(4);
+  const B$2 = vec(4);
   const C1 = vec(8);
   const C2 = vec(12);
-  const D = vec(16);
+  const D$1 = vec(16);
   const u$2 = vec(4);
 
   function orient2dadapt(ax, ay, bx, by, cx, cy, detsum) {
@@ -24242,19 +24251,19 @@ ${svg}
       t0 = alo * blo - (t1 - ahi * bhi - alo * bhi - ahi * blo);
       _i = s0 - t0;
       bvirt = s0 - _i;
-      B$1[0] = s0 - (_i + bvirt) + (bvirt - t0);
+      B$2[0] = s0 - (_i + bvirt) + (bvirt - t0);
       _j = s1 + _i;
       bvirt = _j - s1;
       _0 = s1 - (_j - bvirt) + (_i - bvirt);
       _i = _0 - t1;
       bvirt = _0 - _i;
-      B$1[1] = _0 - (_i + bvirt) + (bvirt - t1);
+      B$2[1] = _0 - (_i + bvirt) + (bvirt - t1);
       u3 = _j + _i;
       bvirt = u3 - _j;
-      B$1[2] = _j - (u3 - bvirt) + (_i - bvirt);
-      B$1[3] = u3;
+      B$2[2] = _j - (u3 - bvirt) + (_i - bvirt);
+      B$2[3] = u3;
 
-      let det = estimate(4, B$1);
+      let det = estimate(4, B$2);
       let errbound = ccwerrboundB * detsum;
       if (det >= errbound || -det >= errbound) {
           return det;
@@ -24306,7 +24315,7 @@ ${svg}
       bvirt = u3 - _j;
       u$2[2] = _j - (u3 - bvirt) + (_i - bvirt);
       u$2[3] = u3;
-      const C1len = sum(4, B$1, 4, u$2, C1);
+      const C1len = sum(4, B$2, 4, u$2, C1);
 
       s1 = acx * bcytail;
       c = splitter * acx;
@@ -24368,9 +24377,9 @@ ${svg}
       bvirt = u3 - _j;
       u$2[2] = _j - (u3 - bvirt) + (_i - bvirt);
       u$2[3] = u3;
-      const Dlen = sum(C2len, C2, 4, u$2, D);
+      const Dlen = sum(C2len, C2, 4, u$2, D$1);
 
-      return D[Dlen - 1];
+      return D$1[Dlen - 1];
   }
 
   function orient2d(ax, ay, bx, by, cx, cy) {
@@ -27085,10 +27094,6 @@ ${svg}
     // polyline output could be used for debugging
     var outputGeom = opts.output_geometry == 'polyline' ? 'polyline' : 'polygon';
 
-    function polygonCoords(ring) {
-      return [ring];
-    }
-
     function pathBufferCoords(pathArcs, dist) {
       var pathCoords = maker(pathArcs, dist);
       var revPathArcs;
@@ -27118,13 +27123,9 @@ ${svg}
     var backtrackSteps = opts.backtrack >= 0 ? opts.backtrack : 50;
     var pathIter = new ShapeIter(arcs);
     var capStyle = opts.cap_style || 'round'; // expect 'round' or 'flat'
-    var tolerance;
+    // var tolerance;
     // TODO: implement other join styles than round
 
-    function updateTolerance(dist) {
-
-    }
-
     function addRoundJoin(arr, x, y, startDir, angle, dist) {
       var increment = 10;
       var endDir = startDir + angle;
@@ -27135,15 +27136,15 @@ ${svg}
       }
     }
 
-    function addRoundJoin2(arr, x, y, startDir, angle, dist) {
-      var increment = 10;
-      var endDir = startDir + angle;
-      var dir = startDir + increment;
-      while (dir < endDir) {
-        addBufferVertex(arr, geod(x, y, dir, dist), backtrackSteps);
-        dir += increment;
-      }
-    }
+    // function addRoundJoin2(arr, x, y, startDir, angle, dist) {
+    //   var increment = 10;
+    //   var endDir = startDir + angle;
+    //   var dir = startDir + increment;
+    //   while (dir < endDir) {
+    //     addBufferVertex(arr, geod(x, y, dir, dist), backtrackSteps);
+    //     dir += increment;
+    //   }
+    // }
 
     // Test if two points are within a snapping tolerance
     // TODO: calculate the tolerance more sensibly
@@ -27390,15 +27391,14 @@ ${svg}
   function getPathBufferMaker2(arcs, geod, getBearing, opts) {
     var backtrackSteps = opts.backtrack >= 0 ? opts.backtrack : 50;
     var pathIter = new ShapeIter(arcs);
-    var capStyle = opts.cap_style || 'round'; // expect 'round' or 'flat'
-    var tolerance;
+    // var capStyle = opts.cap_style || 'round'; // expect 'round' or 'flat'
     var partials, left, center;
     var bounds;
     // TODO: implement other join styles than round
 
-    function updateTolerance(dist) {
+    // function updateTolerance(dist) {
 
-    }
+    // }
 
     function addRoundJoin(x, y, startDir, angle, dist) {
       var increment = 10;
@@ -27442,24 +27442,24 @@ ${svg}
       }
     }
 
-    function makeCap(x, y, direction, dist) {
-      if (capStyle == 'flat') {
-        return [[x, y]];
-      }
-      return makeRoundCap(x, y, direction, dist);
-    }
+    // function makeCap(x, y, direction, dist) {
+    //   if (capStyle == 'flat') {
+    //     return [[x, y]];
+    //   }
+    //   return makeRoundCap(x, y, direction, dist);
+    // }
 
-    function makeRoundCap(x, y, segmentDir, dist) {
-      var points = [];
-      var increment = 10;
-      var startDir = segmentDir - 90;
-      var angle = increment;
-      while (angle < 180) {
-        points.push(geod(x, y, startDir + angle, dist));
-        angle += increment;
-      }
-      return points;
-    }
+    // function makeRoundCap(x, y, segmentDir, dist) {
+    //   var points = [];
+    //   var increment = 10;
+    //   var startDir = segmentDir - 90;
+    //   var angle = increment;
+    //   while (angle < 180) {
+    //     points.push(geod(x, y, startDir + angle, dist));
+    //     angle += increment;
+    //   }
+    //   return points;
+    // }
 
     // get angle between two extruded segments in degrees
     // positive angle means join in convex (range: 0-180 degrees)
@@ -27556,18 +27556,20 @@ ${svg}
     }
 
     return function(path, dist) {
-      var x0, y0, x1, y1, x2, y2;
+      // var x0, y0;
+      var x1, y1, x2, y2;
       var p1, p2;
-      var bearing, prevBearing, firstBearing, joinAngle;
+      // var firstBearing;
+      var bearing, prevBearing, joinAngle;
       partials = [];
       left = [];
       center = [];
       pathIter.init(path);
 
-      if (pathIter.hasNext()) {
-        x0 = x2 = pathIter.x;
-        y0 = y2 = pathIter.y;
-      }
+      // if (pathIter.hasNext()) {
+      //   x0 = x2 = pathIter.x;
+      //   y0 = y2 = pathIter.y;
+      // }
       while (pathIter.hasNext()) {
         // TODO: use a tolerance
         if (pathIter.x === x2 && pathIter.y === y2) continue; // skip duplicate points
@@ -27584,9 +27586,9 @@ ${svg}
 
         if (center.length === 0) {
           // first loop, second point in this partial
-          if (partials.length === 0) {
-            firstBearing = bearing;
-          }
+          // if (partials.length === 0) {
+          //   firstBearing = bearing;
+          // }
           left.push(p1, p2);
           center.push([x1, y1], [x2, y2]);
         } else {
@@ -27633,7 +27635,7 @@ ${svg}
   function getGeodesic(P) {
     if (!isLatLngCRS(P)) error('Expected an unprojected CRS');
     var f = P.es / (1 + Math.sqrt(P.one_es));
-    var GeographicLib = require('mproj').internal.GeographicLib;
+    var GeographicLib = require$1('mproj').internal.GeographicLib;
     return new GeographicLib.Geodesic.Geodesic(P.a, f);
   }
 
@@ -27762,7 +27764,7 @@ ${svg}
   var e = 1e-10;
   var T = 90 - e;
   var L = -180 + e;
-  var B = -90 + e;
+  var B$1 = -90 + e;
   var R = 180 - e;
 
   function lastEl(arr) {
@@ -27790,12 +27792,12 @@ ${svg}
   function snapToEdge(p) {
     if (p[0] <= L) p[0] = -180;
     if (p[0] >= R) p[0] = 180;
-    if (p[1] <= B) p[1] = -90;
+    if (p[1] <= B$1) p[1] = -90;
     if (p[1] >= T) p[1] = 90;
   }
 
   function onPole(p) {
-    return p[1] >= T || p[1] <= B;
+    return p[1] >= T || p[1] <= B$1;
   }
 
   function isWholeWorld(coords) {
@@ -27821,7 +27823,7 @@ ${svg}
   }
 
   function isEdgePoint(p) {
-    return p[1] <= B || p[1] >= T || p[0] <= L || p[0] >= R;
+    return p[1] <= B$1 || p[1] >= T || p[0] <= L || p[0] >= R;
   }
 
   // Remove segments that belong solely to cut points
@@ -28167,7 +28169,7 @@ ${svg}
         rings.push([
           [[180, 90], [180, -90], [0, -90], [-180, -90], [-180, 90], [0, 90], [180, 90]],
           coords
-          ]);
+        ]);
       } else {
         rings.push([coords]);
       }
@@ -28362,6 +28364,1120 @@ ${svg}
     return s;
   }
 
+  function define(constructor, factory, prototype) {
+    constructor.prototype = factory.prototype = prototype;
+    prototype.constructor = constructor;
+  }
+
+  function extend(parent, definition) {
+    var prototype = Object.create(parent.prototype);
+    for (var key in definition) prototype[key] = definition[key];
+    return prototype;
+  }
+
+  function Color() {}
+
+  var darker = 0.7;
+  var brighter = 1 / darker;
+
+  var reI = "\\s*([+-]?\\d+)\\s*",
+      reN = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*",
+      reP = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*",
+      reHex = /^#([0-9a-f]{3,8})$/,
+      reRgbInteger = new RegExp("^rgb\\(" + [reI, reI, reI] + "\\)$"),
+      reRgbPercent = new RegExp("^rgb\\(" + [reP, reP, reP] + "\\)$"),
+      reRgbaInteger = new RegExp("^rgba\\(" + [reI, reI, reI, reN] + "\\)$"),
+      reRgbaPercent = new RegExp("^rgba\\(" + [reP, reP, reP, reN] + "\\)$"),
+      reHslPercent = new RegExp("^hsl\\(" + [reN, reP, reP] + "\\)$"),
+      reHslaPercent = new RegExp("^hsla\\(" + [reN, reP, reP, reN] + "\\)$");
+
+  var named = {
+    aliceblue: 0xf0f8ff,
+    antiquewhite: 0xfaebd7,
+    aqua: 0x00ffff,
+    aquamarine: 0x7fffd4,
+    azure: 0xf0ffff,
+    beige: 0xf5f5dc,
+    bisque: 0xffe4c4,
+    black: 0x000000,
+    blanchedalmond: 0xffebcd,
+    blue: 0x0000ff,
+    blueviolet: 0x8a2be2,
+    brown: 0xa52a2a,
+    burlywood: 0xdeb887,
+    cadetblue: 0x5f9ea0,
+    chartreuse: 0x7fff00,
+    chocolate: 0xd2691e,
+    coral: 0xff7f50,
+    cornflowerblue: 0x6495ed,
+    cornsilk: 0xfff8dc,
+    crimson: 0xdc143c,
+    cyan: 0x00ffff,
+    darkblue: 0x00008b,
+    darkcyan: 0x008b8b,
+    darkgoldenrod: 0xb8860b,
+    darkgray: 0xa9a9a9,
+    darkgreen: 0x006400,
+    darkgrey: 0xa9a9a9,
+    darkkhaki: 0xbdb76b,
+    darkmagenta: 0x8b008b,
+    darkolivegreen: 0x556b2f,
+    darkorange: 0xff8c00,
+    darkorchid: 0x9932cc,
+    darkred: 0x8b0000,
+    darksalmon: 0xe9967a,
+    darkseagreen: 0x8fbc8f,
+    darkslateblue: 0x483d8b,
+    darkslategray: 0x2f4f4f,
+    darkslategrey: 0x2f4f4f,
+    darkturquoise: 0x00ced1,
+    darkviolet: 0x9400d3,
+    deeppink: 0xff1493,
+    deepskyblue: 0x00bfff,
+    dimgray: 0x696969,
+    dimgrey: 0x696969,
+    dodgerblue: 0x1e90ff,
+    firebrick: 0xb22222,
+    floralwhite: 0xfffaf0,
+    forestgreen: 0x228b22,
+    fuchsia: 0xff00ff,
+    gainsboro: 0xdcdcdc,
+    ghostwhite: 0xf8f8ff,
+    gold: 0xffd700,
+    goldenrod: 0xdaa520,
+    gray: 0x808080,
+    green: 0x008000,
+    greenyellow: 0xadff2f,
+    grey: 0x808080,
+    honeydew: 0xf0fff0,
+    hotpink: 0xff69b4,
+    indianred: 0xcd5c5c,
+    indigo: 0x4b0082,
+    ivory: 0xfffff0,
+    khaki: 0xf0e68c,
+    lavender: 0xe6e6fa,
+    lavenderblush: 0xfff0f5,
+    lawngreen: 0x7cfc00,
+    lemonchiffon: 0xfffacd,
+    lightblue: 0xadd8e6,
+    lightcoral: 0xf08080,
+    lightcyan: 0xe0ffff,
+    lightgoldenrodyellow: 0xfafad2,
+    lightgray: 0xd3d3d3,
+    lightgreen: 0x90ee90,
+    lightgrey: 0xd3d3d3,
+    lightpink: 0xffb6c1,
+    lightsalmon: 0xffa07a,
+    lightseagreen: 0x20b2aa,
+    lightskyblue: 0x87cefa,
+    lightslategray: 0x778899,
+    lightslategrey: 0x778899,
+    lightsteelblue: 0xb0c4de,
+    lightyellow: 0xffffe0,
+    lime: 0x00ff00,
+    limegreen: 0x32cd32,
+    linen: 0xfaf0e6,
+    magenta: 0xff00ff,
+    maroon: 0x800000,
+    mediumaquamarine: 0x66cdaa,
+    mediumblue: 0x0000cd,
+    mediumorchid: 0xba55d3,
+    mediumpurple: 0x9370db,
+    mediumseagreen: 0x3cb371,
+    mediumslateblue: 0x7b68ee,
+    mediumspringgreen: 0x00fa9a,
+    mediumturquoise: 0x48d1cc,
+    mediumvioletred: 0xc71585,
+    midnightblue: 0x191970,
+    mintcream: 0xf5fffa,
+    mistyrose: 0xffe4e1,
+    moccasin: 0xffe4b5,
+    navajowhite: 0xffdead,
+    navy: 0x000080,
+    oldlace: 0xfdf5e6,
+    olive: 0x808000,
+    olivedrab: 0x6b8e23,
+    orange: 0xffa500,
+    orangered: 0xff4500,
+    orchid: 0xda70d6,
+    palegoldenrod: 0xeee8aa,
+    palegreen: 0x98fb98,
+    paleturquoise: 0xafeeee,
+    palevioletred: 0xdb7093,
+    papayawhip: 0xffefd5,
+    peachpuff: 0xffdab9,
+    peru: 0xcd853f,
+    pink: 0xffc0cb,
+    plum: 0xdda0dd,
+    powderblue: 0xb0e0e6,
+    purple: 0x800080,
+    rebeccapurple: 0x663399,
+    red: 0xff0000,
+    rosybrown: 0xbc8f8f,
+    royalblue: 0x4169e1,
+    saddlebrown: 0x8b4513,
+    salmon: 0xfa8072,
+    sandybrown: 0xf4a460,
+    seagreen: 0x2e8b57,
+    seashell: 0xfff5ee,
+    sienna: 0xa0522d,
+    silver: 0xc0c0c0,
+    skyblue: 0x87ceeb,
+    slateblue: 0x6a5acd,
+    slategray: 0x708090,
+    slategrey: 0x708090,
+    snow: 0xfffafa,
+    springgreen: 0x00ff7f,
+    steelblue: 0x4682b4,
+    tan: 0xd2b48c,
+    teal: 0x008080,
+    thistle: 0xd8bfd8,
+    tomato: 0xff6347,
+    turquoise: 0x40e0d0,
+    violet: 0xee82ee,
+    wheat: 0xf5deb3,
+    white: 0xffffff,
+    whitesmoke: 0xf5f5f5,
+    yellow: 0xffff00,
+    yellowgreen: 0x9acd32
+  };
+
+  define(Color, color, {
+    copy: function(channels) {
+      return Object.assign(new this.constructor, this, channels);
+    },
+    displayable: function() {
+      return this.rgb().displayable();
+    },
+    hex: color_formatHex, // Deprecated! Use color.formatHex.
+    formatHex: color_formatHex,
+    formatHsl: color_formatHsl,
+    formatRgb: color_formatRgb,
+    toString: color_formatRgb
+  });
+
+  function color_formatHex() {
+    return this.rgb().formatHex();
+  }
+
+  function color_formatHsl() {
+    return hslConvert(this).formatHsl();
+  }
+
+  function color_formatRgb() {
+    return this.rgb().formatRgb();
+  }
+
+  function color(format) {
+    var m, l;
+    format = (format + "").trim().toLowerCase();
+    return (m = reHex.exec(format)) ? (l = m[1].length, m = parseInt(m[1], 16), l === 6 ? rgbn(m) // #ff0000
+        : l === 3 ? new Rgb((m >> 8 & 0xf) | (m >> 4 & 0xf0), (m >> 4 & 0xf) | (m & 0xf0), ((m & 0xf) << 4) | (m & 0xf), 1) // #f00
+        : l === 8 ? rgba(m >> 24 & 0xff, m >> 16 & 0xff, m >> 8 & 0xff, (m & 0xff) / 0xff) // #ff000000
+        : l === 4 ? rgba((m >> 12 & 0xf) | (m >> 8 & 0xf0), (m >> 8 & 0xf) | (m >> 4 & 0xf0), (m >> 4 & 0xf) | (m & 0xf0), (((m & 0xf) << 4) | (m & 0xf)) / 0xff) // #f000
+        : null) // invalid hex
+        : (m = reRgbInteger.exec(format)) ? new Rgb(m[1], m[2], m[3], 1) // rgb(255, 0, 0)
+        : (m = reRgbPercent.exec(format)) ? new Rgb(m[1] * 255 / 100, m[2] * 255 / 100, m[3] * 255 / 100, 1) // rgb(100%, 0%, 0%)
+        : (m = reRgbaInteger.exec(format)) ? rgba(m[1], m[2], m[3], m[4]) // rgba(255, 0, 0, 1)
+        : (m = reRgbaPercent.exec(format)) ? rgba(m[1] * 255 / 100, m[2] * 255 / 100, m[3] * 255 / 100, m[4]) // rgb(100%, 0%, 0%, 1)
+        : (m = reHslPercent.exec(format)) ? hsla(m[1], m[2] / 100, m[3] / 100, 1) // hsl(120, 50%, 50%)
+        : (m = reHslaPercent.exec(format)) ? hsla(m[1], m[2] / 100, m[3] / 100, m[4]) // hsla(120, 50%, 50%, 1)
+        : named.hasOwnProperty(format) ? rgbn(named[format]) // eslint-disable-line no-prototype-builtins
+        : format === "transparent" ? new Rgb(NaN, NaN, NaN, 0)
+        : null;
+  }
+
+  function rgbn(n) {
+    return new Rgb(n >> 16 & 0xff, n >> 8 & 0xff, n & 0xff, 1);
+  }
+
+  function rgba(r, g, b, a) {
+    if (a <= 0) r = g = b = NaN;
+    return new Rgb(r, g, b, a);
+  }
+
+  function rgbConvert(o) {
+    if (!(o instanceof Color)) o = color(o);
+    if (!o) return new Rgb;
+    o = o.rgb();
+    return new Rgb(o.r, o.g, o.b, o.opacity);
+  }
+
+  function rgb$1(r, g, b, opacity) {
+    return arguments.length === 1 ? rgbConvert(r) : new Rgb(r, g, b, opacity == null ? 1 : opacity);
+  }
+
+  function Rgb(r, g, b, opacity) {
+    this.r = +r;
+    this.g = +g;
+    this.b = +b;
+    this.opacity = +opacity;
+  }
+
+  define(Rgb, rgb$1, extend(Color, {
+    brighter: function(k) {
+      k = k == null ? brighter : Math.pow(brighter, k);
+      return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
+    },
+    darker: function(k) {
+      k = k == null ? darker : Math.pow(darker, k);
+      return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
+    },
+    rgb: function() {
+      return this;
+    },
+    displayable: function() {
+      return (-0.5 <= this.r && this.r < 255.5)
+          && (-0.5 <= this.g && this.g < 255.5)
+          && (-0.5 <= this.b && this.b < 255.5)
+          && (0 <= this.opacity && this.opacity <= 1);
+    },
+    hex: rgb_formatHex, // Deprecated! Use color.formatHex.
+    formatHex: rgb_formatHex,
+    formatRgb: rgb_formatRgb,
+    toString: rgb_formatRgb
+  }));
+
+  function rgb_formatHex() {
+    return "#" + hex(this.r) + hex(this.g) + hex(this.b);
+  }
+
+  function rgb_formatRgb() {
+    var a = this.opacity; a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
+    return (a === 1 ? "rgb(" : "rgba(")
+        + Math.max(0, Math.min(255, Math.round(this.r) || 0)) + ", "
+        + Math.max(0, Math.min(255, Math.round(this.g) || 0)) + ", "
+        + Math.max(0, Math.min(255, Math.round(this.b) || 0))
+        + (a === 1 ? ")" : ", " + a + ")");
+  }
+
+  function hex(value) {
+    value = Math.max(0, Math.min(255, Math.round(value) || 0));
+    return (value < 16 ? "0" : "") + value.toString(16);
+  }
+
+  function hsla(h, s, l, a) {
+    if (a <= 0) h = s = l = NaN;
+    else if (l <= 0 || l >= 1) h = s = NaN;
+    else if (s <= 0) h = NaN;
+    return new Hsl(h, s, l, a);
+  }
+
+  function hslConvert(o) {
+    if (o instanceof Hsl) return new Hsl(o.h, o.s, o.l, o.opacity);
+    if (!(o instanceof Color)) o = color(o);
+    if (!o) return new Hsl;
+    if (o instanceof Hsl) return o;
+    o = o.rgb();
+    var r = o.r / 255,
+        g = o.g / 255,
+        b = o.b / 255,
+        min = Math.min(r, g, b),
+        max = Math.max(r, g, b),
+        h = NaN,
+        s = max - min,
+        l = (max + min) / 2;
+    if (s) {
+      if (r === max) h = (g - b) / s + (g < b) * 6;
+      else if (g === max) h = (b - r) / s + 2;
+      else h = (r - g) / s + 4;
+      s /= l < 0.5 ? max + min : 2 - max - min;
+      h *= 60;
+    } else {
+      s = l > 0 && l < 1 ? 0 : h;
+    }
+    return new Hsl(h, s, l, o.opacity);
+  }
+
+  function hsl$2(h, s, l, opacity) {
+    return arguments.length === 1 ? hslConvert(h) : new Hsl(h, s, l, opacity == null ? 1 : opacity);
+  }
+
+  function Hsl(h, s, l, opacity) {
+    this.h = +h;
+    this.s = +s;
+    this.l = +l;
+    this.opacity = +opacity;
+  }
+
+  define(Hsl, hsl$2, extend(Color, {
+    brighter: function(k) {
+      k = k == null ? brighter : Math.pow(brighter, k);
+      return new Hsl(this.h, this.s, this.l * k, this.opacity);
+    },
+    darker: function(k) {
+      k = k == null ? darker : Math.pow(darker, k);
+      return new Hsl(this.h, this.s, this.l * k, this.opacity);
+    },
+    rgb: function() {
+      var h = this.h % 360 + (this.h < 0) * 360,
+          s = isNaN(h) || isNaN(this.s) ? 0 : this.s,
+          l = this.l,
+          m2 = l + (l < 0.5 ? l : 1 - l) * s,
+          m1 = 2 * l - m2;
+      return new Rgb(
+        hsl2rgb(h >= 240 ? h - 240 : h + 120, m1, m2),
+        hsl2rgb(h, m1, m2),
+        hsl2rgb(h < 120 ? h + 240 : h - 120, m1, m2),
+        this.opacity
+      );
+    },
+    displayable: function() {
+      return (0 <= this.s && this.s <= 1 || isNaN(this.s))
+          && (0 <= this.l && this.l <= 1)
+          && (0 <= this.opacity && this.opacity <= 1);
+    },
+    formatHsl: function() {
+      var a = this.opacity; a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
+      return (a === 1 ? "hsl(" : "hsla(")
+          + (this.h || 0) + ", "
+          + (this.s || 0) * 100 + "%, "
+          + (this.l || 0) * 100 + "%"
+          + (a === 1 ? ")" : ", " + a + ")");
+    }
+  }));
+
+  /* From FvD 13.37, CSS Color Module Level 3 */
+  function hsl2rgb(h, m1, m2) {
+    return (h < 60 ? m1 + (m2 - m1) * h / 60
+        : h < 180 ? m2
+        : h < 240 ? m1 + (m2 - m1) * (240 - h) / 60
+        : m1) * 255;
+  }
+
+  const radians = Math.PI / 180;
+  const degrees$1 = 180 / Math.PI;
+
+  // https://observablehq.com/@mbostock/lab-and-rgb
+  const K = 18,
+      Xn = 0.96422,
+      Yn = 1,
+      Zn = 0.82521,
+      t0 = 4 / 29,
+      t1 = 6 / 29,
+      t2 = 3 * t1 * t1,
+      t3 = t1 * t1 * t1;
+
+  function labConvert(o) {
+    if (o instanceof Lab) return new Lab(o.l, o.a, o.b, o.opacity);
+    if (o instanceof Hcl) return hcl2lab(o);
+    if (!(o instanceof Rgb)) o = rgbConvert(o);
+    var r = rgb2lrgb(o.r),
+        g = rgb2lrgb(o.g),
+        b = rgb2lrgb(o.b),
+        y = xyz2lab((0.2225045 * r + 0.7168786 * g + 0.0606169 * b) / Yn), x, z;
+    if (r === g && g === b) x = z = y; else {
+      x = xyz2lab((0.4360747 * r + 0.3850649 * g + 0.1430804 * b) / Xn);
+      z = xyz2lab((0.0139322 * r + 0.0971045 * g + 0.7141733 * b) / Zn);
+    }
+    return new Lab(116 * y - 16, 500 * (x - y), 200 * (y - z), o.opacity);
+  }
+
+  function gray(l, opacity) {
+    return new Lab(l, 0, 0, opacity == null ? 1 : opacity);
+  }
+
+  function lab$1(l, a, b, opacity) {
+    return arguments.length === 1 ? labConvert(l) : new Lab(l, a, b, opacity == null ? 1 : opacity);
+  }
+
+  function Lab(l, a, b, opacity) {
+    this.l = +l;
+    this.a = +a;
+    this.b = +b;
+    this.opacity = +opacity;
+  }
+
+  define(Lab, lab$1, extend(Color, {
+    brighter: function(k) {
+      return new Lab(this.l + K * (k == null ? 1 : k), this.a, this.b, this.opacity);
+    },
+    darker: function(k) {
+      return new Lab(this.l - K * (k == null ? 1 : k), this.a, this.b, this.opacity);
+    },
+    rgb: function() {
+      var y = (this.l + 16) / 116,
+          x = isNaN(this.a) ? y : y + this.a / 500,
+          z = isNaN(this.b) ? y : y - this.b / 200;
+      x = Xn * lab2xyz(x);
+      y = Yn * lab2xyz(y);
+      z = Zn * lab2xyz(z);
+      return new Rgb(
+        lrgb2rgb( 3.1338561 * x - 1.6168667 * y - 0.4906146 * z),
+        lrgb2rgb(-0.9787684 * x + 1.9161415 * y + 0.0334540 * z),
+        lrgb2rgb( 0.0719453 * x - 0.2289914 * y + 1.4052427 * z),
+        this.opacity
+      );
+    }
+  }));
+
+  function xyz2lab(t) {
+    return t > t3 ? Math.pow(t, 1 / 3) : t / t2 + t0;
+  }
+
+  function lab2xyz(t) {
+    return t > t1 ? t * t * t : t2 * (t - t0);
+  }
+
+  function lrgb2rgb(x) {
+    return 255 * (x <= 0.0031308 ? 12.92 * x : 1.055 * Math.pow(x, 1 / 2.4) - 0.055);
+  }
+
+  function rgb2lrgb(x) {
+    return (x /= 255) <= 0.04045 ? x / 12.92 : Math.pow((x + 0.055) / 1.055, 2.4);
+  }
+
+  function hclConvert(o) {
+    if (o instanceof Hcl) return new Hcl(o.h, o.c, o.l, o.opacity);
+    if (!(o instanceof Lab)) o = labConvert(o);
+    if (o.a === 0 && o.b === 0) return new Hcl(NaN, 0 < o.l && o.l < 100 ? 0 : NaN, o.l, o.opacity);
+    var h = Math.atan2(o.b, o.a) * degrees$1;
+    return new Hcl(h < 0 ? h + 360 : h, Math.sqrt(o.a * o.a + o.b * o.b), o.l, o.opacity);
+  }
+
+  function lch(l, c, h, opacity) {
+    return arguments.length === 1 ? hclConvert(l) : new Hcl(h, c, l, opacity == null ? 1 : opacity);
+  }
+
+  function hcl$2(h, c, l, opacity) {
+    return arguments.length === 1 ? hclConvert(h) : new Hcl(h, c, l, opacity == null ? 1 : opacity);
+  }
+
+  function Hcl(h, c, l, opacity) {
+    this.h = +h;
+    this.c = +c;
+    this.l = +l;
+    this.opacity = +opacity;
+  }
+
+  function hcl2lab(o) {
+    if (isNaN(o.h)) return new Lab(o.l, 0, 0, o.opacity);
+    var h = o.h * radians;
+    return new Lab(o.l, Math.cos(h) * o.c, Math.sin(h) * o.c, o.opacity);
+  }
+
+  define(Hcl, hcl$2, extend(Color, {
+    brighter: function(k) {
+      return new Hcl(this.h, this.c, this.l + K * (k == null ? 1 : k), this.opacity);
+    },
+    darker: function(k) {
+      return new Hcl(this.h, this.c, this.l - K * (k == null ? 1 : k), this.opacity);
+    },
+    rgb: function() {
+      return hcl2lab(this).rgb();
+    }
+  }));
+
+  var A = -0.14861,
+      B = +1.78277,
+      C = -0.29227,
+      D = -0.90649,
+      E = +1.97294,
+      ED = E * D,
+      EB = E * B,
+      BC_DA = B * C - D * A;
+
+  function cubehelixConvert(o) {
+    if (o instanceof Cubehelix) return new Cubehelix(o.h, o.s, o.l, o.opacity);
+    if (!(o instanceof Rgb)) o = rgbConvert(o);
+    var r = o.r / 255,
+        g = o.g / 255,
+        b = o.b / 255,
+        l = (BC_DA * b + ED * r - EB * g) / (BC_DA + ED - EB),
+        bl = b - l,
+        k = (E * (g - l) - C * bl) / D,
+        s = Math.sqrt(k * k + bl * bl) / (E * l * (1 - l)), // NaN if l=0 or l=1
+        h = s ? Math.atan2(k, bl) * degrees$1 - 120 : NaN;
+    return new Cubehelix(h < 0 ? h + 360 : h, s, l, o.opacity);
+  }
+
+  function cubehelix$3(h, s, l, opacity) {
+    return arguments.length === 1 ? cubehelixConvert(h) : new Cubehelix(h, s, l, opacity == null ? 1 : opacity);
+  }
+
+  function Cubehelix(h, s, l, opacity) {
+    this.h = +h;
+    this.s = +s;
+    this.l = +l;
+    this.opacity = +opacity;
+  }
+
+  define(Cubehelix, cubehelix$3, extend(Color, {
+    brighter: function(k) {
+      k = k == null ? brighter : Math.pow(brighter, k);
+      return new Cubehelix(this.h, this.s, this.l * k, this.opacity);
+    },
+    darker: function(k) {
+      k = k == null ? darker : Math.pow(darker, k);
+      return new Cubehelix(this.h, this.s, this.l * k, this.opacity);
+    },
+    rgb: function() {
+      var h = isNaN(this.h) ? 0 : (this.h + 120) * radians,
+          l = +this.l,
+          a = isNaN(this.s) ? 0 : this.s * l * (1 - l),
+          cosh = Math.cos(h),
+          sinh = Math.sin(h);
+      return new Rgb(
+        255 * (l + a * (A * cosh + B * sinh)),
+        255 * (l + a * (C * cosh + D * sinh)),
+        255 * (l + a * (E * cosh)),
+        this.opacity
+      );
+    }
+  }));
+
+  function basis(t1, v0, v1, v2, v3) {
+    var t2 = t1 * t1, t3 = t2 * t1;
+    return ((1 - 3 * t1 + 3 * t2 - t3) * v0
+        + (4 - 6 * t2 + 3 * t3) * v1
+        + (1 + 3 * t1 + 3 * t2 - 3 * t3) * v2
+        + t3 * v3) / 6;
+  }
+
+  function basis$1(values) {
+    var n = values.length - 1;
+    return function(t) {
+      var i = t <= 0 ? (t = 0) : t >= 1 ? (t = 1, n - 1) : Math.floor(t * n),
+          v1 = values[i],
+          v2 = values[i + 1],
+          v0 = i > 0 ? values[i - 1] : 2 * v1 - v2,
+          v3 = i < n - 1 ? values[i + 2] : 2 * v2 - v1;
+      return basis((t - i / n) * n, v0, v1, v2, v3);
+    };
+  }
+
+  function basisClosed(values) {
+    var n = values.length;
+    return function(t) {
+      var i = Math.floor(((t %= 1) < 0 ? ++t : t) * n),
+          v0 = values[(i + n - 1) % n],
+          v1 = values[i % n],
+          v2 = values[(i + 1) % n],
+          v3 = values[(i + 2) % n];
+      return basis((t - i / n) * n, v0, v1, v2, v3);
+    };
+  }
+
+  var constant = x => () => x;
+
+  function linear(a, d) {
+    return function(t) {
+      return a + t * d;
+    };
+  }
+
+  function exponential(a, b, y) {
+    return a = Math.pow(a, y), b = Math.pow(b, y) - a, y = 1 / y, function(t) {
+      return Math.pow(a + t * b, y);
+    };
+  }
+
+  function hue$1(a, b) {
+    var d = b - a;
+    return d ? linear(a, d > 180 || d < -180 ? d - 360 * Math.round(d / 360) : d) : constant(isNaN(a) ? b : a);
+  }
+
+  function gamma(y) {
+    return (y = +y) === 1 ? nogamma : function(a, b) {
+      return b - a ? exponential(a, b, y) : constant(isNaN(a) ? b : a);
+    };
+  }
+
+  function nogamma(a, b) {
+    var d = b - a;
+    return d ? linear(a, d) : constant(isNaN(a) ? b : a);
+  }
+
+  var rgb = (function rgbGamma(y) {
+    var color = gamma(y);
+
+    function rgb(start, end) {
+      var r = color((start = rgb$1(start)).r, (end = rgb$1(end)).r),
+          g = color(start.g, end.g),
+          b = color(start.b, end.b),
+          opacity = nogamma(start.opacity, end.opacity);
+      return function(t) {
+        start.r = r(t);
+        start.g = g(t);
+        start.b = b(t);
+        start.opacity = opacity(t);
+        return start + "";
+      };
+    }
+
+    rgb.gamma = rgbGamma;
+
+    return rgb;
+  })(1);
+
+  function rgbSpline(spline) {
+    return function(colors) {
+      var n = colors.length,
+          r = new Array(n),
+          g = new Array(n),
+          b = new Array(n),
+          i, color;
+      for (i = 0; i < n; ++i) {
+        color = rgb$1(colors[i]);
+        r[i] = color.r || 0;
+        g[i] = color.g || 0;
+        b[i] = color.b || 0;
+      }
+      r = spline(r);
+      g = spline(g);
+      b = spline(b);
+      color.opacity = 1;
+      return function(t) {
+        color.r = r(t);
+        color.g = g(t);
+        color.b = b(t);
+        return color + "";
+      };
+    };
+  }
+
+  var rgbBasis = rgbSpline(basis$1);
+  var rgbBasisClosed = rgbSpline(basisClosed);
+
+  function numberArray(a, b) {
+    if (!b) b = [];
+    var n = a ? Math.min(b.length, a.length) : 0,
+        c = b.slice(),
+        i;
+    return function(t) {
+      for (i = 0; i < n; ++i) c[i] = a[i] * (1 - t) + b[i] * t;
+      return c;
+    };
+  }
+
+  function isNumberArray(x) {
+    return ArrayBuffer.isView(x) && !(x instanceof DataView);
+  }
+
+  function array(a, b) {
+    return (isNumberArray(b) ? numberArray : genericArray)(a, b);
+  }
+
+  function genericArray(a, b) {
+    var nb = b ? b.length : 0,
+        na = a ? Math.min(nb, a.length) : 0,
+        x = new Array(na),
+        c = new Array(nb),
+        i;
+
+    for (i = 0; i < na; ++i) x[i] = d3_interpolate(a[i], b[i]);
+    for (; i < nb; ++i) c[i] = b[i];
+
+    return function(t) {
+      for (i = 0; i < na; ++i) c[i] = x[i](t);
+      return c;
+    };
+  }
+
+  function date(a, b) {
+    var d = new Date;
+    return a = +a, b = +b, function(t) {
+      return d.setTime(a * (1 - t) + b * t), d;
+    };
+  }
+
+  function number(a, b) {
+    return a = +a, b = +b, function(t) {
+      return a * (1 - t) + b * t;
+    };
+  }
+
+  function object(a, b) {
+    var i = {},
+        c = {},
+        k;
+
+    if (a === null || typeof a !== "object") a = {};
+    if (b === null || typeof b !== "object") b = {};
+
+    for (k in b) {
+      if (k in a) {
+        i[k] = d3_interpolate(a[k], b[k]);
+      } else {
+        c[k] = b[k];
+      }
+    }
+
+    return function(t) {
+      for (k in i) c[k] = i[k](t);
+      return c;
+    };
+  }
+
+  var reA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
+      reB = new RegExp(reA.source, "g");
+
+  function zero(b) {
+    return function() {
+      return b;
+    };
+  }
+
+  function one(b) {
+    return function(t) {
+      return b(t) + "";
+    };
+  }
+
+  function string(a, b) {
+    var bi = reA.lastIndex = reB.lastIndex = 0, // scan index for next number in b
+        am, // current match in a
+        bm, // current match in b
+        bs, // string preceding current number in b, if any
+        i = -1, // index in s
+        s = [], // string constants and placeholders
+        q = []; // number interpolators
+
+    // Coerce inputs to strings.
+    a = a + "", b = b + "";
+
+    // Interpolate pairs of numbers in a & b.
+    while ((am = reA.exec(a))
+        && (bm = reB.exec(b))) {
+      if ((bs = bm.index) > bi) { // a string precedes the next number in b
+        bs = b.slice(bi, bs);
+        if (s[i]) s[i] += bs; // coalesce with previous string
+        else s[++i] = bs;
+      }
+      if ((am = am[0]) === (bm = bm[0])) { // numbers in a & b match
+        if (s[i]) s[i] += bm; // coalesce with previous string
+        else s[++i] = bm;
+      } else { // interpolate non-matching numbers
+        s[++i] = null;
+        q.push({i: i, x: number(am, bm)});
+      }
+      bi = reB.lastIndex;
+    }
+
+    // Add remains of b.
+    if (bi < b.length) {
+      bs = b.slice(bi);
+      if (s[i]) s[i] += bs; // coalesce with previous string
+      else s[++i] = bs;
+    }
+
+    // Special optimization for only a single match.
+    // Otherwise, interpolate each of the numbers and rejoin the string.
+    return s.length < 2 ? (q[0]
+        ? one(q[0].x)
+        : zero(b))
+        : (b = q.length, function(t) {
+            for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
+            return s.join("");
+          });
+  }
+
+  function d3_interpolate(a, b) {
+    var t = typeof b, c;
+    return b == null || t === "boolean" ? constant(b)
+        : (t === "number" ? number
+        : t === "string" ? ((c = color(b)) ? (b = c, rgb) : string)
+        : b instanceof color ? rgb
+        : b instanceof Date ? date
+        : isNumberArray(b) ? numberArray
+        : Array.isArray(b) ? genericArray
+        : typeof b.valueOf !== "function" && typeof b.toString !== "function" || isNaN(b) ? object
+        : number)(a, b);
+  }
+
+  function discrete(range) {
+    var n = range.length;
+    return function(t) {
+      return range[Math.max(0, Math.min(n - 1, Math.floor(t * n)))];
+    };
+  }
+
+  function hue(a, b) {
+    var i = hue$1(+a, +b);
+    return function(t) {
+      var x = i(t);
+      return x - 360 * Math.floor(x / 360);
+    };
+  }
+
+  function round(a, b) {
+    return a = +a, b = +b, function(t) {
+      return Math.round(a * (1 - t) + b * t);
+    };
+  }
+
+  var degrees = 180 / Math.PI;
+
+  var identity = {
+    translateX: 0,
+    translateY: 0,
+    rotate: 0,
+    skewX: 0,
+    scaleX: 1,
+    scaleY: 1
+  };
+
+  function decompose(a, b, c, d, e, f) {
+    var scaleX, scaleY, skewX;
+    if (scaleX = Math.sqrt(a * a + b * b)) a /= scaleX, b /= scaleX;
+    if (skewX = a * c + b * d) c -= a * skewX, d -= b * skewX;
+    if (scaleY = Math.sqrt(c * c + d * d)) c /= scaleY, d /= scaleY, skewX /= scaleY;
+    if (a * d < b * c) a = -a, b = -b, skewX = -skewX, scaleX = -scaleX;
+    return {
+      translateX: e,
+      translateY: f,
+      rotate: Math.atan2(b, a) * degrees,
+      skewX: Math.atan(skewX) * degrees,
+      scaleX: scaleX,
+      scaleY: scaleY
+    };
+  }
+
+  var svgNode;
+
+  /* eslint-disable no-undef */
+  function parseCss(value) {
+    const m = new (typeof DOMMatrix === "function" ? DOMMatrix : WebKitCSSMatrix)(value + "");
+    return m.isIdentity ? identity : decompose(m.a, m.b, m.c, m.d, m.e, m.f);
+  }
+
+  function parseSvg(value) {
+    if (value == null) return identity;
+    if (!svgNode) svgNode = document.createElementNS("http://www.w3.org/2000/svg", "g");
+    svgNode.setAttribute("transform", value);
+    if (!(value = svgNode.transform.baseVal.consolidate())) return identity;
+    value = value.matrix;
+    return decompose(value.a, value.b, value.c, value.d, value.e, value.f);
+  }
+
+  function interpolateTransform(parse, pxComma, pxParen, degParen) {
+
+    function pop(s) {
+      return s.length ? s.pop() + " " : "";
+    }
+
+    function translate(xa, ya, xb, yb, s, q) {
+      if (xa !== xb || ya !== yb) {
+        var i = s.push("translate(", null, pxComma, null, pxParen);
+        q.push({i: i - 4, x: number(xa, xb)}, {i: i - 2, x: number(ya, yb)});
+      } else if (xb || yb) {
+        s.push("translate(" + xb + pxComma + yb + pxParen);
+      }
+    }
+
+    function rotate(a, b, s, q) {
+      if (a !== b) {
+        if (a - b > 180) b += 360; else if (b - a > 180) a += 360; // shortest path
+        q.push({i: s.push(pop(s) + "rotate(", null, degParen) - 2, x: number(a, b)});
+      } else if (b) {
+        s.push(pop(s) + "rotate(" + b + degParen);
+      }
+    }
+
+    function skewX(a, b, s, q) {
+      if (a !== b) {
+        q.push({i: s.push(pop(s) + "skewX(", null, degParen) - 2, x: number(a, b)});
+      } else if (b) {
+        s.push(pop(s) + "skewX(" + b + degParen);
+      }
+    }
+
+    function scale(xa, ya, xb, yb, s, q) {
+      if (xa !== xb || ya !== yb) {
+        var i = s.push(pop(s) + "scale(", null, ",", null, ")");
+        q.push({i: i - 4, x: number(xa, xb)}, {i: i - 2, x: number(ya, yb)});
+      } else if (xb !== 1 || yb !== 1) {
+        s.push(pop(s) + "scale(" + xb + "," + yb + ")");
+      }
+    }
+
+    return function(a, b) {
+      var s = [], // string constants and placeholders
+          q = []; // number interpolators
+      a = parse(a), b = parse(b);
+      translate(a.translateX, a.translateY, b.translateX, b.translateY, s, q);
+      rotate(a.rotate, b.rotate, s, q);
+      skewX(a.skewX, b.skewX, s, q);
+      scale(a.scaleX, a.scaleY, b.scaleX, b.scaleY, s, q);
+      a = b = null; // gc
+      return function(t) {
+        var i = -1, n = q.length, o;
+        while (++i < n) s[(o = q[i]).i] = o.x(t);
+        return s.join("");
+      };
+    };
+  }
+
+  var interpolateTransformCss = interpolateTransform(parseCss, "px, ", "px)", "deg)");
+  var interpolateTransformSvg = interpolateTransform(parseSvg, ", ", ")", ")");
+
+  var epsilon2 = 1e-12;
+
+  function cosh(x) {
+    return ((x = Math.exp(x)) + 1 / x) / 2;
+  }
+
+  function sinh(x) {
+    return ((x = Math.exp(x)) - 1 / x) / 2;
+  }
+
+  function tanh(x) {
+    return ((x = Math.exp(2 * x)) - 1) / (x + 1);
+  }
+
+  var zoom = (function zoomRho(rho, rho2, rho4) {
+
+    // p0 = [ux0, uy0, w0]
+    // p1 = [ux1, uy1, w1]
+    function zoom(p0, p1) {
+      var ux0 = p0[0], uy0 = p0[1], w0 = p0[2],
+          ux1 = p1[0], uy1 = p1[1], w1 = p1[2],
+          dx = ux1 - ux0,
+          dy = uy1 - uy0,
+          d2 = dx * dx + dy * dy,
+          i,
+          S;
+
+      // Special case for u0 ≅ u1.
+      if (d2 < epsilon2) {
+        S = Math.log(w1 / w0) / rho;
+        i = function(t) {
+          return [
+            ux0 + t * dx,
+            uy0 + t * dy,
+            w0 * Math.exp(rho * t * S)
+          ];
+        };
+      }
+
+      // General case.
+      else {
+        var d1 = Math.sqrt(d2),
+            b0 = (w1 * w1 - w0 * w0 + rho4 * d2) / (2 * w0 * rho2 * d1),
+            b1 = (w1 * w1 - w0 * w0 - rho4 * d2) / (2 * w1 * rho2 * d1),
+            r0 = Math.log(Math.sqrt(b0 * b0 + 1) - b0),
+            r1 = Math.log(Math.sqrt(b1 * b1 + 1) - b1);
+        S = (r1 - r0) / rho;
+        i = function(t) {
+          var s = t * S,
+              coshr0 = cosh(r0),
+              u = w0 / (rho2 * d1) * (coshr0 * tanh(rho * s + r0) - sinh(r0));
+          return [
+            ux0 + u * dx,
+            uy0 + u * dy,
+            w0 * coshr0 / cosh(rho * s + r0)
+          ];
+        };
+      }
+
+      i.duration = S * 1000 * rho / Math.SQRT2;
+
+      return i;
+    }
+
+    zoom.rho = function(_) {
+      var _1 = Math.max(1e-3, +_), _2 = _1 * _1, _4 = _2 * _2;
+      return zoomRho(_1, _2, _4);
+    };
+
+    return zoom;
+  })(Math.SQRT2, 2, 4);
+
+  function hsl(hue) {
+    return function(start, end) {
+      var h = hue((start = hsl$2(start)).h, (end = hsl$2(end)).h),
+          s = nogamma(start.s, end.s),
+          l = nogamma(start.l, end.l),
+          opacity = nogamma(start.opacity, end.opacity);
+      return function(t) {
+        start.h = h(t);
+        start.s = s(t);
+        start.l = l(t);
+        start.opacity = opacity(t);
+        return start + "";
+      };
+    }
+  }
+
+  var hsl$1 = hsl(hue$1);
+  var hslLong = hsl(nogamma);
+
+  function lab(start, end) {
+    var l = nogamma((start = lab$1(start)).l, (end = lab$1(end)).l),
+        a = nogamma(start.a, end.a),
+        b = nogamma(start.b, end.b),
+        opacity = nogamma(start.opacity, end.opacity);
+    return function(t) {
+      start.l = l(t);
+      start.a = a(t);
+      start.b = b(t);
+      start.opacity = opacity(t);
+      return start + "";
+    };
+  }
+
+  function hcl(hue) {
+    return function(start, end) {
+      var h = hue((start = hcl$2(start)).h, (end = hcl$2(end)).h),
+          c = nogamma(start.c, end.c),
+          l = nogamma(start.l, end.l),
+          opacity = nogamma(start.opacity, end.opacity);
+      return function(t) {
+        start.h = h(t);
+        start.c = c(t);
+        start.l = l(t);
+        start.opacity = opacity(t);
+        return start + "";
+      };
+    }
+  }
+
+  var hcl$1 = hcl(hue$1);
+  var hclLong = hcl(nogamma);
+
+  function cubehelix$1(hue) {
+    return (function cubehelixGamma(y) {
+      y = +y;
+
+      function cubehelix(start, end) {
+        var h = hue((start = cubehelix$3(start)).h, (end = cubehelix$3(end)).h),
+            s = nogamma(start.s, end.s),
+            l = nogamma(start.l, end.l),
+            opacity = nogamma(start.opacity, end.opacity);
+        return function(t) {
+          start.h = h(t);
+          start.s = s(t);
+          start.l = l(Math.pow(t, y));
+          start.opacity = opacity(t);
+          return start + "";
+        };
+      }
+
+      cubehelix.gamma = cubehelixGamma;
+
+      return cubehelix;
+    })(1);
+  }
+
+  var cubehelix$2 = cubehelix$1(hue$1);
+  var cubehelixLong = cubehelix$1(nogamma);
+
+  function piecewise(interpolate, values) {
+    if (values === undefined) values = interpolate, interpolate = d3_interpolate;
+    var i = 0, n = values.length - 1, v = values[0], I = new Array(n < 0 ? 0 : n);
+    while (i < n) I[i] = interpolate(v, v = values[++i]);
+    return function(t) {
+      var i = Math.max(0, Math.min(n - 1, Math.floor(t *= n)));
+      return I[i](t - i);
+    };
+  }
+
+  function quantize(interpolator, n) {
+    var samples = new Array(n);
+    for (var i = 0; i < n; ++i) samples[i] = interpolator(i / (n - 1));
+    return samples;
+  }
+
   // TODO: support three or more stops
   function getGradientFunction(stops) {
     var min = stops[0] / 100,
@@ -28393,11 +29509,10 @@ ${svg}
 
   // convert a continuous index ([0, n-1], -1) to a corresponding interpolated value
   function getInterpolatedValueGetter(values, nullValue) {
-    var d3 = require('d3-interpolate');
     var interpolators = [];
     var tmax = values.length - 1;
     for (var i=1; i<values.length; i++) {
-      interpolators.push(d3.interpolate(values[i-1], values[i]));
+      interpolators.push(d3_interpolate(values[i-1], values[i]));
     }
     return function(t) {
       if (t == -1) return nullValue;
@@ -28415,7 +29530,6 @@ ${svg}
   // (colors and numbers should work)
   function interpolateValuesToClasses(values, n, stops) {
     if (values.length == n && !stops) return values;
-    var d3 = require('d3-interpolate');
     var numPairs = values.length - 1;
     var output = [values[0]];
     var k, j, t, intVal;
@@ -28424,7 +29538,7 @@ ${svg}
       j = Math.floor(k);
       t = k - j;
       // if (convert) t = convert(t);
-      intVal = d3.interpolate(values[j], values[j+1])(t);
+      intVal = d3_interpolate(values[j], values[j+1])(t);
       output.push(intVal);
     }
     output.push(values[values.length - 1]);
@@ -29365,6 +30479,518 @@ ${svg}
     return maxId + 1;
   }
 
+  function colors(specifier) {
+    var n = specifier.length / 6 | 0, colors = new Array(n), i = 0;
+    while (i < n) colors[i] = "#" + specifier.slice(i * 6, ++i * 6);
+    return colors;
+  }
+
+  var category10 = colors("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf");
+
+  var Accent = colors("7fc97fbeaed4fdc086ffff99386cb0f0027fbf5b17666666");
+
+  var Dark2 = colors("1b9e77d95f027570b3e7298a66a61ee6ab02a6761d666666");
+
+  var Paired = colors("a6cee31f78b4b2df8a33a02cfb9a99e31a1cfdbf6fff7f00cab2d66a3d9affff99b15928");
+
+  var Pastel1 = colors("fbb4aeb3cde3ccebc5decbe4fed9a6ffffcce5d8bdfddaecf2f2f2");
+
+  var Pastel2 = colors("b3e2cdfdcdaccbd5e8f4cae4e6f5c9fff2aef1e2cccccccc");
+
+  var Set1 = colors("e41a1c377eb84daf4a984ea3ff7f00ffff33a65628f781bf999999");
+
+  var Set2 = colors("66c2a5fc8d628da0cbe78ac3a6d854ffd92fe5c494b3b3b3");
+
+  var Set3 = colors("8dd3c7ffffb3bebadafb807280b1d3fdb462b3de69fccde5d9d9d9bc80bdccebc5ffed6f");
+
+  var Tableau10 = colors("4e79a7f28e2ce1575976b7b259a14fedc949af7aa1ff9da79c755fbab0ab");
+
+  var ramp$1 = scheme => rgbBasis(scheme[scheme.length - 1]);
+
+  var scheme$q = new Array(3).concat(
+    "d8b365f5f5f55ab4ac",
+    "a6611adfc27d80cdc1018571",
+    "a6611adfc27df5f5f580cdc1018571",
+    "8c510ad8b365f6e8c3c7eae55ab4ac01665e",
+    "8c510ad8b365f6e8c3f5f5f5c7eae55ab4ac01665e",
+    "8c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e",
+    "8c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e",
+    "5430058c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e003c30",
+    "5430058c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e003c30"
+  ).map(colors);
+
+  var BrBG = ramp$1(scheme$q);
+
+  var scheme$p = new Array(3).concat(
+    "af8dc3f7f7f77fbf7b",
+    "7b3294c2a5cfa6dba0008837",
+    "7b3294c2a5cff7f7f7a6dba0008837",
+    "762a83af8dc3e7d4e8d9f0d37fbf7b1b7837",
+    "762a83af8dc3e7d4e8f7f7f7d9f0d37fbf7b1b7837",
+    "762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b7837",
+    "762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b7837",
+    "40004b762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b783700441b",
+    "40004b762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b783700441b"
+  ).map(colors);
+
+  var PRGn = ramp$1(scheme$p);
+
+  var scheme$o = new Array(3).concat(
+    "e9a3c9f7f7f7a1d76a",
+    "d01c8bf1b6dab8e1864dac26",
+    "d01c8bf1b6daf7f7f7b8e1864dac26",
+    "c51b7de9a3c9fde0efe6f5d0a1d76a4d9221",
+    "c51b7de9a3c9fde0eff7f7f7e6f5d0a1d76a4d9221",
+    "c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221",
+    "c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221",
+    "8e0152c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221276419",
+    "8e0152c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221276419"
+  ).map(colors);
+
+  var PiYG = ramp$1(scheme$o);
+
+  var scheme$n = new Array(3).concat(
+    "998ec3f7f7f7f1a340",
+    "5e3c99b2abd2fdb863e66101",
+    "5e3c99b2abd2f7f7f7fdb863e66101",
+    "542788998ec3d8daebfee0b6f1a340b35806",
+    "542788998ec3d8daebf7f7f7fee0b6f1a340b35806",
+    "5427888073acb2abd2d8daebfee0b6fdb863e08214b35806",
+    "5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b35806",
+    "2d004b5427888073acb2abd2d8daebfee0b6fdb863e08214b358067f3b08",
+    "2d004b5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b358067f3b08"
+  ).map(colors);
+
+  var PuOr = ramp$1(scheme$n);
+
+  var scheme$m = new Array(3).concat(
+    "ef8a62f7f7f767a9cf",
+    "ca0020f4a58292c5de0571b0",
+    "ca0020f4a582f7f7f792c5de0571b0",
+    "b2182bef8a62fddbc7d1e5f067a9cf2166ac",
+    "b2182bef8a62fddbc7f7f7f7d1e5f067a9cf2166ac",
+    "b2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac",
+    "b2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac",
+    "67001fb2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac053061",
+    "67001fb2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac053061"
+  ).map(colors);
+
+  var RdBu = ramp$1(scheme$m);
+
+  var scheme$l = new Array(3).concat(
+    "ef8a62ffffff999999",
+    "ca0020f4a582bababa404040",
+    "ca0020f4a582ffffffbababa404040",
+    "b2182bef8a62fddbc7e0e0e09999994d4d4d",
+    "b2182bef8a62fddbc7ffffffe0e0e09999994d4d4d",
+    "b2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d",
+    "b2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d",
+    "67001fb2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d1a1a1a",
+    "67001fb2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d1a1a1a"
+  ).map(colors);
+
+  var RdGy = ramp$1(scheme$l);
+
+  var scheme$k = new Array(3).concat(
+    "fc8d59ffffbf91bfdb",
+    "d7191cfdae61abd9e92c7bb6",
+    "d7191cfdae61ffffbfabd9e92c7bb6",
+    "d73027fc8d59fee090e0f3f891bfdb4575b4",
+    "d73027fc8d59fee090ffffbfe0f3f891bfdb4575b4",
+    "d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4",
+    "d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4",
+    "a50026d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4313695",
+    "a50026d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4313695"
+  ).map(colors);
+
+  var RdYlBu = ramp$1(scheme$k);
+
+  var scheme$j = new Array(3).concat(
+    "fc8d59ffffbf91cf60",
+    "d7191cfdae61a6d96a1a9641",
+    "d7191cfdae61ffffbfa6d96a1a9641",
+    "d73027fc8d59fee08bd9ef8b91cf601a9850",
+    "d73027fc8d59fee08bffffbfd9ef8b91cf601a9850",
+    "d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850",
+    "d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850",
+    "a50026d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850006837",
+    "a50026d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850006837"
+  ).map(colors);
+
+  var RdYlGn = ramp$1(scheme$j);
+
+  var scheme$i = new Array(3).concat(
+    "fc8d59ffffbf99d594",
+    "d7191cfdae61abdda42b83ba",
+    "d7191cfdae61ffffbfabdda42b83ba",
+    "d53e4ffc8d59fee08be6f59899d5943288bd",
+    "d53e4ffc8d59fee08bffffbfe6f59899d5943288bd",
+    "d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd",
+    "d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd",
+    "9e0142d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd5e4fa2",
+    "9e0142d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd5e4fa2"
+  ).map(colors);
+
+  var Spectral = ramp$1(scheme$i);
+
+  var scheme$h = new Array(3).concat(
+    "e5f5f999d8c92ca25f",
+    "edf8fbb2e2e266c2a4238b45",
+    "edf8fbb2e2e266c2a42ca25f006d2c",
+    "edf8fbccece699d8c966c2a42ca25f006d2c",
+    "edf8fbccece699d8c966c2a441ae76238b45005824",
+    "f7fcfde5f5f9ccece699d8c966c2a441ae76238b45005824",
+    "f7fcfde5f5f9ccece699d8c966c2a441ae76238b45006d2c00441b"
+  ).map(colors);
+
+  var BuGn = ramp$1(scheme$h);
+
+  var scheme$g = new Array(3).concat(
+    "e0ecf49ebcda8856a7",
+    "edf8fbb3cde38c96c688419d",
+    "edf8fbb3cde38c96c68856a7810f7c",
+    "edf8fbbfd3e69ebcda8c96c68856a7810f7c",
+    "edf8fbbfd3e69ebcda8c96c68c6bb188419d6e016b",
+    "f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d6e016b",
+    "f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d810f7c4d004b"
+  ).map(colors);
+
+  var BuPu = ramp$1(scheme$g);
+
+  var scheme$f = new Array(3).concat(
+    "e0f3dba8ddb543a2ca",
+    "f0f9e8bae4bc7bccc42b8cbe",
+    "f0f9e8bae4bc7bccc443a2ca0868ac",
+    "f0f9e8ccebc5a8ddb57bccc443a2ca0868ac",
+    "f0f9e8ccebc5a8ddb57bccc44eb3d32b8cbe08589e",
+    "f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe08589e",
+    "f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe0868ac084081"
+  ).map(colors);
+
+  var GnBu = ramp$1(scheme$f);
+
+  var scheme$e = new Array(3).concat(
+    "fee8c8fdbb84e34a33",
+    "fef0d9fdcc8afc8d59d7301f",
+    "fef0d9fdcc8afc8d59e34a33b30000",
+    "fef0d9fdd49efdbb84fc8d59e34a33b30000",
+    "fef0d9fdd49efdbb84fc8d59ef6548d7301f990000",
+    "fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301f990000",
+    "fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301fb300007f0000"
+  ).map(colors);
+
+  var OrRd = ramp$1(scheme$e);
+
+  var scheme$d = new Array(3).concat(
+    "ece2f0a6bddb1c9099",
+    "f6eff7bdc9e167a9cf02818a",
+    "f6eff7bdc9e167a9cf1c9099016c59",
+    "f6eff7d0d1e6a6bddb67a9cf1c9099016c59",
+    "f6eff7d0d1e6a6bddb67a9cf3690c002818a016450",
+    "fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016450",
+    "fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016c59014636"
+  ).map(colors);
+
+  var PuBuGn = ramp$1(scheme$d);
+
+  var scheme$c = new Array(3).concat(
+    "ece7f2a6bddb2b8cbe",
+    "f1eef6bdc9e174a9cf0570b0",
+    "f1eef6bdc9e174a9cf2b8cbe045a8d",
+    "f1eef6d0d1e6a6bddb74a9cf2b8cbe045a8d",
+    "f1eef6d0d1e6a6bddb74a9cf3690c00570b0034e7b",
+    "fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0034e7b",
+    "fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0045a8d023858"
+  ).map(colors);
+
+  var PuBu = ramp$1(scheme$c);
+
+  var scheme$b = new Array(3).concat(
+    "e7e1efc994c7dd1c77",
+    "f1eef6d7b5d8df65b0ce1256",
+    "f1eef6d7b5d8df65b0dd1c77980043",
+    "f1eef6d4b9dac994c7df65b0dd1c77980043",
+    "f1eef6d4b9dac994c7df65b0e7298ace125691003f",
+    "f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125691003f",
+    "f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125698004367001f"
+  ).map(colors);
+
+  var PuRd = ramp$1(scheme$b);
+
+  var scheme$a = new Array(3).concat(
+    "fde0ddfa9fb5c51b8a",
+    "feebe2fbb4b9f768a1ae017e",
+    "feebe2fbb4b9f768a1c51b8a7a0177",
+    "feebe2fcc5c0fa9fb5f768a1c51b8a7a0177",
+    "feebe2fcc5c0fa9fb5f768a1dd3497ae017e7a0177",
+    "fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a0177",
+    "fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a017749006a"
+  ).map(colors);
+
+  var RdPu = ramp$1(scheme$a);
+
+  var scheme$9 = new Array(3).concat(
+    "edf8b17fcdbb2c7fb8",
+    "ffffcca1dab441b6c4225ea8",
+    "ffffcca1dab441b6c42c7fb8253494",
+    "ffffccc7e9b47fcdbb41b6c42c7fb8253494",
+    "ffffccc7e9b47fcdbb41b6c41d91c0225ea80c2c84",
+    "ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea80c2c84",
+    "ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea8253494081d58"
+  ).map(colors);
+
+  var YlGnBu = ramp$1(scheme$9);
+
+  var scheme$8 = new Array(3).concat(
+    "f7fcb9addd8e31a354",
+    "ffffccc2e69978c679238443",
+    "ffffccc2e69978c67931a354006837",
+    "ffffccd9f0a3addd8e78c67931a354006837",
+    "ffffccd9f0a3addd8e78c67941ab5d238443005a32",
+    "ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443005a32",
+    "ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443006837004529"
+  ).map(colors);
+
+  var YlGn = ramp$1(scheme$8);
+
+  var scheme$7 = new Array(3).concat(
+    "fff7bcfec44fd95f0e",
+    "ffffd4fed98efe9929cc4c02",
+    "ffffd4fed98efe9929d95f0e993404",
+    "ffffd4fee391fec44ffe9929d95f0e993404",
+    "ffffd4fee391fec44ffe9929ec7014cc4c028c2d04",
+    "ffffe5fff7bcfee391fec44ffe9929ec7014cc4c028c2d04",
+    "ffffe5fff7bcfee391fec44ffe9929ec7014cc4c02993404662506"
+  ).map(colors);
+
+  var YlOrBr = ramp$1(scheme$7);
+
+  var scheme$6 = new Array(3).concat(
+    "ffeda0feb24cf03b20",
+    "ffffb2fecc5cfd8d3ce31a1c",
+    "ffffb2fecc5cfd8d3cf03b20bd0026",
+    "ffffb2fed976feb24cfd8d3cf03b20bd0026",
+    "ffffb2fed976feb24cfd8d3cfc4e2ae31a1cb10026",
+    "ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cb10026",
+    "ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cbd0026800026"
+  ).map(colors);
+
+  var YlOrRd = ramp$1(scheme$6);
+
+  var scheme$5 = new Array(3).concat(
+    "deebf79ecae13182bd",
+    "eff3ffbdd7e76baed62171b5",
+    "eff3ffbdd7e76baed63182bd08519c",
+    "eff3ffc6dbef9ecae16baed63182bd08519c",
+    "eff3ffc6dbef9ecae16baed64292c62171b5084594",
+    "f7fbffdeebf7c6dbef9ecae16baed64292c62171b5084594",
+    "f7fbffdeebf7c6dbef9ecae16baed64292c62171b508519c08306b"
+  ).map(colors);
+
+  var Blues = ramp$1(scheme$5);
+
+  var scheme$4 = new Array(3).concat(
+    "e5f5e0a1d99b31a354",
+    "edf8e9bae4b374c476238b45",
+    "edf8e9bae4b374c47631a354006d2c",
+    "edf8e9c7e9c0a1d99b74c47631a354006d2c",
+    "edf8e9c7e9c0a1d99b74c47641ab5d238b45005a32",
+    "f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45005a32",
+    "f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45006d2c00441b"
+  ).map(colors);
+
+  var Greens = ramp$1(scheme$4);
+
+  var scheme$3 = new Array(3).concat(
+    "f0f0f0bdbdbd636363",
+    "f7f7f7cccccc969696525252",
+    "f7f7f7cccccc969696636363252525",
+    "f7f7f7d9d9d9bdbdbd969696636363252525",
+    "f7f7f7d9d9d9bdbdbd969696737373525252252525",
+    "fffffff0f0f0d9d9d9bdbdbd969696737373525252252525",
+    "fffffff0f0f0d9d9d9bdbdbd969696737373525252252525000000"
+  ).map(colors);
+
+  var Greys = ramp$1(scheme$3);
+
+  var scheme$2 = new Array(3).concat(
+    "efedf5bcbddc756bb1",
+    "f2f0f7cbc9e29e9ac86a51a3",
+    "f2f0f7cbc9e29e9ac8756bb154278f",
+    "f2f0f7dadaebbcbddc9e9ac8756bb154278f",
+    "f2f0f7dadaebbcbddc9e9ac8807dba6a51a34a1486",
+    "fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a34a1486",
+    "fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a354278f3f007d"
+  ).map(colors);
+
+  var Purples = ramp$1(scheme$2);
+
+  var scheme$1 = new Array(3).concat(
+    "fee0d2fc9272de2d26",
+    "fee5d9fcae91fb6a4acb181d",
+    "fee5d9fcae91fb6a4ade2d26a50f15",
+    "fee5d9fcbba1fc9272fb6a4ade2d26a50f15",
+    "fee5d9fcbba1fc9272fb6a4aef3b2ccb181d99000d",
+    "fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181d99000d",
+    "fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181da50f1567000d"
+  ).map(colors);
+
+  var Reds = ramp$1(scheme$1);
+
+  var scheme = new Array(3).concat(
+    "fee6cefdae6be6550d",
+    "feeddefdbe85fd8d3cd94701",
+    "feeddefdbe85fd8d3ce6550da63603",
+    "feeddefdd0a2fdae6bfd8d3ce6550da63603",
+    "feeddefdd0a2fdae6bfd8d3cf16913d948018c2d04",
+    "fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d948018c2d04",
+    "fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d94801a636037f2704"
+  ).map(colors);
+
+  var Oranges = ramp$1(scheme);
+
+  function cividis(t) {
+    t = Math.max(0, Math.min(1, t));
+    return "rgb("
+        + Math.max(0, Math.min(255, Math.round(-4.54 - t * (35.34 - t * (2381.73 - t * (6402.7 - t * (7024.72 - t * 2710.57))))))) + ", "
+        + Math.max(0, Math.min(255, Math.round(32.49 + t * (170.73 + t * (52.82 - t * (131.46 - t * (176.58 - t * 67.37))))))) + ", "
+        + Math.max(0, Math.min(255, Math.round(81.24 + t * (442.36 - t * (2482.43 - t * (6167.24 - t * (6614.94 - t * 2475.67)))))))
+        + ")";
+  }
+
+  var cubehelix = cubehelixLong(cubehelix$3(300, 0.5, 0.0), cubehelix$3(-240, 0.5, 1.0));
+
+  var warm = cubehelixLong(cubehelix$3(-100, 0.75, 0.35), cubehelix$3(80, 1.50, 0.8));
+
+  var cool = cubehelixLong(cubehelix$3(260, 0.75, 0.35), cubehelix$3(80, 1.50, 0.8));
+
+  var c$1 = cubehelix$3();
+
+  function rainbow(t) {
+    if (t < 0 || t > 1) t -= Math.floor(t);
+    var ts = Math.abs(t - 0.5);
+    c$1.h = 360 * t - 100;
+    c$1.s = 1.5 - 1.5 * ts;
+    c$1.l = 0.8 - 0.9 * ts;
+    return c$1 + "";
+  }
+
+  var c = rgb$1(),
+      pi_1_3 = Math.PI / 3,
+      pi_2_3 = Math.PI * 2 / 3;
+
+  function sinebow(t) {
+    var x;
+    t = (0.5 - t) * Math.PI;
+    c.r = 255 * (x = Math.sin(t)) * x;
+    c.g = 255 * (x = Math.sin(t + pi_1_3)) * x;
+    c.b = 255 * (x = Math.sin(t + pi_2_3)) * x;
+    return c + "";
+  }
+
+  function turbo(t) {
+    t = Math.max(0, Math.min(1, t));
+    return "rgb("
+        + Math.max(0, Math.min(255, Math.round(34.61 + t * (1172.33 - t * (10793.56 - t * (33300.12 - t * (38394.49 - t * 14825.05))))))) + ", "
+        + Math.max(0, Math.min(255, Math.round(23.31 + t * (557.33 + t * (1225.33 - t * (3574.96 - t * (1073.77 + t * 707.56))))))) + ", "
+        + Math.max(0, Math.min(255, Math.round(27.2 + t * (3211.1 - t * (15327.97 - t * (27814 - t * (22569.18 - t * 6838.66)))))))
+        + ")";
+  }
+
+  function ramp(range) {
+    var n = range.length;
+    return function(t) {
+      return range[Math.max(0, Math.min(n - 1, Math.floor(t * n)))];
+    };
+  }
+
+  var viridis = ramp(colors("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725"));
+
+  var magma = ramp(colors("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf"));
+
+  var inferno = ramp(colors("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4"));
+
+  var plasma = ramp(colors("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"));
+
+  var lib = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    schemeCategory10: category10,
+    schemeAccent: Accent,
+    schemeDark2: Dark2,
+    schemePaired: Paired,
+    schemePastel1: Pastel1,
+    schemePastel2: Pastel2,
+    schemeSet1: Set1,
+    schemeSet2: Set2,
+    schemeSet3: Set3,
+    schemeTableau10: Tableau10,
+    interpolateBrBG: BrBG,
+    schemeBrBG: scheme$q,
+    interpolatePRGn: PRGn,
+    schemePRGn: scheme$p,
+    interpolatePiYG: PiYG,
+    schemePiYG: scheme$o,
+    interpolatePuOr: PuOr,
+    schemePuOr: scheme$n,
+    interpolateRdBu: RdBu,
+    schemeRdBu: scheme$m,
+    interpolateRdGy: RdGy,
+    schemeRdGy: scheme$l,
+    interpolateRdYlBu: RdYlBu,
+    schemeRdYlBu: scheme$k,
+    interpolateRdYlGn: RdYlGn,
+    schemeRdYlGn: scheme$j,
+    interpolateSpectral: Spectral,
+    schemeSpectral: scheme$i,
+    interpolateBuGn: BuGn,
+    schemeBuGn: scheme$h,
+    interpolateBuPu: BuPu,
+    schemeBuPu: scheme$g,
+    interpolateGnBu: GnBu,
+    schemeGnBu: scheme$f,
+    interpolateOrRd: OrRd,
+    schemeOrRd: scheme$e,
+    interpolatePuBuGn: PuBuGn,
+    schemePuBuGn: scheme$d,
+    interpolatePuBu: PuBu,
+    schemePuBu: scheme$c,
+    interpolatePuRd: PuRd,
+    schemePuRd: scheme$b,
+    interpolateRdPu: RdPu,
+    schemeRdPu: scheme$a,
+    interpolateYlGnBu: YlGnBu,
+    schemeYlGnBu: scheme$9,
+    interpolateYlGn: YlGn,
+    schemeYlGn: scheme$8,
+    interpolateYlOrBr: YlOrBr,
+    schemeYlOrBr: scheme$7,
+    interpolateYlOrRd: YlOrRd,
+    schemeYlOrRd: scheme$6,
+    interpolateBlues: Blues,
+    schemeBlues: scheme$5,
+    interpolateGreens: Greens,
+    schemeGreens: scheme$4,
+    interpolateGreys: Greys,
+    schemeGreys: scheme$3,
+    interpolatePurples: Purples,
+    schemePurples: scheme$2,
+    interpolateReds: Reds,
+    schemeReds: scheme$1,
+    interpolateOranges: Oranges,
+    schemeOranges: scheme,
+    interpolateCividis: cividis,
+    interpolateCubehelixDefault: cubehelix,
+    interpolateRainbow: rainbow,
+    interpolateWarm: warm,
+    interpolateCool: cool,
+    interpolateSinebow: sinebow,
+    interpolateTurbo: turbo,
+    interpolateViridis: viridis,
+    interpolateMagma: magma,
+    interpolateInferno: inferno,
+    interpolatePlasma: plasma
+  });
+
   var index = {
     categorical: [],
     sequential: [],
@@ -29514,7 +31140,7 @@ ${svg}
   function getColorRamp(name, n, stops) {
     initSchemes();
     name = standardName(name);
-    var lib = require('d3-scale-chromatic');
+    // var lib = require('d3-scale-chromatic');
     var ramps = lib['scheme' + name];
     var interpolate = lib['interpolate' + name];
     var ramp;
@@ -29823,9 +31449,8 @@ ${svg}
   }
 
   function formatColorsAsHex(colors) {
-    var d3 = require('d3-color');
     return colors.map(function(col) {
-      var o = d3.color(col);
+      var o = color(col);
       if (!o) stop('Unable to parse color:', col);
       return o.formatHex();
     });
@@ -30487,6 +32112,9 @@ ${svg}
       targetDataset.arcs = mergedDataset.arcs;
       // dissolve clip layer shapes (to remove overlaps and other topological issues
       // that might confuse the clipping function)
+      // use a data-free copy of the clip lyr, so data records are not dissolved
+      // (this avoids triggering an unnecessary and expensive DBF read operation in some cases).
+      clipLyr = utils.defaults({data: null}, clipLyr);
       clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
 
     } else {
@@ -30888,6 +32516,8 @@ ${svg}
     getColorizerFunction: getColorizerFunction
   });
 
+  cmd.comment = function() {}; // no-op, so -comment doesn't trigger a parsing error
+
   function expressionUsesGeoJSON(exp) {
     return exp.includes('this.geojson');
   }
@@ -32634,10 +34264,10 @@ ${svg}
       moduleName = opts.module;
     }
     if (moduleFile) {
-      moduleFile = require('path').join(process.cwd(), moduleFile);
+      moduleFile = require$1('path').join(process.cwd(), moduleFile);
     }
     try {
-      _module = require(moduleFile || moduleName);
+      _module = require$1(moduleFile || moduleName);
       _module(coreAPI);
     } catch(e) {
       // stop(e);
@@ -33231,6 +34861,7 @@ ${svg}
   //   }).join(",") + "}");
   // };
 
+  // Removes points that are far from other points
   cmd.filterPoints = function(lyr, dataset, opts) {
     requireSinglePointLayer(lyr);
     if (opts.group_interval > 0 === false) {
@@ -33245,7 +34876,7 @@ ${svg}
     var index = new Uint8Array(points.length);
     var a, b, c, ai, bi, ci;
     for (var i=0, n=triangles.length; i<n; i+=3) {
-      // a, b, c: triangle verticies in CCW order
+      // a, b, c: triangle vertices in CCW order
       ai = triangles[i];
       bi = triangles[i+1];
       ci = triangles[i+2];
@@ -34417,7 +36048,7 @@ ${svg}
       var arcId = o.arcId,
           key = classify(arcId),
           isContinuation, line;
-      if (!!key) {
+      if (key) {
         line = key in index ? index[key] : null;
         isContinuation = key == prevKey && o.shapeId == prev.shapeId && o.partId == prev.partId;
         if (!line) {
@@ -34684,7 +36315,7 @@ ${svg}
   // TODO: add more projections
   //
   function expandProjDefn(str, dataset) {
-    var mproj = require('mproj');
+    var mproj = require$1('mproj');
     var proj4, params, bbox, isConic2SP, isCentered, decimals;
     if (str in mproj.internal.pj_list === false) {
       // not a bare projection code -- assume valid projection string in other format
@@ -34726,6 +36357,13 @@ ${svg}
     return `+lon_0=${ cx.toFixed(decimals) } +lat_0=${ cy.toFixed(decimals) }`;
   }
 
+  var ProjectionParams = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    expandProjDefn: expandProjDefn,
+    getConicParams: getConicParams,
+    getCenterParams: getCenterParams
+  });
+
   cmd.proj = function(dataset, catalog, opts) {
     var srcInfo, destInfo, destStr;
     if (opts.init) {
@@ -35090,6 +36728,14 @@ ${svg}
     job.control = null;
   }
 
+  function stopJob(job) {
+    getState(job).stopped = true;
+  }
+
+  function jobIsStopped(job) {
+    return getState(job).stopped === true;
+  }
+
   function inControlBlock(job) {
     return !!getState(job).inControlBlock;
   }
@@ -35158,6 +36804,7 @@ ${svg}
 
   function skipCommand(cmdName, job) {
     // allow all control commands to run
+    if (jobIsStopped(job)) return true;
     if (isControlFlowCommand(cmdName)) return false;
     return inControlBlock(job) && !inActiveBranch(job);
   }
@@ -36560,7 +38207,7 @@ ${svg}
     requireSinglePointLayer(srcLyr);
     var points = getPointsInLayer(srcLyr);
     var maxDist = opts.max_distance ? convertDistanceParam(opts.max_distance, crs) : 1e-3;
-    var kdbush = require('kdbush');
+    var kdbush = require$1('kdbush');
     var index = new kdbush(points);
     var lookup = getLookupFunction(index, crs, maxDist);
     var uniqIndex = new IdTestIndex(points.length);
@@ -37086,7 +38733,7 @@ ${svg}
       stop('Expected a non-negative interval parameter');
     }
     if (opts.radius > 0 === false) {
-      stop('Expected a non-negative radius parameter');
+      // stop('Expected a non-negative radius parameter');
     }
     // var bbox = getLayerBounds(pointLyr).toArray();
     // Use target dataset, so grids are aligned between layers
@@ -37114,27 +38761,24 @@ ${svg}
   };
 
   function getPolygonDataset(pointLyr, gridBBox, opts) {
-    var interval = opts.interval;
     var points = getPointsInLayer(pointLyr);
-    var grid = getGridData(gridBBox, interval);
-    var lookup = getPointIndex(points, grid, opts.radius);
-    var n = grid.cells();
+    var cellSize = opts.interval;
+    var grid = getGridData(gridBBox, cellSize, opts);
+    var pointCircleRadius = getPointCircleRadius(opts);
+    var findPointIdsByCellId = getPointIndex(points, grid, pointCircleRadius);
     var geojson = {
       type: 'FeatureCollection',
       features: []
     };
-    var calc = null;
-    var cands, center, weight, d;
-    if (opts.calc) {
-      calc = getJoinCalc(pointLyr.data, opts.calc);
-    }
+    var calc = opts.calc ? getJoinCalc(pointLyr.data, opts.calc) : null;
+    var candidateIds, weights, center, weight, d;
 
-    for (var i=0; i<n; i++) {
-      cands = lookup(i);
-      if (!cands.length) continue;
+    for (var i=0, n=grid.cells(); i<n; i++) {
+      candidateIds = findPointIdsByCellId(i);
+      if (!candidateIds.length) continue;
       center = grid.idxToPoint(i);
-      d = calcCellProperties(center, cands, points, calc, opts);
-      // weight = calcCellWeight(center, cands, points, opts);
+      weights = calcWeights(center, cellSize, points, candidateIds, pointCircleRadius);
+      d = calcCellProperties(candidateIds, weights, calc);
       if (d.weight > 0.05 === false) continue;
       d.id = i;
       geojson.features.push({
@@ -37143,44 +38787,43 @@ ${svg}
         geometry: makeCellPolygon(i, grid, opts)
       });
     }
-    var dataset = importGeoJSON(geojson, {});
-    return dataset;
+    return importGeoJSON(geojson, {});
   }
 
-  function calcCellProperties(center, cands, points, calc, opts) {
-    // radius of circle with same area as the cell
-    var interval = opts.interval;
-    var radius = interval * Math.sqrt(1 / Math.PI);
-    var circleArea = Math.PI * opts.radius * opts.radius;
-    var cellArea = interval * interval;
-    var ids = [];
-    var totArea = 0;
-    var intersection;
-    for (var i=0; i<cands.length; i++) {
-      intersection = twoCircleIntersection(center, radius, points[cands[i]], opts.radius);
-      if (intersection > 0 === false) continue;
-      totArea += intersection;
-      ids.push(cands[i]);
-    }
-    var d = {weight: totArea / cellArea};
+  function getPointCircleRadius(opts) {
+    var cellRadius = opts.interval * Math.sqrt(1 / Math.PI);
+    return opts.radius > 0 ? opts.radius : cellRadius;
+  }
+
+  function calcCellProperties(pointIds, weights, calc) {
+    var hitIds = [];
+    var weight = 0;
+    var partial;
+    var d;
+    for (var i=0; i<pointIds.length; i++) {
+      partial = weights[i];
+      if (partial > 0 === false) continue;
+      weight += partial;
+      hitIds.push(pointIds[i]);
+    }
+    d = {weight: weight};
     if (calc) {
-      calc(ids, d);
+      calc(hitIds, d);
     }
     return d;
   }
 
-  // function calcCellWeight(center, ids, points, opts) {
-  //   // radius of circle with same area as the cell
-  //   var interval = opts.interval;
-  //   var radius = interval * Math.sqrt(1 / Math.PI);
-  //   var circleArea = Math.PI * opts.radius * opts.radius;
-  //   var cellArea = interval * interval;
-  //   var totArea = 0;
-  //   for (var i=0; i<ids.length; i++) {
-  //     totArea += twoCircleIntersection(center, radius, points[ids[i]], opts.radius);
-  //   }
-  //   return totArea / cellArea;
-  // }
+  function calcWeights(cellCenter, cellSize, points, pointIds, pointRadius) {
+    var weights = [];
+    var cellRadius = cellSize * Math.sqrt(1 / Math.PI); // radius of circle with same area as cell
+    var cellArea = cellSize * cellSize;
+    var w;
+    for (var i=0; i<pointIds.length; i++) {
+      w = twoCircleIntersection(cellCenter, cellRadius, points[pointIds[i]], pointRadius) / cellArea;
+      weights.push(w);
+    }
+    return weights;
+  }
 
   // Source: https://diego.assencio.com/?index=8d6ca3d82151bad815f78addf9b5c1c6
   function twoCircleIntersection(c1, r1, c2, r2) {
@@ -37223,7 +38866,7 @@ ${svg}
   }
 
   function getPointIndex(points, grid, radius) {
-    var Flatbush = require('flatbush');
+    var Flatbush = require$1('flatbush');
     var gridIndex = new IdTestIndex(grid.cells());
     var bboxIndex = new Flatbush(points.length);
     var empty = [];
@@ -37235,10 +38878,19 @@ ${svg}
     return function(i) {
       if (!gridIndex.hasId(i)) return empty;
       var bbox = grid.idxToBBox(i);
-      return bboxIndex.search.apply(bboxIndex, bbox);
+      var indices = bboxIndex.search.apply(bboxIndex, bbox);
+      return indices;
     };
   }
 
+  function getPointsByIndex(points, indices) {
+    var arr = [];
+    for (var i=0; i<indices.length; i++) {
+      arr.push(points[indices[i]]);
+    }
+    return arr;
+  }
+
   function addPointToGridIndex(p, index, grid) {
     var i = grid.pointToIdx(p);
     var c = grid.idxToCol(i);
@@ -37264,23 +38916,52 @@ ${svg}
     return [p[0] - radius, p[1] - radius, p[0] + radius, p[1] + radius];
   }
 
-  function getGridInterpolator(bbox, interval) {
-    var sparseArr = [];
-    var grid = getGridData(bbox, interval);
-
-  }
-
-  // TODO: put this in a separate file, use it for other grid-based commands
-  // like -dots
-  function getGridData(bbox, interval) {
-    var xmin = bbox[0] - interval;
-    var ymin = bbox[1] - interval;
-    var xmax = bbox[2] + interval;
-    var ymax = bbox[3] + interval;
-    var w = xmax - xmin;
-    var h = ymax - ymin;
-    var cols = Math.ceil(w / interval);
-    var rows = Math.ceil(h / interval);
+  // grid boundaries includes the origin
+  // (this way, grids calculated from different sets of points will all align)
+  function getAlignedRange(minCoord, maxCoord, interval) {
+    var idx = Math.floor(minCoord / interval) - 1;
+    var idx2 = Math.ceil(maxCoord / interval) + 1;
+    return [idx * interval, idx2 * interval];
+  }
+
+  function getCenteredRange(minCoord, maxCoord, interval) {
+    var w = maxCoord - minCoord;
+    var w2 = Math.ceil(w / interval) * interval;
+    var pad = (w2 - w) / 2 + interval;
+    return [minCoord - pad, maxCoord + pad];
+  }
+
+  function getAlignedGridBounds(bbox, interval) {
+    var xx = getAlignedRange(bbox[0], bbox[2], interval);
+    var yy = getAlignedRange(bbox[1], bbox[3], interval);
+    return [xx[0], yy[0], xx[1], yy[1]];
+  }
+
+  function getCenteredGridBounds(bbox, interval) {
+    var xx = getCenteredRange(bbox[0], bbox[2], interval);
+    var yy = getCenteredRange(bbox[1], bbox[3], interval);
+    return [xx[0], yy[0], xx[1], yy[1]];
+  }
+
+  // TODO: Use this function for other grid-based commands
+  function getGridData(bbox, interval, opts) {
+    var extent = opts && opts.aligned ?
+      getAlignedGridBounds(bbox, interval) :
+      getCenteredGridBounds(bbox, interval);
+    var xmin = extent[0];
+    var ymin = extent[1];
+    var w = extent[2] - xmin;
+    var h = extent[3] - ymin;
+    var cols = Math.round(w / interval);
+    var rows = Math.round(h / interval);
+    // var xmin = bbox[0] - interval;
+    // var ymin = bbox[1] - interval;
+    // var xmax = bbox[2] + interval;
+    // var ymax = bbox[3] + interval;
+    // var w = xmax - xmin;
+    // var h = ymax - ymin;
+    // var cols = Math.ceil(w / interval);
+    // var rows = Math.ceil(h / interval);
     function size() {
       return [cols, rows];
     }
@@ -37644,10 +39325,10 @@ ${svg}
       moduleName = opts.module;
     }
     if (moduleFile) {
-      moduleFile = require('path').join(process.cwd(), moduleFile);
+      moduleFile = require$1('path').join(process.cwd(), moduleFile);
     }
     try {
-      mod = require(moduleFile || moduleName);
+      mod = require$1(moduleFile || moduleName);
     } catch(e) {
       stop(e);
     }
@@ -38818,6 +40499,10 @@ ${svg}
     getSplitNameFunction: getSplitNameFunction
   });
 
+  cmd.stop = function(job) {
+    stopJob(job);
+  };
+
   cmd.svgStyle = function(lyr, dataset, opts) {
     var filter;
     if (!lyr.data) {
@@ -38963,10 +40648,10 @@ ${svg}
       dy = stemLen * Math.cos(theta / 2);
 
       if (stickArrow) {
-        stem = getCurvedStemCoords(-ax, -ay, dx, dy, theta);
+        stem = getCurvedStemCoords(-ax, -ay, dx, dy);
       } else {
-        var leftStem = getCurvedStemCoords(-ax, -ay, -stemDx + dx, dy, theta);
-        var rightStem = getCurvedStemCoords(ax, ay, stemDx + dx, dy, theta);
+        var leftStem = getCurvedStemCoords(-ax, -ay, -stemDx + dx, dy);
+        var rightStem = getCurvedStemCoords(ax, ay, stemDx + dx, dy);
         stem = leftStem.concat(rightStem.reverse());
       }
 
@@ -39010,10 +40695,10 @@ ${svg}
     return coords;
   }
 
-  function calcStraightArrowCoords(stemLen, headLen, stemDx, headDx, baseDx) {
-    return [[baseDx, 0], [stemDx, stemLen], [headDx, stemLen], [0, stemLen + headLen],
-          [-headDx, stemLen], [-stemDx, stemLen], [-baseDx, 0], [baseDx, 0]];
-  }
+  // function calcStraightArrowCoords(stemLen, headLen, stemDx, headDx, baseDx) {
+  //   return [[baseDx, 0], [stemDx, stemLen], [headDx, stemLen], [0, stemLen + headLen],
+  //         [-headDx, stemLen], [-stemDx, stemLen], [-baseDx, 0], [baseDx, 0]];
+  // }
 
   function calcArrowSize(d, stickArrow) {
     // don't display arrows with negative length
@@ -39080,7 +40765,7 @@ ${svg}
 
   // ax, ay: point on the base
   // bx, by: point on the stem
-  function getCurvedStemCoords(ax, ay, bx, by, theta0) {
+  function getCurvedStemCoords(ax, ay, bx, by) {
     // case: curved side intrudes into head (because stem is too short)
     if (ay > by) {
       return [[ax * by / ay, by]];
@@ -39802,8 +41487,8 @@ ${svg}
   function commandAcceptsEmptyTarget(name) {
     return name == 'graticule' || name == 'i' || name == 'help' ||
       name == 'point-grid' || name == 'shape' || name == 'rectangle' ||
-      name == 'include' || name == 'print' || name == 'if' || name == 'elif' ||
-      name == 'else' || name == 'endif';
+      name == 'include' || name == 'print' || name == 'comment' || name == 'if' || name == 'elif' ||
+      name == 'else' || name == 'endif' || name == 'stop';
   }
 
   function runCommand(command, job, cb) {
@@ -39910,6 +41595,9 @@ ${svg}
       } else if (name == 'colorizer') {
         outputLayers = cmd.colorizer(opts);
 
+      } else if (name == 'comment') {
+        // no-op
+
       } else if (name == 'dashlines') {
         applyCommandToEachLayer(cmd.dashlines, targetLayers, targetDataset, opts);
 
@@ -40130,6 +41818,9 @@ ${svg}
       } else if (name == 'split') {
         outputLayers = applyCommandToEachLayer(cmd.splitLayer, targetLayers, opts.expression, opts);
 
+      } else if (name == 'stop') {
+        cmd.stop(job);
+
       } else if (name == 'split-on-grid') {
         outputLayers = applyCommandToEachLayer(cmd.splitLayerOnGrid, targetLayers, arcs, opts);
 
@@ -40288,7 +41979,7 @@ ${svg}
   //
   function runCommandsXL(argv) {
     var opts = importRunArgs.apply(null, arguments);
-    var mapshaperScript = require('path').join(__dirname, 'bin/mapshaper');
+    var mapshaperScript = require$1('path').join(__dirname, 'bin/mapshaper');
     var gb = parseFloat(opts.options.xl) || 8;
     var err;
     if (gb < 1 || gb > 64) {
@@ -40300,7 +41991,7 @@ ${svg}
     if (!loggingEnabled()) argv += ' -quiet'; // kludge to pass logging setting to subprocess
     var mb = Math.round(gb * 1000);
     var command = [process.execPath, '--max-old-space-size=' + mb, mapshaperScript, argv].join(' ');
-    var child = require('child_process').exec(command, {}, function(err, stdout, stderr) {
+    var child = require$1('child_process').exec(command, {}, function(err, stdout, stderr) {
       opts.callback(err);
     });
     child.stdout.pipe(process.stdout);
@@ -40895,7 +42586,6 @@ ${svg}
   // so they can be run by tests and by the GUI.
   // TODO: rewrite tests to import functions directly from modules,
   //       export only functions called by the GUI.
-
   var internal = {};
 
   internal.svg = Object.assign({}, SvgStringify, SvgPathUtils, GeojsonToSvg, SvgLabels, SvgSymbols);
@@ -41011,6 +42701,7 @@ ${svg}
     PostSimplifyRepair,
     Proj,
     Projections,
+    ProjectionParams,
     Rectangle,
     Rounding,
     RunCommands,
@@ -41028,7 +42719,7 @@ ${svg}
     Snapping,
     SourceUtils,
     Split,
-    State,
+    Env,
     Stash,
     Stringify,
     Svg,
@@ -41044,10 +42735,10 @@ ${svg}
   );
 
   // The entry point for the core mapshaper module
+
   var moduleAPI = Object.assign({
-    cli, geom, utils, internal,
-    importFile // Adding importFile() for compatibility with old tests; todo: rewrite tests
-  }, cmd, coreAPI);  // Adding command functions to the top-level module API, for test compatibility
+    cli, cmd, geom, utils, internal,
+  }, coreAPI);
 
   if (typeof module === "object" && module.exports) {
     module.exports = moduleAPI;