mapshaper 0.6.110 → 0.6.112

package/mapshaper.js

@@ -1211,8 +1211,13 @@
     if (len >= 2) {
       first = str.charAt(0);
       last = str.charAt(len-1);
-      if (first == '"' && last == '"' && !str.includes('","') ||
-          first == "'" && last == "'" && !str.includes("','")) {
+      // if (first == '"' && last == '"' && !str.includes('","') ||
+      //     first == "'" && last == "'" && !str.includes("','")) {
+      // don't strip if there are unescaped quotes
+      // e.g. expressions that start and end with quotes
+      // e.g. comma-separated list of quoted values
+      if (first == '"' && last == '"' && !/[^\\]"./.test(str) ||
+          first == "'" && last == "'" && !/[^\\]'./.test(str)) {
         str = str.substr(1, len-2);
         // remove string escapes
         str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
@@ -1347,6 +1352,18 @@
     }
   }
 
+  function time(slug) {
+    if (useDebug()) {
+      console.time(slug);
+    }
+  }
+
+  function timeEnd(slug) {
+    if (useDebug()) {
+      console.timeEnd(slug);
+    }
+  }
+
   function printError(err) {
     var msg;
     if (!LOGGING) return;
@@ -1465,6 +1482,8 @@
     setLoggingForCLI: setLoggingForCLI,
     setLoggingFunctions: setLoggingFunctions,
     stop: stop,
+    time: time,
+    timeEnd: timeEnd,
     truncateString: truncateString,
     useDebug: useDebug,
     useVerbose: useVerbose,
@@ -3113,1037 +3132,70 @@
     snapEndpointsByInterval: snapEndpointsByInterval
   });
 
-  /*
-   *  big.js v7.0.1
-   *  A small, fast, easy-to-use library for arbitrary-precision decimal arithmetic.
-   *  Copyright (c) 2025 Michael Mclaughlin
-   *  https://github.com/MikeMcl/big.js/LICENCE.md
-   */
-
-
-  /************************************** EDITABLE DEFAULTS *****************************************/
-
-
-    // The default values below must be integers within the stated ranges.
-
-    /*
-     * The maximum number of decimal places (DP) of the results of operations involving division:
-     * div and sqrt, and pow with negative exponents.
-     */
-  var DP = 20,          // 0 to MAX_DP
-
-    /*
-     * The rounding mode (RM) used when rounding to the above decimal places.
-     *
-     *  0  Towards zero (i.e. truncate, no rounding).       (ROUND_DOWN)
-     *  1  To nearest neighbour. If equidistant, round up.  (ROUND_HALF_UP)
-     *  2  To nearest neighbour. If equidistant, to even.   (ROUND_HALF_EVEN)
-     *  3  Away from zero.                                  (ROUND_UP)
-     */
-    RM = 1,             // 0, 1, 2 or 3
-
-    // The maximum value of DP and Big.DP.
-    MAX_DP = 1E6,       // 0 to 1000000
-
-    // The maximum magnitude of the exponent argument to the pow method.
-    MAX_POWER = 1E6,    // 1 to 1000000
-
-    /*
-     * The negative exponent (NE) at and beneath which toString returns exponential notation.
-     * (JavaScript numbers: -7)
-     * -1000000 is the minimum recommended exponent value of a Big.
-     */
-    NE = -7,            // 0 to -1000000
-
-    /*
-     * The positive exponent (PE) at and above which toString returns exponential notation.
-     * (JavaScript numbers: 21)
-     * 1000000 is the maximum recommended exponent value of a Big, but this limit is not enforced.
-     */
-    PE = 21,            // 0 to 1000000
-
-    /*
-     * When true, an error will be thrown if a primitive number is passed to the Big constructor,
-     * or if valueOf is called, or if toNumber is called on a Big which cannot be converted to a
-     * primitive number without a loss of precision.
-     */
-    STRICT = false,     // true or false
-
-
-  /**************************************************************************************************/
-
-
-    // Error messages.
-    NAME = '[big.js] ',
-    INVALID = NAME + 'Invalid ',
-    INVALID_DP = INVALID + 'decimal places',
-    INVALID_RM = INVALID + 'rounding mode',
-    DIV_BY_ZERO = NAME + 'Division by zero',
-
-    // The shared prototype object.
-    P = {},
-    UNDEFINED = void 0,
-    NUMERIC = /^-?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i;
-
-
-  /*
-   * Create and return a Big constructor.
-   */
-  function _Big_() {
-
-    /*
-     * The Big constructor and exported function.
-     * Create and return a new instance of a Big number object.
-     *
-     * n {number|string|Big} A numeric value.
-     */
-    function Big(n) {
-      var x = this;
-
-      // Enable constructor usage without new.
-      if (!(x instanceof Big)) {
-        return n === UNDEFINED && arguments.length === 0 ? _Big_() : new Big(n);
-      }
-
-
-      // Duplicate.
-      if (n instanceof Big) {
-        x.s = n.s;
-        x.e = n.e;
-        x.c = n.c.slice();
-      } else {
-        if (typeof n !== 'string') {
-          if (Big.strict === true && typeof n !== 'bigint') {
-            throw TypeError(INVALID + 'value');
-          }
-
-          // Minus zero?
-          n = n === 0 && 1 / n < 0 ? '-0' : String(n);
-        }
-
-        parse(x, n);
-      }
-
-      // Retain a reference to this Big constructor.
-      // Shadow Big.prototype.constructor which points to Object.
-      x.constructor = Big;
-    }
-
-    Big.prototype = P;
-    Big.DP = DP;
-    Big.RM = RM;
-    Big.NE = NE;
-    Big.PE = PE;
-    Big.strict = STRICT;
-    Big.roundDown = 0;
-    Big.roundHalfUp = 1;
-    Big.roundHalfEven = 2;
-    Big.roundUp = 3;
-
-    return Big;
-  }
-
-
-  /*
-   * Parse the number or string value passed to a Big constructor.
-   *
-   * x {Big} A Big number instance.
-   * n {number|string} A numeric value.
-   */
-  function parse(x, n) {
-    var e, i, nl;
-
-    if (!NUMERIC.test(n)) {
-      throw Error(INVALID + 'number');
-    }
-
-    // Determine sign.
-    x.s = n.charAt(0) == '-' ? (n = n.slice(1), -1) : 1;
-
-    // Decimal point?
-    if ((e = n.indexOf('.')) > -1) n = n.replace('.', '');
-
-    // Exponential form?
-    if ((i = n.search(/e/i)) > 0) {
-
-      // Determine exponent.
-      if (e < 0) e = i;
-      e += +n.slice(i + 1);
-      n = n.substring(0, i);
-    } else if (e < 0) {
-
-      // Integer.
-      e = n.length;
-    }
-
-    nl = n.length;
-
-    // Determine leading zeros.
-    for (i = 0; i < nl && n.charAt(i) == '0';) ++i;
-
-    if (i == nl) {
-
-      // Zero.
-      x.c = [x.e = 0];
-    } else {
-
-      // Determine trailing zeros.
-      for (; nl > 0 && n.charAt(--nl) == '0';);
-      x.e = e - i - 1;
-      x.c = [];
-
-      // Convert string to array of digits without leading/trailing zeros.
-      for (e = 0; i <= nl;) x.c[e++] = +n.charAt(i++);
-    }
-
-    return x;
-  }
-
-
-  /*
-   * Round Big x to a maximum of sd significant digits using rounding mode rm.
-   *
-   * x {Big} The Big to round.
-   * sd {number} Significant digits: integer, 0 to MAX_DP inclusive.
-   * rm {number} Rounding mode: 0 (down), 1 (half-up), 2 (half-even) or 3 (up).
-   * [more] {boolean} Whether the result of division was truncated.
-   */
-  function round(x, sd, rm, more) {
-    var xc = x.c;
-
-    if (rm === UNDEFINED) rm = x.constructor.RM;
-    if (rm !== 0 && rm !== 1 && rm !== 2 && rm !== 3) {
-      throw Error(INVALID_RM);
-    }
-
-    if (sd < 1) {
-      more =
-        rm === 3 && (more || !!xc[0]) || sd === 0 && (
-        rm === 1 && xc[0] >= 5 ||
-        rm === 2 && (xc[0] > 5 || xc[0] === 5 && (more || xc[1] !== UNDEFINED))
-      );
-
-      xc.length = 1;
-
-      if (more) {
-
-        // 1, 0.1, 0.01, 0.001, 0.0001 etc.
-        x.e = x.e - sd + 1;
-        xc[0] = 1;
-      } else {
-
-        // Zero.
-        xc[0] = x.e = 0;
-      }
-    } else if (sd < xc.length) {
-
-      // xc[sd] is the digit after the digit that may be rounded up.
-      more =
-        rm === 1 && xc[sd] >= 5 ||
-        rm === 2 && (xc[sd] > 5 || xc[sd] === 5 &&
-          (more || xc[sd + 1] !== UNDEFINED || xc[sd - 1] & 1)) ||
-        rm === 3 && (more || !!xc[0]);
-
-      // Remove any digits after the required precision.
-      xc.length = sd;
-
-      // Round up?
-      if (more) {
-
-        // Rounding up may mean the previous digit has to be rounded up.
-        for (; ++xc[--sd] > 9;) {
-          xc[sd] = 0;
-          if (sd === 0) {
-            ++x.e;
-            xc.unshift(1);
-            break;
-          }
-        }
-      }
-
-      // Remove trailing zeros.
-      for (sd = xc.length; !xc[--sd];) xc.pop();
-    }
-
-    return x;
-  }
-
-
-  /*
-   * Return a string representing the value of Big x in normal or exponential notation.
-   * Handles P.toExponential, P.toFixed, P.toJSON, P.toPrecision, P.toString and P.valueOf.
-   */
-  function stringify$1(x, doExponential, isNonzero) {
-    var e = x.e,
-      s = x.c.join(''),
-      n = s.length;
-
-    // Exponential notation?
-    if (doExponential) {
-      s = s.charAt(0) + (n > 1 ? '.' + s.slice(1) : '') + (e < 0 ? 'e' : 'e+') + e;
-
-    // Normal notation.
-    } else if (e < 0) {
-      for (; ++e;) s = '0' + s;
-      s = '0.' + s;
-    } else if (e > 0) {
-      if (++e > n) {
-        for (e -= n; e--;) s += '0';
-      } else if (e < n) {
-        s = s.slice(0, e) + '.' + s.slice(e);
-      }
-    } else if (n > 1) {
-      s = s.charAt(0) + '.' + s.slice(1);
-    }
-
-    return x.s < 0 && isNonzero ? '-' + s : s;
-  }
-
-
-  // Prototype/instance methods
-
-
-  /*
-   * Return a new Big whose value is the absolute value of this Big.
-   */
-  P.abs = function () {
-    var x = new this.constructor(this);
-    x.s = 1;
-    return x;
-  };
-
-
-  /*
-   * Return 1 if the value of this Big is greater than the value of Big y,
-   *       -1 if the value of this Big is less than the value of Big y, or
-   *        0 if they have the same value.
-   */
-  P.cmp = function (y) {
-    var isneg,
-      x = this,
-      xc = x.c,
-      yc = (y = new x.constructor(y)).c,
-      i = x.s,
-      j = y.s,
-      k = x.e,
-      l = y.e;
-
-    // Either zero?
-    if (!xc[0] || !yc[0]) return !xc[0] ? !yc[0] ? 0 : -j : i;
-
-    // Signs differ?
-    if (i != j) return i;
-
-    isneg = i < 0;
-
-    // Compare exponents.
-    if (k != l) return k > l ^ isneg ? 1 : -1;
-
-    j = (k = xc.length) < (l = yc.length) ? k : l;
-
-    // Compare digit by digit.
-    for (i = -1; ++i < j;) {
-      if (xc[i] != yc[i]) return xc[i] > yc[i] ^ isneg ? 1 : -1;
-    }
-
-    // Compare lengths.
-    return k == l ? 0 : k > l ^ isneg ? 1 : -1;
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big divided by the value of Big y, rounded,
-   * if necessary, to a maximum of Big.DP decimal places using rounding mode Big.RM.
-   */
-  P.div = function (y) {
-    var x = this,
-      Big = x.constructor,
-      a = x.c,                  // dividend
-      b = (y = new Big(y)).c,   // divisor
-      k = x.s == y.s ? 1 : -1,
-      dp = Big.DP;
-
-    if (dp !== ~~dp || dp < 0 || dp > MAX_DP) {
-      throw Error(INVALID_DP);
-    }
-
-    // Divisor is zero?
-    if (!b[0]) {
-      throw Error(DIV_BY_ZERO);
-    }
-
-    // Dividend is 0? Return +-0.
-    if (!a[0]) {
-      y.s = k;
-      y.c = [y.e = 0];
-      return y;
-    }
-
-    var bl, bt, n, cmp, ri,
-      bz = b.slice(),
-      ai = bl = b.length,
-      al = a.length,
-      r = a.slice(0, bl),   // remainder
-      rl = r.length,
-      q = y,                // quotient
-      qc = q.c = [],
-      qi = 0,
-      p = dp + (q.e = x.e - y.e) + 1;    // precision of the result
-
-    q.s = k;
-    k = p < 0 ? 0 : p;
-
-    // Create version of divisor with leading zero.
-    bz.unshift(0);
-
-    // Add zeros to make remainder as long as divisor.
-    for (; rl++ < bl;) r.push(0);
-
-    do {
-
-      // n is how many times the divisor goes into current remainder.
-      for (n = 0; n < 10; n++) {
-
-        // Compare divisor and remainder.
-        if (bl != (rl = r.length)) {
-          cmp = bl > rl ? 1 : -1;
-        } else {
-          for (ri = -1, cmp = 0; ++ri < bl;) {
-            if (b[ri] != r[ri]) {
-              cmp = b[ri] > r[ri] ? 1 : -1;
-              break;
-            }
-          }
-        }
-
-        // If divisor < remainder, subtract divisor from remainder.
-        if (cmp < 0) {
-
-          // Remainder can't be more than 1 digit longer than divisor.
-          // Equalise lengths using divisor with extra leading zero?
-          for (bt = rl == bl ? b : bz; rl;) {
-            if (r[--rl] < bt[rl]) {
-              ri = rl;
-              for (; ri && !r[--ri];) r[ri] = 9;
-              --r[ri];
-              r[rl] += 10;
-            }
-            r[rl] -= bt[rl];
-          }
-
-          for (; !r[0];) r.shift();
-        } else {
-          break;
-        }
-      }
-
-      // Add the digit n to the result array.
-      qc[qi++] = cmp ? n : ++n;
-
-      // Update the remainder.
-      if (r[0] && cmp) r[rl] = a[ai] || 0;
-      else r = [a[ai]];
-
-    } while ((ai++ < al || r[0] !== UNDEFINED) && k--);
-
-    // Leading zero? Do not remove if result is simply zero (qi == 1).
-    if (!qc[0] && qi != 1) {
-
-      // There can't be more than one zero.
-      qc.shift();
-      q.e--;
-      p--;
-    }
-
-    // Round?
-    if (qi > p) round(q, p, Big.RM, r[0] !== UNDEFINED);
-
-    return q;
-  };
-
-
-  /*
-   * Return true if the value of this Big is equal to the value of Big y, otherwise return false.
-   */
-  P.eq = function (y) {
-    return this.cmp(y) === 0;
-  };
-
-
-  /*
-   * Return true if the value of this Big is greater than the value of Big y, otherwise return
-   * false.
-   */
-  P.gt = function (y) {
-    return this.cmp(y) > 0;
-  };
-
-
-  /*
-   * Return true if the value of this Big is greater than or equal to the value of Big y, otherwise
-   * return false.
-   */
-  P.gte = function (y) {
-    return this.cmp(y) > -1;
-  };
-
-
-  /*
-   * Return true if the value of this Big is less than the value of Big y, otherwise return false.
-   */
-  P.lt = function (y) {
-    return this.cmp(y) < 0;
-  };
-
-
-  /*
-   * Return true if the value of this Big is less than or equal to the value of Big y, otherwise
-   * return false.
-   */
-  P.lte = function (y) {
-    return this.cmp(y) < 1;
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big minus the value of Big y.
-   */
-  P.minus = P.sub = function (y) {
-    var i, j, t, xlty,
-      x = this,
-      Big = x.constructor,
-      a = x.s,
-      b = (y = new Big(y)).s;
-
-    // Signs differ?
-    if (a != b) {
-      y.s = -b;
-      return x.plus(y);
-    }
-
-    var xc = x.c.slice(),
-      xe = x.e,
-      yc = y.c,
-      ye = y.e;
-
-    // Either zero?
-    if (!xc[0] || !yc[0]) {
-      if (yc[0]) {
-        y.s = -b;
-      } else if (xc[0]) {
-        y = new Big(x);
-      } else {
-        y.s = 1;
-      }
-      return y;
-    }
-
-    // Determine which is the bigger number. Prepend zeros to equalise exponents.
-    if (a = xe - ye) {
-
-      if (xlty = a < 0) {
-        a = -a;
-        t = xc;
-      } else {
-        ye = xe;
-        t = yc;
-      }
-
-      t.reverse();
-      for (b = a; b--;) t.push(0);
-      t.reverse();
-    } else {
-
-      // Exponents equal. Check digit by digit.
-      j = ((xlty = xc.length < yc.length) ? xc : yc).length;
-
-      for (a = b = 0; b < j; b++) {
-        if (xc[b] != yc[b]) {
-          xlty = xc[b] < yc[b];
-          break;
-        }
-      }
-    }
-
-    // x < y? Point xc to the array of the bigger number.
-    if (xlty) {
-      t = xc;
-      xc = yc;
-      yc = t;
-      y.s = -y.s;
-    }
-
-    /*
-     * Append zeros to xc if shorter. No need to add zeros to yc if shorter as subtraction only
-     * needs to start at yc.length.
-     */
-    if ((b = (j = yc.length) - (i = xc.length)) > 0) for (; b--;) xc[i++] = 0;
-
-    // Subtract yc from xc.
-    for (b = i; j > a;) {
-      if (xc[--j] < yc[j]) {
-        for (i = j; i && !xc[--i];) xc[i] = 9;
-        --xc[i];
-        xc[j] += 10;
-      }
-
-      xc[j] -= yc[j];
-    }
-
-    // Remove trailing zeros.
-    for (; xc[--b] === 0;) xc.pop();
-
-    // Remove leading zeros and adjust exponent accordingly.
-    for (; xc[0] === 0;) {
-      xc.shift();
-      --ye;
-    }
-
-    if (!xc[0]) {
-
-      // n - n = +0
-      y.s = 1;
-
-      // Result must be zero.
-      xc = [ye = 0];
-    }
-
-    y.c = xc;
-    y.e = ye;
-
-    return y;
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big modulo the value of Big y.
-   */
-  P.mod = function (y) {
-    var ygtx,
-      x = this,
-      Big = x.constructor,
-      a = x.s,
-      b = (y = new Big(y)).s;
-
-    if (!y.c[0]) {
-      throw Error(DIV_BY_ZERO);
-    }
-
-    x.s = y.s = 1;
-    ygtx = y.cmp(x) == 1;
-    x.s = a;
-    y.s = b;
-
-    if (ygtx) return new Big(x);
-
-    a = Big.DP;
-    b = Big.RM;
-    Big.DP = Big.RM = 0;
-    x = x.div(y);
-    Big.DP = a;
-    Big.RM = b;
-
-    return this.minus(x.times(y));
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big negated.
-   */
-  P.neg = function () {
-    var x = new this.constructor(this);
-    x.s = -x.s;
-    return x;
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big plus the value of Big y.
-   */
-  P.plus = P.add = function (y) {
-    var e, k, t,
-      x = this,
-      Big = x.constructor;
-
-    y = new Big(y);
-
-    // Signs differ?
-    if (x.s != y.s) {
-      y.s = -y.s;
-      return x.minus(y);
-    }
-
-    var xe = x.e,
-      xc = x.c,
-      ye = y.e,
-      yc = y.c;
-
-    // Either zero?
-    if (!xc[0] || !yc[0]) {
-      if (!yc[0]) {
-        if (xc[0]) {
-          y = new Big(x);
-        } else {
-          y.s = x.s;
-        }
-      }
-      return y;
-    }
-
-    xc = xc.slice();
-
-    // Prepend zeros to equalise exponents.
-    // Note: reverse faster than unshifts.
-    if (e = xe - ye) {
-      if (e > 0) {
-        ye = xe;
-        t = yc;
-      } else {
-        e = -e;
-        t = xc;
-      }
-
-      t.reverse();
-      for (; e--;) t.push(0);
-      t.reverse();
-    }
-
-    // Point xc to the longer array.
-    if (xc.length - yc.length < 0) {
-      t = yc;
-      yc = xc;
-      xc = t;
-    }
-
-    e = yc.length;
-
-    // Only start adding at yc.length - 1 as the further digits of xc can be left as they are.
-    for (k = 0; e; xc[e] %= 10) k = (xc[--e] = xc[e] + yc[e] + k) / 10 | 0;
-
-    // No need to check for zero, as +x + +y != 0 && -x + -y != 0
-
-    if (k) {
-      xc.unshift(k);
-      ++ye;
-    }
-
-    // Remove trailing zeros.
-    for (e = xc.length; xc[--e] === 0;) xc.pop();
-
-    y.c = xc;
-    y.e = ye;
-
-    return y;
-  };
-
-
-  /*
-   * Return a Big whose value is the value of this Big raised to the power n.
-   * If n is negative, round to a maximum of Big.DP decimal places using rounding
-   * mode Big.RM.
-   *
-   * n {number} Integer, -MAX_POWER to MAX_POWER inclusive.
-   */
-  P.pow = function (n) {
-    var x = this,
-      one = new x.constructor('1'),
-      y = one,
-      isneg = n < 0;
-
-    if (n !== ~~n || n < -MAX_POWER || n > MAX_POWER) {
-      throw Error(INVALID + 'exponent');
-    }
-
-    if (isneg) n = -n;
-
-    for (;;) {
-      if (n & 1) y = y.times(x);
-      n >>= 1;
-      if (!n) break;
-      x = x.times(x);
-    }
-
-    return isneg ? one.div(y) : y;
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big rounded to a maximum precision of sd
-   * significant digits using rounding mode rm, or Big.RM if rm is not specified.
-   *
-   * sd {number} Significant digits: integer, 1 to MAX_DP inclusive.
-   * rm? {number} Rounding mode: 0 (down), 1 (half-up), 2 (half-even) or 3 (up).
-   */
-  P.prec = function (sd, rm) {
-    if (sd !== ~~sd || sd < 1 || sd > MAX_DP) {
-      throw Error(INVALID + 'precision');
-    }
-    return round(new this.constructor(this), sd, rm);
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big rounded to a maximum of dp decimal places
-   * using rounding mode rm, or Big.RM if rm is not specified.
-   * If dp is negative, round to an integer which is a multiple of 10**-dp.
-   * If dp is not specified, round to 0 decimal places.
-   *
-   * dp? {number} Integer, -MAX_DP to MAX_DP inclusive.
-   * rm? {number} Rounding mode: 0 (down), 1 (half-up), 2 (half-even) or 3 (up).
-   */
-  P.round = function (dp, rm) {
-    if (dp === UNDEFINED) dp = 0;
-    else if (dp !== ~~dp || dp < -MAX_DP || dp > MAX_DP) {
-      throw Error(INVALID_DP);
-    }
-    return round(new this.constructor(this), dp + this.e + 1, rm);
-  };
-
-
-  /*
-   * Return a new Big whose value is the square root of the value of this Big, rounded, if
-   * necessary, to a maximum of Big.DP decimal places using rounding mode Big.RM.
-   */
-  P.sqrt = function () {
-    var r, c, t,
-      x = this,
-      Big = x.constructor,
-      s = x.s,
-      e = x.e,
-      half = new Big('0.5');
-
-    // Zero?
-    if (!x.c[0]) return new Big(x);
-
-    // Negative?
-    if (s < 0) {
-      throw Error(NAME + 'No square root');
-    }
-
-    // Estimate.
-    s = Math.sqrt(+stringify$1(x, true, true));
-
-    // Math.sqrt underflow/overflow?
-    // Re-estimate: pass x coefficient to Math.sqrt as integer, then adjust the result exponent.
-    if (s === 0 || s === 1 / 0) {
-      c = x.c.join('');
-      if (!(c.length + e & 1)) c += '0';
-      s = Math.sqrt(c);
-      e = ((e + 1) / 2 | 0) - (e < 0 || e & 1);
-      r = new Big((s == 1 / 0 ? '5e' : (s = s.toExponential()).slice(0, s.indexOf('e') + 1)) + e);
-    } else {
-      r = new Big(s + '');
-    }
-
-    e = r.e + (Big.DP += 4);
-
-    // Newton-Raphson iteration.
-    do {
-      t = r;
-      r = half.times(t.plus(x.div(t)));
-    } while (t.c.slice(0, e).join('') !== r.c.slice(0, e).join(''));
-
-    return round(r, (Big.DP -= 4) + r.e + 1, Big.RM);
-  };
-
-
-  /*
-   * Return a new Big whose value is the value of this Big times the value of Big y.
-   */
-  P.times = P.mul = function (y) {
-    var c,
-      x = this,
-      Big = x.constructor,
-      xc = x.c,
-      yc = (y = new Big(y)).c,
-      a = xc.length,
-      b = yc.length,
-      i = x.e,
-      j = y.e;
-
-    // Determine sign of result.
-    y.s = x.s == y.s ? 1 : -1;
-
-    // Return signed 0 if either 0.
-    if (!xc[0] || !yc[0]) {
-      y.c = [y.e = 0];
-      return y;
-    }
-
-    // Initialise exponent of result as x.e + y.e.
-    y.e = i + j;
-
-    // If array xc has fewer digits than yc, swap xc and yc, and lengths.
-    if (a < b) {
-      c = xc;
-      xc = yc;
-      yc = c;
-      j = a;
-      a = b;
-      b = j;
-    }
-
-    // Initialise coefficient array of result with zeros.
-    for (c = new Array(j = a + b); j--;) c[j] = 0;
-
-    // Multiply.
-
-    // i is initially xc.length.
-    for (i = b; i--;) {
-      b = 0;
-
-      // a is yc.length.
-      for (j = a + i; j > i;) {
-
-        // Current sum of products at this digit position, plus carry.
-        b = c[j] + yc[i] * xc[j - i - 1] + b;
-        c[j--] = b % 10;
-
-        // carry
-        b = b / 10 | 0;
-      }
-
-      c[j] = b;
-    }
-
-    // Increment result exponent if there is a final carry, otherwise remove leading zero.
-    if (b) ++y.e;
-    else c.shift();
-
-    // Remove trailing zeros.
-    for (i = c.length; !c[--i];) c.pop();
-    y.c = c;
-
-    return y;
-  };
-
-
-  /*
-   * Return a string representing the value of this Big in exponential notation rounded to dp fixed
-   * decimal places using rounding mode rm, or Big.RM if rm is not specified.
-   *
-   * dp? {number} Decimal places: integer, 0 to MAX_DP inclusive.
-   * rm? {number} Rounding mode: 0 (down), 1 (half-up), 2 (half-even) or 3 (up).
-   */
-  P.toExponential = function (dp, rm) {
-    var x = this,
-      n = x.c[0];
-
-    if (dp !== UNDEFINED) {
-      if (dp !== ~~dp || dp < 0 || dp > MAX_DP) {
-        throw Error(INVALID_DP);
-      }
-      x = round(new x.constructor(x), ++dp, rm);
-      for (; x.c.length < dp;) x.c.push(0);
-    }
-
-    return stringify$1(x, true, !!n);
-  };
-
-
-  /*
-   * Return a string representing the value of this Big in normal notation rounded to dp fixed
-   * decimal places using rounding mode rm, or Big.RM if rm is not specified.
-   *
-   * dp? {number} Decimal places: integer, 0 to MAX_DP inclusive.
-   * rm? {number} Rounding mode: 0 (down), 1 (half-up), 2 (half-even) or 3 (up).
-   *
-   * (-0).toFixed(0) is '0', but (-0.1).toFixed(0) is '-0'.
-   * (-0).toFixed(1) is '0.0', but (-0.01).toFixed(1) is '-0.0'.
-   */
-  P.toFixed = function (dp, rm) {
-    var x = this,
-      n = x.c[0];
-
-    if (dp !== UNDEFINED) {
-      if (dp !== ~~dp || dp < 0 || dp > MAX_DP) {
-        throw Error(INVALID_DP);
-      }
-      x = round(new x.constructor(x), dp + x.e + 1, rm);
-
-      // x.e may have changed if the value is rounded up.
-      for (dp = dp + x.e + 1; x.c.length < dp;) x.c.push(0);
-    }
-
-    return stringify$1(x, false, !!n);
-  };
-
-
-  /*
-   * Return a string representing the value of this Big.
-   * Return exponential notation if this Big has a positive exponent equal to or greater than
-   * Big.PE, or a negative exponent equal to or less than Big.NE.
-   * Omit the sign for negative zero.
-   */
-  P.toJSON = P.toString = function () {
-    var x = this,
-      Big = x.constructor;
-    return stringify$1(x, x.e <= Big.NE || x.e >= Big.PE, !!x.c[0]);
-  };
-
-  if (typeof Symbol !== "undefined") {
-    P[Symbol.for('nodejs.util.inspect.custom')] = P.toJSON;
-  }
-
-
-  /*
-   * Return the value of this Big as a primitive number.
-   */
-  P.toNumber = function () {
-    var n = +stringify$1(this, true, true);
-    if (this.constructor.strict === true && !this.eq(n.toString())) {
-      throw Error(NAME + 'Imprecise conversion');
-    }
-    return n;
-  };
-
-
-  /*
-   * Return a string representing the value of this Big rounded to sd significant digits using
-   * rounding mode rm, or Big.RM if rm is not specified.
-   * Use exponential notation if sd is less than the number of digits necessary to represent
-   * the integer part of the value in normal notation.
-   *
-   * sd {number} Significant digits: integer, 1 to MAX_DP inclusive.
-   * rm? {number} Rounding mode: 0 (down), 1 (half-up), 2 (half-even) or 3 (up).
-   */
-  P.toPrecision = function (sd, rm) {
-    var x = this,
-      Big = x.constructor,
-      n = x.c[0];
-
-    if (sd !== UNDEFINED) {
-      if (sd !== ~~sd || sd < 1 || sd > MAX_DP) {
-        throw Error(INVALID + 'precision');
-      }
-      x = round(new Big(x), sd, rm);
-      for (; x.c.length < sd;) x.c.push(0);
-    }
-
-    return stringify$1(x, sd <= x.e || x.e <= Big.NE || x.e >= Big.PE, !!n);
-  };
-
-
-  /*
-   * Return a string representing the value of this Big.
-   * Return exponential notation if this Big has a positive exponent equal to or greater than
-   * Big.PE, or a negative exponent equal to or less than Big.NE.
-   * Include the sign for negative zero.
-   */
-  P.valueOf = function () {
-    var x = this,
-      Big = x.constructor;
-    if (Big.strict === true) {
-      throw Error(NAME + 'valueOf disallowed');
-    }
-    return stringify$1(x, x.e <= Big.NE || x.e >= Big.PE, true);
-  };
-
-
-  // Export
-
-
-  var Big = _Big_();
+  function toScaledStr(num, k) {
+    var abs = Math.abs(num);
+    var signed = num != abs;
+    // String() matches behavior of big.js
+    // (as opposed to toFixed() or toPrecision())
+    var s = abs < 1e-6 ? abs.toFixed(k) : String(abs);
+    var parts = s.split('.');
+    var integer = parts[0] == '0' ? '' : parts[0];
+    var decimal = parts.length == 2 ? parts[1] : '';
+    if (decimal.length < k) {
+      decimal = decimal.padEnd(k, '0');
+    } else if (decimal.length > k) {
+      decimal = decimal.slice(0, k);
+    }
+    var s2 = integer + decimal;
+    // remove any leading 0s
+    while (s2[0] == 0 && s2.length > 1) {
+      s2 = s2.slice(1);
+    }
+    if (signed) {
+      s2 = '-' + s2;
+    }
+    return s2;
+  }
+
+  // returns Number
+  function fromScaledStr(s, decimals) {
+    var signed = s[0] == '-';
+    var uns = signed ? s.slice(1) : s;
+    var s2, len;
+    len = uns.length;
+    if (len > decimals) {
+      s2 = uns.slice(0, len - decimals) + '.' + uns.slice(-decimals);
+    } else if (len == decimals) {
+      s2 = '0.' + uns;
+    } else {
+      s2 = '0.' + uns.padStart(decimals, '0');
+    }
+    if (signed) {
+      s2 = '-' + s2;
+    }
+    return Number(s2);
+  }
+
+  function findBigIntScaleFactor() {
+    var minVal = Infinity;
+    var intLen = 0, s;
+    for (var i=0, n=arguments.length; i<n; i++) {
+      minVal = Math.min(minVal, Math.abs(arguments[i]));
+    }
+    if (minVal >= 1) {
+      s = minVal.toFixed(1);
+      intLen = s.indexOf('.');
+    } else if (minVal !== 0) {
+      s = minVal.toFixed(10).slice(2); // decimal part, up to _ decimals
+      while (s[0] === '0') {
+        intLen--;
+        s = s.slice(1);
+      }
+    }
+    return 17 - intLen;
+  }
+
+  //import { findCrossIntersection_big } from '../geom/mapshaper-segment-geom-big';
 
   // Find the intersection between two 2D segments
   // Returns 0, 1 or 2 [x, y] locations as null, [x, y], or [x1, y1, x2, y2]
@@ -4179,18 +3231,31 @@
     return touches || cross || null;
   }
 
-
   function findCrossIntersection(ax, ay, bx, by, cx, cy, dx, dy, eps) {
     var p;
-    if (eps > 0 && !segmentHit_fast(ax, ay, bx, by, cx, cy, dx, dy)) return null;
-    else if (eps === 0 && !segmentHit_big(ax, ay, bx, by, cx, cy, dx, dy)) return null;
+    // The normal-precision hit function works for all inputs when eps > 0 because
+    // the geometries that cause the ordinary function fails are detected as
+    // 'touches' or endpoint hits (at least this was true in all the real-world
+    // data samples that were tested).
+    //
+    if (eps > 0 && !segmentHit_fast(ax, ay, bx, by, cx, cy, dx, dy)) {
+      return null;
+    } else if (eps === 0 && !segmentHit_robust(ax, ay, bx, by, cx, cy, dx, dy)) {
+      return null;
+    }
 
-    // in a typical layer with many intersections, robust is preferred in
-    // most (>90%) segment intersections in order to keep the positional
-    // error within a small interval (e.g. 50% of eps)
+    // in a typical layer with many intersections along shared polygon boundaries,
+    // robust is preferred in most (>90%) segment intersections in order to keep
+    // the positional error within a small interval (e.g. 50% of eps)
     //
     if (useRobustCross(ax, ay, bx, by, cx, cy, dx, dy)) {
       p = findCrossIntersection_robust(ax, ay, bx, by, cx, cy, dx, dy);
+      // var p2 = findCrossIntersection_big(ax, ay, bx, by, cx, cy, dx, dy);
+      // var dx = p[0] - p2[0];
+      // var dy = p[1] - p2[1];
+      // if (dx != 0 || dy != 0) {
+      //   console.log(dx, dy)
+      // }
     } else {
       p = findCrossIntersection_fast(ax, ay, bx, by, cx, cy, dx, dy);
     }
@@ -4210,41 +3275,6 @@
     return p;
   }
 
-  // Find the intersection point of two segments that cross each other,
-  // or return null if the segments do not cross.
-  // Assumes endpoint intersections have already been detected
-  function findCrossIntersection_robust(ax, ay, bx, by, cx, cy, dx, dy) {
-    var ax_big = Big(ax);
-    var ay_big = Big(ay);
-    var bx_big = Big(bx);
-    var by_big = Big(by);
-    var cx_big = Big(cx);
-    var cy_big = Big(cy);
-    var dx_big = Big(dx);
-    var dy_big = Big(dy);
-    var v1x = bx_big.minus(ax_big);
-    var v1y = by_big.minus(ay_big);
-    var den_big = determinant2D_big(v1x, v1y, dx_big.minus(cx), dy_big.minus(cy));
-    if (den_big.eq(0)) {
-      debug("DIV0 error (should have been caught upstream)");
-      // console.log("hit?", segmentHit_big(ax, ay, bx, by, cx, cy, dx, dy))
-      // console.log('Seg 1', getSegFeature(ax, ay, bx, by, true))
-      // console.log('Seg 2', getSegFeature(cx, cy, dx, dy, false))
-      return null;
-    }
-    // perform division using regular math, which does not reduce overall
-    // precision in test data (big.js division is very slow)
-    // tests show identical result to:
-    // orient2D_big(cx_big, cy_big, dx_big, dy_big, ax_big, ay_big).div(den_big)
-    var m = orient2D_big(cx_big, cy_big, dx_big, dy_big, ax_big,
-      ay_big).toNumber() / den_big.toNumber();
-    var m_big = Big(m);
-    var x_big = ax_big.plus(m_big.times(v1x).round(16));
-    var y_big = ay_big.plus(m_big.times(v1y).round(16));
-    var p = [x_big.toNumber(), y_big.toNumber()];
-    return p;
-  }
-
   function findCrossIntersection_fast(ax, ay, bx, by, cx, cy, dx, dy) {
     var den = determinant2D(bx - ax, by - ay, dx - cx, dy - cy);
     var m = orient2D(cx, cy, dx, dy, ax, ay) / den;
@@ -4259,6 +3289,33 @@
     return p;
   }
 
+  // this function, using BigInt, is 3-4x faster than the version using big.js
+  function findCrossIntersection_robust(ax, ay, bx, by, cx, cy, dx, dy) {
+    var d = findBigIntScaleFactor(ax, ay, bx, by, cx, cy, dx, dy);
+    var d2 = 16; // scale numerator of integer division by this many decimal digits
+    var k_bi = 10000000000000000n; // matches d2
+    var ax_bi = BigInt(toScaledStr(ax, d));
+    var ay_bi = BigInt(toScaledStr(ay, d));
+    var bx_bi = BigInt(toScaledStr(bx, d));
+    var by_bi = BigInt(toScaledStr(by, d));
+    var cx_bi = BigInt(toScaledStr(cx, d));
+    var cy_bi = BigInt(toScaledStr(cy, d));
+    var dx_bi = BigInt(toScaledStr(dx, d));
+    var dy_bi = BigInt(toScaledStr(dy, d));
+    var den = determinant2D(bx_bi - ax_bi, by_bi - ay_bi, dx_bi - cx_bi, dy_bi - cy_bi);
+    if (den === 0n) {
+      debug('DIV0 error - should have been identified as collinear "touch" intersection.');
+      return null;
+    }
+    var num = orient2D(cx_bi, cy_bi, dx_bi, dy_bi, ax_bi, ay_bi) * k_bi;
+    var m_bi = num / den;
+    var x_bi = ax_bi * k_bi + m_bi * (bx_bi - ax_bi);
+    var y_bi = ay_bi * k_bi + m_bi * (by_bi - ay_bi);
+    var x = fromScaledStr(x_bi.toString(), d + d2);
+    var y = fromScaledStr(y_bi.toString(), d + d2);
+    return [x, y];
+  }
+
   function useRobustCross(ax, ay, bx, by, cx, cy, dx, dy) {
     // angle and seg length ratio thresholds were found by comparing
     // fast and robust outputs on sample data
@@ -4270,7 +3327,7 @@
     return false;
   }
 
-  // Returns smaller unsigned angle between two segments
+  // Returns smaller of two angles between two segments (unsigned)
   function innerAngle(ax, ay, bx, by, cx, cy, dx, dy) {
     var v1x = bx - ax;
     var v1y = by - ay;
@@ -4419,18 +3476,6 @@
     p[1] = y;
   }
 
-  // function getSegFeature(x1, y1, x2, y2, hot) {
-  //   return JSON.stringify({
-  //     type: "Feature",
-  //     properties: {
-  //       stroke: hot ? "orange" : "blue"
-  //     },
-  //     geometry: {
-  //       type: "LineString",
-  //       coordinates: [[x1, y1], [x2, y2]]
-  //     }
-  //   });
-  // }
 
   // a: coordinate of point
   // b: endpoint coordinate of segment
@@ -4463,10 +3508,6 @@
     return a * d - b * c;
   }
 
-  function determinant2D_big(a, b, c, d) {
-    return a.times(d).minus(b.times(c));
-  }
-
   // returns a positive value if the points a, b, and c are arranged in
   // counterclockwise order, a negative value if the points are in clockwise
   // order, and zero if the points are collinear.
@@ -4475,22 +3516,31 @@
     return determinant2D(ax - cx, ay - cy, bx - cx, by - cy);
   }
 
-  function orient2D_big(ax, ay, bx, by, cx, cy) {
-    var a = (ax.minus(cx)).times(by.minus(cy));
-    var b = (ay.minus(cy)).times(bx.minus(cx));
-    return a.minus(b);
+  function orient2D_robust(ax, ay, bx, by, cx, cy) {
+    var d = findBigIntScaleFactor(ax, ay, bx, by, cx, cy);
+    var ax_bi = BigInt(toScaledStr(ax, d));
+    var ay_bi = BigInt(toScaledStr(ay, d));
+    var bx_bi = BigInt(toScaledStr(bx, d));
+    var by_bi = BigInt(toScaledStr(by, d));
+    var cx_bi = BigInt(toScaledStr(cx, d));
+    var cy_bi = BigInt(toScaledStr(cy, d));
+    var o2d_bi = orient2D(ax_bi, ay_bi, bx_bi, by_bi, cx_bi, cy_bi);
+    return fromScaledStr(o2d_bi.toString(), d);
   }
 
-  function orient2D_big2(ax, ay, bx, by, cx, cy) {
-    return orient2D_big(Big(ax), Big(ay), Big(bx), Big(by), Big(cx), Big(cy));
+  function segmentHit_robust(ax, ay, bx, by, cx, cy, dx, dy) {
+    var d = findBigIntScaleFactor(ax, ay, bx, by, cx, cy, dx, dy);
+    var ax_bi = BigInt(toScaledStr(ax, d));
+    var ay_bi = BigInt(toScaledStr(ay, d));
+    var bx_bi = BigInt(toScaledStr(bx, d));
+    var by_bi = BigInt(toScaledStr(by, d));
+    var cx_bi = BigInt(toScaledStr(cx, d));
+    var cy_bi = BigInt(toScaledStr(cy, d));
+    var dx_bi = BigInt(toScaledStr(dx, d));
+    var dy_bi = BigInt(toScaledStr(dy, d));
+    return segmentHit_fast(ax_bi, ay_bi, bx_bi, by_bi, cx_bi, cy_bi, dx_bi, dy_bi);
   }
 
-
-  // export function orient2D_v2(ax, ay, bx, by, cx, cy) {
-  //   return -orient2D_robust(ax, ay, bx, by, cx, cy);
-  // }
-
-
   // Source: Sedgewick, _Algorithms in C_
   // (Other functions were tried that were more sensitive to floating point errors
   //  than this function)
@@ -4501,25 +3551,6 @@
         orient2D(cx, cy, dx, dy, bx, by) <= 0;
   }
 
-  function segmentHit_big(ax, ay, bx, by, cx, cy, dx, dy) {
-    return orient2D_big(ax, ay, bx, by, cx, cy).times(
-        orient2D_big(ax, ay, bx, by, dx, dy)).lte(0) &&
-        orient2D_big(cx, cy, dx, dy, ax, ay).times(
-        orient2D_big(cx, cy, dx, dy, bx, by)).lte(0);
-  }
-
-  function segmentHit_big2(ax, ay, bx, by, cx, cy, dx, dy) {
-    return segmentHit_big(Big(ax), Big(ay), Big(bx), Big(by),
-      Big(cx), Big(cy), Big(dx), Big(dy));
-  }
-
-  // export function segmentHit_robust(ax, ay, bx, by, cx, cy, dx, dy) {
-  //   return -orient2D_robust(ax, ay, bx, by, cx, cy) *
-  //       -orient2D_robust(ax, ay, bx, by, dx, dy) <= 0 &&
-  //       -orient2D_robust(cx, cy, dx, dy, ax, ay) *
-  //       -orient2D_robust(cx, cy, dx, dy, bx, by) <= 0;
-  // }
-
   // Useful for determining if a segment that intersects another segment is
   // entering or leaving an enclosed buffer area
   // returns -1 if angle of p1p2 -> p3p4 is counter-clockwise (left turn)
@@ -4543,11 +3574,9 @@
   var SegmentGeom = /*#__PURE__*/Object.freeze({
     __proto__: null,
     findClosestPointOnSeg: findClosestPointOnSeg,
+    findCrossIntersection_robust: findCrossIntersection_robust,
     orient2D: orient2D,
-    orient2D_big: orient2D_big,
-    orient2D_big2: orient2D_big2,
-    segmentHit_big: segmentHit_big,
-    segmentHit_big2: segmentHit_big2,
+    orient2D_robust: orient2D_robust,
     segmentHit_fast: segmentHit_fast,
     segmentIntersection: segmentIntersection,
     segmentTurn: segmentTurn
@@ -4878,10 +3907,12 @@
     for (var i=0; i<n; i++) {
       retn = cb(parts[i], i, parts, shpId);
       if (retn === null) {
-        nulls++;
         parts[i] = null;
       } else if (utils.isArray(retn)) {
-        parts[i] = retn;
+        parts[i] = retn.length > 0 ? retn : null;
+      }
+      if (parts[i] === null) {
+        nulls++;
       }
     }
     if (nulls == n) {
@@ -7058,10 +6089,11 @@
     };
 
     this.arcIsDegenerate = function(arcId) {
-      return this.arcHasZeroLength(arcId) || this.arcIsSpike(arcId);
+      return this.arcHasZeroLength(arcId) || this.arcIsSpike(arcId) || this.arcIsSpike_v1(arcId);
     };
 
-    this.arcIsSpike = function(arcId) {
+    // only finds two-segment spikes
+    this.arcIsSpike_v1 = function(arcId) {
       var iter = this.getArcIter(arcId);
       var x0, y0;
       if (iter.hasNext()) {
@@ -7078,6 +6110,22 @@
       return false;
     };
 
+    // identifies n-segment spikes
+    this.arcIsSpike = function(arcId) {
+      arcId = absArcId(arcId);
+      var i = _ii[arcId];
+      var j = i + _nn[arcId] - 1;
+      while (j > i) {
+        if (_xx[i] != _xx[j] || _yy[i] != _yy[j]) {
+          return false;
+        }
+        j--;
+        i++;
+      }
+      return true;
+    };
+
+
     this.arcHasZeroLength = function(arcId) {
       var iter = this.getArcIter(arcId);
       var i = 0,
@@ -8512,7 +7560,15 @@
   }
 
   function mergeOutputLayerIntoDataset(lyr, dataset, dataset2, opts) {
-    if (!dataset2 || dataset2.layers.length != 1) {
+    var output = mergeOutputLayersIntoDataset(lyr, dataset, dataset2, opts);
+    if (output.length != 1) {
+      error('Expected 1 output layer, received:', output.length);
+    }
+    return output[0];
+  }
+
+  function mergeOutputLayersIntoDataset(lyr, dataset, dataset2, opts) {
+    if (!dataset2 || dataset2.layers.length === 0) {
       error('Invalid source dataset');
     }
     if (dataset.layers.includes(lyr) === false) {
@@ -8521,24 +7577,21 @@
     // this command returns merged layers instead of adding them to target dataset
     var outputLayers = mergeDatasetsIntoDataset(dataset, [dataset2]);
     var lyr2 = outputLayers[0];
-
     // TODO: find a more reliable way of knowing when to copy data
     var copyData = !lyr2.data && lyr.data && getFeatureCount(lyr2) == lyr.data.size();
-
     if (copyData) {
       lyr2.data = opts.no_replace ? lyr.data.clone() : lyr.data;
     }
-    if (opts.no_replace) ; else {
-      lyr2 = Object.assign(lyr, {data: null, shapes: null}, lyr2);
+    lyr2.name = opts.name || lyr.name;
+    if (!opts.no_replace) {
+      outputLayers[0] = Object.assign(lyr, {data: null, shapes: null}, lyr2);
       if (layerHasPaths(lyr)) {
         // Remove unused arcs from replaced layer
         // TODO: consider using clean insead of this
         dissolveArcs(dataset);
       }
     }
-
-    lyr2.name = opts.name || lyr2.name;
-    return lyr2;
+    return outputLayers;
   }
 
   // Transform the points in a dataset in-place; don't clean up corrupted shapes
@@ -8566,6 +7619,7 @@
     getDatasetBounds: getDatasetBounds,
     mergeDatasetInfo: mergeDatasetInfo,
     mergeOutputLayerIntoDataset: mergeOutputLayerIntoDataset,
+    mergeOutputLayersIntoDataset: mergeOutputLayersIntoDataset,
     pruneArcs: pruneArcs,
     replaceLayerContents: replaceLayerContents,
     replaceLayers: replaceLayers,
@@ -12521,7 +11575,7 @@
       shapes: lyr.shapes || null,
       data: data,
       menu_order: lyr.menu_order || null,
-      pinned: lyr.pinned || false,
+      pinned: lyr.pinned || opts.show_all || false,
       active: !!(lyr.active || lyr == opts.active_layer) // lyr.active: deprecated
     };
   }
@@ -13912,6 +12966,23 @@
     vertexIsArcStart: vertexIsArcStart
   });
 
+  function debugConnectedArcs(ids, arcs) {
+    var colors = ['orange', 'blue', 'green', 'red', 'magenta', 'grey'];
+    var features = ids.map(function(arcId, i) {
+      return getArcFeature(arcId, arcs, {arcId: arcId, stroke: colors[i] || 'black'});
+    });
+    var geojson = '{"type": "FeatureCollection", "features": [' + features.join(',') + ']}';
+    debug(geojson);
+  }
+
+  function getArcFeature(arcId, arcs, properties) {
+    return JSON.stringify({
+      type: "Feature",
+      properties: properties,
+      geometry: GeoJSON.exportLineGeom([[arcId]], arcs)
+    });
+  }
+
   function isValidArc(arcId, arcs) {
     // check for arcs with no vertices
     // TODO: also check for other kinds of degenerate arcs
@@ -13958,7 +13029,6 @@
       error("Duplicate point error");
     }*/
 
-
     for (j=0; j<ids.length; j++) {
       candId = ids[j];
       if (!isValidArc(candId, arcs)) {
@@ -13977,6 +13047,10 @@
 
       if (xx[ito] == xx[icand] && yy[ito] == yy[icand]) {
         debug("Pathfinder warning: duplicate segments: i:", ito, "j:", icand, "ids:", [fromArcId].concat(ids));
+        if (useDebug()) {
+          // debugDuplicatePathfinderSegments(nodeX, nodeY, ito, icand, nodes.arcs);
+          debugConnectedArcs(ids, nodes.arcs);
+        }
       }
       if (code == 2) {
         ito = icand;
@@ -14027,8 +13101,7 @@
   }
 
   function chooseBetweenClosePaths(nodeX, nodeY, ax, ay, bx, by) {
-    // var orient = orient2D_big2(ax, ay, 0, 0, bx, by);
-    var orient = orient2D_big2(ax, ay, nodeX, nodeY, bx, by);
+    var orient = orient2D_robust(ax, ay, nodeX, nodeY, bx, by);
     var code;
     if (orient > 0) {
       code = 2;
@@ -18016,17 +17089,14 @@
     if (changed || opts.rebuild_topology) {
       buildTopology(dataset);
     }
-
-    // Clean shapes by removing collapsed arc references, etc.
-    // TODO: consider alternative -- avoid creating degenerate arcs
-    // in insertCutPoints()
+    // Remove degenerate shapes
+    // Without this step, pathfinder function would encounter dead ends.
     dataset.layers.forEach(function(lyr) {
       if (layerHasPaths(lyr)) {
         cleanShapes(lyr.shapes, arcs, lyr.geometry_type);
       }
     });
-
-    // Further clean-up -- remove duplicate and missing arcs
+    // Further clean-up -- remove duplicate and unused arcs, etc.
     nodes = cleanArcReferences(dataset);
     return nodes;
   }
@@ -18036,38 +17106,26 @@
     var cutOpts = snapDist > 0 ? {tolerance: snapDist} : {tolerance: 0};
     var coordsHaveChanged = false;
     var snapCount, dupeCount, cutCount;
-    var maxPasses = 4, passCount = 0;
-    snapCount = snapCoordsByInterval(arcs, snapDist);
-    dupeCount = arcs.dedupCoords();
-
-    // why was topology built here previously????
-    // if (snapCount > 0 || dupeCount > 0) {
-    //   // Detect topology again if coordinates have changed
-    //   internal.buildTopology(dataset);
-    // }
-
-    // cut arcs at points where segments intersect
-    cutCount = cutPathsAtIntersections(dataset, cutOpts);
-    passCount++;
-    if (cutCount > 0 || snapCount > 0 || dupeCount > 0) {
-      coordsHaveChanged = true;
-    }
+    var maxLoops = 4, loopCount = 0;
 
-    // perform a second snap + cut pass if needed
-    while (cutCount > 0 && passCount < maxPasses) {
-      passCount++;
+    // snap + cut until no more cuts are needed
+    do {
+      loopCount++;
+      cutCount = 0;
       snapCount = snapCoordsByInterval(arcs, snapDist);
       dupeCount = arcs.dedupCoords();
-      // cutCount = 0;
-      if (snapCount > 0 || cutCount > 0) {
+      if (snapCount > 0 || cutCount > 0 || loopCount == 1) {
+        // cut arcs at points where segments intersect
         cutCount = cutPathsAtIntersections(dataset, cutOpts);
-        debug("[snapAndCut] pass:", passCount, "snaps:", snapCount, "dupes:", dupeCount, "cuts:", cutCount);
       }
-    }
+      coordsHaveChanged |= (snapCount + dupeCount + cutCount) > 0;
+      debug("[snapAndCut] pass:", loopCount, "snaps:", snapCount, "dupes:", dupeCount, "cuts:", cutCount);
+    } while (loopCount < maxLoops && cutCount > 0);
 
-    // if (cutCount > 0) {
+    // should this be added?
+    // if (cutCount > 0 && loopCount == maxLoops) {
+    //   snapCount = snapCoordsByInterval(arcs, snapDist);
     //   arcs.dedupCoords(); // need to do this here?
-    //   debug('Second-pass vertices added:', cutCount, 'consider third pass?');
     // }
 
     return coordsHaveChanged;
@@ -19596,6 +18654,7 @@
     return geom;
   };
 
+  // ids: shape data (array of array of arc ids)
   GeoJSON.exportLineGeom = function(ids, arcs) {
     var obj = exportPathData(ids, arcs, "polyline");
     if (obj.pointCount === 0) return null;
@@ -19611,6 +18670,7 @@
     };
   };
 
+  // ids: shape data (array of array of arc ids)
   GeoJSON.exportPolygonGeom = function(ids, arcs, opts) {
     var obj = exportPathData(ids, arcs, "polygon");
     if (obj.pointCount === 0) return null;
@@ -25689,6 +24749,10 @@ ${svg}
         type: 'flag',
         describe: '[CSV] export numbers with decimal commas not points'
       })
+      .option('show-all', {
+        type: 'flag',
+        describe: '[Snapshot] show all layers in Web UI'
+      })
       .option('final', {
         type: 'flag' // for testing
       })
@@ -25737,24 +24801,54 @@ ${svg}
         // describe: 'number of vertices to use when buffering points',
         type: 'integer'
       })
+      .option('arc-quality', {
+        // segments per quarter-circle in joins and caps
+        type: 'integer'
+      })
+      .option('slice-length', {
+        // max path segments per buffer section
+        type: 'integer'
+      })
       .option('backtrack', {
+        // ...
         type: 'integer'
       })
+      .option('cap-style', {
+        describe: 'flat or round (default is round)'
+      })
       .option('type', {
         // left, right, outer, inner (default is full buffer)
       })
       .option('planar', {
         type: 'flag'
       })
-      .option('v2', { // use v2 method
+      .option('v2', {
+        type: 'flag'
+      })
+      .option('v3', {
+        type: 'flag'
+      })
+      .option('debug-offset', {
         type: 'flag'
       })
-      .option('debug-division', {
+      .option('debug-winding', {
         type: 'flag'
       })
+      .option('debug-points', {
+        type: 'flag'
+      })
+      // .option('debug-division', {
+      //   type: 'flag'
+      // })
       .option('debug-mosaic', {
         type: 'flag'
       })
+      .option('left', {
+        type: 'flag'
+      })
+      .option('right', {
+        type: 'flag'
+      })
       .option('no-cleanup', {
         type: 'flag'
       })
@@ -31891,14 +30985,112 @@ ${svg}
     return dataset;
   }
 
+  function getPolygonRewinder(nodes) {
+    var splitter = getSelfIntersectionSplitter(nodes);
+    return rewindPolygon;
+
+    function rewindPolygon(shp) {
+      var shp2 = [];
+      forEachShapePart(shp, function(ids) {
+        var rings = splitter(ids);
+        var path;
+        for (var i=0; i<rings.length; i++) {
+          path = rings[i];
+          if (geom.getPlanarPathArea(path, nodes.arcs) < 0) {
+            path = reversePath(path);
+          }
+          shp2.push(path);
+        }
+      });
+      return shp2.length > 0 ? shp2 : null;
+    }
+  }
+
+  function rewindPolygonParts(lyr, nodes) {
+    var rewind = getPolygonRewinder(nodes);
+    lyr.shapes = lyr.shapes.map(function(shp) {
+      return rewind(shp);
+    });
+  }
+
+  // TODO: Need to rethink polygon repair: these function can cause problems
+  // when part of a self-intersecting polygon is removed
+  //
+  function repairPolygonGeometry(layers, dataset, opts) {
+    var nodes = addIntersectionCuts(dataset);
+    layers.forEach(function(lyr) {
+      repairSelfIntersections(lyr, nodes);
+    });
+    return layers;
+  }
+
+  // Remove any small shapes formed by twists in each ring
+  // // OOPS, NO // Retain only the part with largest area
+  // // this causes problems when a cut-off hole has a matching ring in another polygon
+  // TODO: consider cases where cut-off parts should be retained
+  //
+  function repairSelfIntersections(lyr, nodes) {
+    var splitter = getSelfIntersectionSplitter(nodes);
+
+    lyr.shapes = lyr.shapes.map(function(shp, i) {
+      return cleanPolygon(shp);
+    });
+
+    function cleanPolygon(shp) {
+      var cleanedPolygon = [];
+      forEachShapePart(shp, function(ids) {
+        // TODO: consider returning null if path can't be split
+        var splitIds = splitter(ids);
+        if (splitIds.length === 0) {
+          error("[cleanPolygon()] Defective path:", ids);
+        } else if (splitIds.length == 1) {
+          cleanedPolygon.push(splitIds[0]);
+        } else {
+          var shapeArea = geom.getPlanarPathArea(ids, nodes.arcs),
+              sign = shapeArea > 0 ? 1 : -1,
+              mainRing;
+
+          splitIds.reduce(function(max, ringIds, i) {
+            var pathArea = geom.getPlanarPathArea(ringIds, nodes.arcs) * sign;
+            if (pathArea > max) {
+              mainRing = ringIds;
+              max = pathArea;
+            }
+            return max;
+          }, 0);
+
+          if (mainRing) {
+            cleanedPolygon.push(mainRing);
+          }
+        }
+      });
+      return cleanedPolygon.length > 0 ? cleanedPolygon : null;
+    }
+  }
+
+  var PolygonRepair = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    getPolygonRewinder: getPolygonRewinder,
+    repairPolygonGeometry: repairPolygonGeometry,
+    repairSelfIntersections: repairSelfIntersections,
+    rewindPolygonParts: rewindPolygonParts
+  });
+
   function dissolveBufferDataset(dataset, optsArg) {
     var opts = optsArg || {};
     var lyr = dataset.layers[0];
     var tmp;
-    var nodes = addIntersectionCuts(dataset, {});
-    if (opts.debug_division) {
-      return debugBufferDivision(lyr, nodes);
+    if (opts.debug_offset) {
+      return; // raw offset path
     }
+    var nodes = addIntersectionCuts(dataset, {rebuild_topology: true});
+    if (opts.debug_winding) {
+      rewindPolygonParts(lyr, nodes);
+      // debugRingsAndHoles(lyr, nodes);
+      return;
+    }
+    rewindPolygonParts(lyr, nodes);
+
     var mosaicIndex = new MosaicIndex(lyr, nodes, {flat: false, no_holes: false});
     if (opts.debug_mosaic) {
       tmp = composeMosaicLayer(lyr, mosaicIndex.mosaic);
@@ -31921,49 +31113,6 @@ ${svg}
     }
   }
 
-  function debugBufferDivision(lyr, nodes) {
-    var divide = getHoleDivider(nodes);
-    var shapes2 = [];
-    var records = [];
-    lyr.shapes.forEach(divideShape);
-    lyr.shapes = shapes2;
-    lyr.data = new DataTable(records);
-    return lyr;
-
-    function divideShape(shp) {
-      var cw = [], ccw = [];
-      divide(shp, cw, ccw);
-      cw.forEach(function(ring) {
-        shapes2.push([ring]);
-        records.push({type: 'ring'});
-      });
-      ccw.forEach(function(hole) {
-        shapes2.push([reversePath(hole)]);
-        records.push({type: 'hole'});
-      });
-    }
-  }
-
-  // n = number of segments used to approximate a circle
-  // Returns tolerance as a percent of circle radius
-  function getBufferToleranceFromCircleSegments(n) {
-    return 1 - Math.cos(Math.PI / n);
-  }
-
-  function getArcDegreesFromTolerancePct(pct) {
-    return 360 * Math.acos(1 - pct) / Math.PI;
-  }
-
-  // n = number of segments used to approximate a circle
-  // Returns tolerance as a percent of circle radius
-  function getBufferToleranceFromCircleSegments2(n) {
-    return 1 / Math.cos(Math.PI / n) - 1;
-  }
-
-  function getArcDegreesFromTolerancePct2(pct) {
-    return 360 * Math.acos(1 / (pct + 1)) / Math.PI;
-  }
-
   // return constant distance in meters, or return null if unparsable
   function parseConstantBufferDistance(str, crs) {
     var parsed = parseMeasure2(str);
@@ -31971,16 +31120,6 @@ ${svg}
     return convertDistanceParam(str, crs) || null;
   }
 
-  function getBufferToleranceFunction(dataset, opts) {
-    var crs = getDatasetCRS(dataset);
-    var constTol = opts.tolerance ? parseConstantBufferDistance(opts.tolerance, crs) : 0;
-    var pctOfRadius = 1/100;
-    return function(meterDist) {
-      if (constTol) return constTol;
-      return constTol ? constTol : meterDist * pctOfRadius;
-    };
-  }
-
   function getBufferDistanceFunction(lyr, dataset, opts) {
     if (!opts.radius) {
       stop('Missing expected radius parameter');
@@ -31999,17 +31138,579 @@ ${svg}
     };
   }
 
-  var BufferCommon = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    dissolveBufferDataset: dissolveBufferDataset,
-    getArcDegreesFromTolerancePct: getArcDegreesFromTolerancePct,
-    getArcDegreesFromTolerancePct2: getArcDegreesFromTolerancePct2,
-    getBufferDistanceFunction: getBufferDistanceFunction,
-    getBufferToleranceFromCircleSegments: getBufferToleranceFromCircleSegments,
-    getBufferToleranceFromCircleSegments2: getBufferToleranceFromCircleSegments2,
-    getBufferToleranceFunction: getBufferToleranceFunction,
-    parseConstantBufferDistance: parseConstantBufferDistance
-  });
+  function BufferBuilder(opts) {
+    var self = {};
+    var buffer, path, insideFlags;
+    var points = [];
+    var backtrackSteps = opts.backtrack >= 0 ? opts.backtrack : 100;
+    var backtrackStopIdx = 0; // lowest vertex id in backtrack pass
+
+    init();
+
+    function init() {
+      buffer = [];
+      path = [];
+      insideFlags = [];
+      backtrackStopIdx = 0;
+    }
+
+    self.size = function() {
+      return path.length + buffer.length;
+    };
+
+    self.getDebugPoints = function() {
+      var tmp = points;
+      points = [];
+      return tmp;
+    };
+
+    function makeDebugPoints() {
+      points = points.concat(buffer.map((p, i) => {
+        return {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: p
+          },
+          properties: {
+            id: i,
+            inside: insideFlags[i],
+            fill: insideFlags[i] ? 'magenta' : 'dodgerblue'
+          }
+        };
+      }));
+    }
+
+    self.addPathVertex = function(p) {
+      path.push(p);
+    };
+
+    self.addBufferVertices = function(arr) {
+      for (var i=0; i<arr.length; i++) {
+        self.addBufferVertex(arr[i]);
+      }
+    };
+
+    self.addBufferVertex = function(p, isLeftTurn) {
+      var bufferLen = insideFlags.length;
+      var prevIdx = bufferLen - 1;
+      if (isLeftTurn) {
+        // first extruded point after left turn
+        // assume that the point is inside the buffer
+        insideFlags.push(true);
+        buffer.push(p);
+        return;
+      }
+      if (prevIdx == -1) {
+        // first point in buffer
+        buffer.push(p);
+        insideFlags.push(false);
+        return;
+      }
+      var prevP = buffer[prevIdx];
+      var prevFlag = insideFlags[prevIdx];
+      if (pointsAreSame(prevP, p)) {
+        // console.log('SAME POINT')
+        return;
+      }
+      // if no segment cross is detected below, inside/outside stays the same
+      var newFlag = prevFlag;
+      var hit, a, b, flagA, flagB;
+      for (var i=0, idx = bufferLen - 3; i < backtrackSteps && idx >= backtrackStopIdx; i++, idx--) {
+        a = buffer[idx];
+        b = buffer[idx + 1];
+        // TODO: consider using a geodetic intersection function for lat-long datasets
+        // TODO: consider case of an endpoint hit
+        // TODO: consider case of collinear hit
+        hit = bufferIntersection$2(a[0], a[1], b[0], b[1], prevP[0], prevP[1], p[0], p[1]);
+        if (!hit) {
+          // continue scanning backward for an intersection
+          continue;
+        }
+        // console.log("hit")
+        flagA = insideFlags[idx];
+        flagB = insideFlags[idx + 1];
+        if (flagA && flagB) {
+          // newest segment collides with an interior segment - do not rewind
+          continue;
+        }
+        if (prevFlag === false) {
+          // if segment intersects an outside segment from outside the buffer,
+          // we are likely closing a loop,
+          // so we stop backtracking and reset the backtrack limit to avoid
+          // removing the loop
+          backtrackStopIdx = i + 1;
+          break;
+        }
+
+        // newest segment collides with an exterior segment
+        // * assume we're going from inside to outside
+        // * and can therefore remove an interior loop
+        // TODO: improve (this assumption does not hold when closing an oxbow type loop)
+        while (buffer.length > idx + 1) {
+          buffer.pop();
+          insideFlags.pop();
+        }
+        buffer.push(hit);
+        insideFlags.push(false);
+        newFlag = false;
+        // console.log("going out")
+        break;
+      }
+
+      buffer.push(p);
+      insideFlags.push(newFlag);
+    };
+
+    self.done = function() {
+      if (opts.debug_points) {
+        makeDebugPoints();
+      }
+      var ring = path.reverse().concat(buffer);
+      if (ring.length < 3) {
+        error('Defective buffer ring:', ring);
+      }
+      ring.push(ring[0]);
+      init();
+      return ring;
+    };
+
+    return self;
+  }
+
+  function pointsAreSame(a, b) {
+    return a[0] === b[0] && a[1] === b[1];
+  }
+
+  // Exclude segments with non-intersecting bounding boxes before
+  // calling intersection function
+  // Possibly slightly faster than direct call... not worth it?
+  function bufferIntersection$2(ax, ay, bx, by, cx, cy, dx, dy) {
+    if (ax < cx && ax < dx && bx < cx && bx < dx ||
+        ax > cx && ax > dx && bx > cx && bx > dx ||
+        ay < cy && ay < dy && by < cy && by < dy ||
+        ay > cy && ay > dy && by > cy && by > dy) return null;
+    return segmentIntersection(ax, ay, bx, by, cx, cy, dx, dy);
+  }
+
+  // Returns a function for generating GeoJSON MultiPolygon geometries
+  function getPolylineBufferMaker$2(arcs, geod, getBearing, opts) {
+    // var sliceLen = opts.slice_length || Infinity;
+    var segsPerQuadrant = opts.arc_quality >= 2 ? opts.arc_quality : 12;
+    var capStyle = opts.cap_style || 'round'; // expect 'round' or 'flat'
+    var pathIter = new ShapeIter(arcs);
+    var builder = new BufferBuilder(opts);
+
+    return function makeBufferGeoJSON(shape, distance) {
+      var rings = [];
+      (shape || []).forEach(function(path, i) {
+        var pathRings = makeSinglePathRings(path, distance);
+        rings = rings.concat(pathRings);
+      });
+      if (rings.length === 0) return null;
+      var feat = {
+        type: 'Feature',
+        properties: null,
+        geometry: {
+        type: 'MultiPolygon',
+          coordinates: rings.map(ring => [ring]) // to Polygon format
+        }
+      };
+      if (opts.debug_points) {
+        return [feat].concat(builder.getDebugPoints());
+      }
+      return feat;
+    };
+
+    // each path may be converted into multiple buffer rings, which later
+    // need to be dissolved
+    function makeSinglePathRings(pathArcs, dist) {
+      var revPathArcs;
+      var rings = [];
+      if (!opts.right || opts.left) {
+        rings = rings.concat(makeLeftBufferRings(pathArcs, dist));
+      }
+      if (!opts.left || opts.right) {
+        revPathArcs = reversePath(pathArcs.concat());
+        rings = rings.concat(makeLeftBufferRings(revPathArcs, dist));
+      }
+      return rings;
+    }
+
+    function makeLeftBufferRings(path, dist) {
+      var rings = [];
+      var x0, y0, x1, y1, x2, y2; // path traversal coords
+      var p1, p2; // extruded points
+      var bearing1, bearing2, prevBearing, joinAngle;
+      var firstBearing;
+      var i = 0;
+      pathIter.init(path);
+
+      if (pathIter.hasNext()) {
+        x0 = x2 = pathIter.x;
+        y0 = y2 = pathIter.y;
+        i++;
+      }
+
+      while (pathIter.hasNext()) {
+        // TODO: use a tolerance
+        if (pathIter.x === x2 && pathIter.y === y2) {
+          debug("skipping a duplicate point");
+          continue;
+        }
+        x1 = x2;
+        y1 = y2;
+        x2 = pathIter.x;
+        y2 = pathIter.y;
+
+        // calculate bearing at both segment points
+        // TODO: no need to calculate twice with planar coordinates
+        prevBearing = bearing2;
+        bearing1 = getBearing(x1, y1, x2, y2);
+        bearing2 = getBearing(x2, y2, x1, y1) - 180;
+        p1 = geod(x1, y1, bearing1 - 90, dist);
+        p2 = geod(x2, y2, bearing2 - 90, dist);
+
+        if (i == 1) {
+          firstBearing = bearing1;
+          builder.addPathVertex([x1, y1]);
+        } else {
+          joinAngle = getJoinAngle(prevBearing, bearing1);
+        }
+
+        builder.addPathVertex([x2, y2]);
+
+        if (i > 1 && joinAngle > 0) {
+          builder.addBufferVertices(makeRoundJoin(x1, y1, prevBearing - 90, joinAngle, dist));
+        }
+
+        builder.addBufferVertex(p1, joinAngle < 0);
+        builder.addBufferVertex(p2);
+
+        // TODO: restore slicing?
+        // if (center.length - 1 >= sliceLen) {
+        //   builder.done(rings);
+        // }
+
+        i++;
+      }
+
+      if (x2 == x0 && y2 == y0) { // closed path
+        // add join to finish closed path
+        // TODO - figure out which bearing to use
+        joinAngle = getJoinAngle(bearing2, firstBearing);
+        if (joinAngle > 0) {
+          builder.addBufferVertices(makeFinalJoin(x2, y2, bearing1 - 90, joinAngle, dist));
+        }
+      } else if (capStyle == 'round') { // open path
+        // add a cap to finish open path
+        builder.addBufferVertices(makeRoundCap(x2, y2, bearing2 - 90, dist));
+      }
+
+      rings.push(builder.done());
+      return rings;
+    }
+
+    // function extendArray(arr, arr2) {
+    //   arr2.reverse();
+    //   while(arr2.length > 0) arr.push(arr2.pop());
+    // }
+
+    function makeFinalJoin(x, y, direction, angle, dist) {
+      var points = makeRoundJoin(x, y, direction, angle, dist);
+      points.push(geod(x, y, direction + angle, dist));
+      return points;
+    }
+
+    function makeRoundCap(x, y, startDir, dist) {
+      var points = makeRoundJoin(x, y, startDir, 180, dist);
+      points.push(geod(x, y, startDir + 180, dist)); // add final vertex
+      return points;
+    }
+
+    // get interior vertices of an interpolated CW arc
+    function makeRoundJoin(cx, cy, startBearing, arcAngle, dist) {
+      var points = [];
+      var increment = 90 / segsPerQuadrant;
+      var angle = increment;
+      while (angle < arcAngle) {
+        points.push(geod(cx, cy, startBearing + angle, dist));
+        angle += increment;
+      }
+      return points;
+    }
+
+    // get angle between two extruded segments in degrees
+    // positive angle means join in convex (range: 0-180 degrees)
+    // negative angle means join is concave (range: -180-0 degrees)
+    function getJoinAngle(direction1, direction2) {
+      var delta = direction2 - direction1;
+      if (delta > 180) {
+        delta -= 360;
+      }
+      if (delta < -180) {
+        delta += 360;
+      }
+      return delta;
+    }
+
+  }
+
+  // Returns a function for generating GeoJSON MultiPolygon geometries
+  function getPolylineBufferMaker$1(arcs, geod, getBearing, opts) {
+    var sliceLen = opts.slice_length || Infinity;
+    var backtrackSteps = opts.backtrack >= 0 ? opts.backtrack : 100;
+    var segsPerQuadrant = opts.arc_quality >= 2 ? opts.arc_quality : 12;
+    var capStyle = opts.cap_style || 'round'; // expect 'round' or 'flat'
+    var pathIter = new ShapeIter(arcs);
+    var left, center, rings;
+
+    return function makeBufferGeoJSON(shape, distance) {
+      var rings = [];
+      (shape || []).forEach(function(path, i) {
+        var pathRings = makeSinglePathRings(path, distance);
+        rings = rings.concat(pathRings);
+      });
+      if (rings.length === 0) return null;
+      return {
+        type: 'MultiPolygon',
+        coordinates: rings.map(ring => [ring]) // to Polygon format
+      };
+    };
+
+    // each path may be converted into multiple buffer rings, which later
+    // need to be dissolved
+    function makeSinglePathRings(pathArcs, dist) {
+      var revPathArcs;
+      var rings = [];
+      if (!opts.right || opts.left) {
+        rings = rings.concat(makeLeftBufferRings(pathArcs, dist));
+      }
+      if (!opts.left || opts.right) {
+        revPathArcs = reversePath(pathArcs.concat());
+        rings = rings.concat(makeLeftBufferRings(revPathArcs, dist));
+      }
+      return rings;
+    }
+
+    function makeLeftBufferRings(path, dist) {
+      left = [];
+      center = [];
+      rings = [];
+      var x0, y0, x1, y1, x2, y2; // path traversal coords
+      var p1, p2; // extruded points
+      var prevP;
+      var bearing1, bearing2, prevBearing, joinAngle;
+      var firstBearing;
+      var i = 0;
+      pathIter.init(path);
+
+      if (pathIter.hasNext()) {
+        x0 = x2 = pathIter.x;
+        y0 = y2 = pathIter.y;
+        i++;
+      }
+
+      while (pathIter.hasNext()) {
+        // TODO: use a tolerance
+        if (pathIter.x === x2 && pathIter.y === y2) {
+          debug("skipping a duplicate point");
+          continue;
+        }
+        x1 = x2;
+        y1 = y2;
+        x2 = pathIter.x;
+        y2 = pathIter.y;
+
+        // calculate bearing at both segment points
+        // TODO: no need to calculate twice with planar coordinates
+        prevBearing = bearing2;
+        bearing1 = getBearing(x1, y1, x2, y2);
+        bearing2 = getBearing(x2, y2, x1, y1) - 180;
+        // extrude current segment to the left
+        prevP = p2;
+        p1 = geod(x1, y1, bearing1 - 90, dist);
+        p2 = geod(x2, y2, bearing2 - 90, dist);
+
+        if (i == 1) {
+          firstBearing = bearing1;
+        } else {
+          joinAngle = getJoinAngle(prevBearing, bearing1);
+        }
+
+        // extend center coords (i.e. original path)
+        if (center.length == 0) {
+          center.push([x1, y1]);
+        }
+        center.push([x2, y2]);
+
+        // if (veryCloseToPrevPoint(left, p1[0], p1[1])) {
+        //   console.log("VERY CLOSE")
+        //   // skip first point
+        //   addBufferVertex(p2);
+        // }
+
+        if (i > 1 && joinAngle > 0) {
+          if (prevP) {
+            // start join from last extruded vertex of previous buffer slice
+            addBufferVertex(prevP);
+          }
+          makeRoundJoin(x1, y1, prevBearing - 90, joinAngle, dist).forEach(addBufferVertex);
+          addBufferVertex(p1);
+          addBufferVertex(p2);
+          // left.push(p1, p2)
+        } else {
+          // left.push(p1, p2)
+          addBufferVertex(p1);
+          addBufferVertex(p2);
+        }
+
+        // TODO: finish
+        if (center.length - 1 >= sliceLen) {
+          finishRing();
+        }
+        i++;
+      }
+
+      if (center.length > 1) {
+        finishRing();
+      }
+
+      if (x2 == x0 && y2 == y0) { // closed path
+        // add join to finish closed path
+        // TODO - figure out which bearing to use
+        joinAngle = getJoinAngle(bearing2, firstBearing);
+        if (joinAngle > 0) {
+          appendJoinToRing(rings[rings.length-1], x2, y2, bearing1 - 90, joinAngle, dist);
+        }
+      } else { // open path
+        // add a cap to finish open path
+        // left.push.apply(left, makeCap(x2, y2, bearing, dist));
+        appendCapToRing(rings[rings.length-1], x2, y2, bearing2, dist);
+      }
+
+      return rings;
+    }
+
+    function finishRing() {
+      if (center.length < 2) {
+        debug('defective path, skipping');
+        return;
+      }
+      var ring = center.reverse().concat(left);
+      ring.push(ring[0]);
+
+      // Start next partial (if there is one)
+      left = [];
+      center = [];
+      rings.push(ring);
+    }
+
+    // function extendArray(arr, arr2) {
+    //   arr2.reverse();
+    //   while(arr2.length > 0) arr.push(arr2.pop());
+    // }
+
+    function appendJoinToRing(ring, x, y, direction, angle, dist) {
+      var p1 = ring.pop();
+      var coords = makeRoundJoin(x, y, direction, angle, dist);
+      ring.push.apply(ring, coords);
+      ring.push(geod(x, y, direction + angle, dist));
+      ring.push(p1);
+    }
+
+    function appendCapToRing(ring, x, y, direction, dist) {
+      if (capStyle == 'flat' || ring.length < 4) {
+        return;
+      }
+      var p1 = ring.pop();
+      var coords = makeRoundCap(x, y, direction - 90, dist);
+      ring.push.apply(ring, coords);
+      ring.push(p1);
+    }
+
+    function makeRoundCap(x, y, startDir, dist) {
+      var points = makeRoundJoin(x, y, startDir, 180, dist);
+      points.push(geod(x, y, startDir + 180, dist)); // add final vertex
+      return points;
+    }
+
+    // get interior vertices of an interpolated CW arc
+    function makeRoundJoin(cx, cy, startBearing, arcAngle, dist) {
+      var points = [];
+      var increment = 90 / segsPerQuadrant;
+      var angle = increment;
+      while (angle < arcAngle) {
+        points.push(geod(cx, cy, startBearing + angle, dist));
+        angle += increment;
+      }
+      return points;
+    }
+
+    // get angle between two extruded segments in degrees
+    // positive angle means join in convex (range: 0-180 degrees)
+    // negative angle means join is concave (range: -180-0 degrees)
+    function getJoinAngle(direction1, direction2) {
+      var delta = direction2 - direction1;
+      if (delta > 180) {
+        delta -= 360;
+      }
+      if (delta < -180) {
+        delta += 360;
+      }
+      return delta;
+    }
+
+
+    function addBufferVertex(d) {
+      var arr = left;
+      var a, b, c, hit;
+      // c is the start point of the segment formed by appending point d to the polyline.
+      c = arr[arr.length - 1];
+      for (var i=0, idx = arr.length - 3; i < backtrackSteps && idx >= 0; i++, idx--) {
+        a = arr[idx];
+        b = arr[idx + 1];
+        // TODO: consider using a geodetic intersection function for lat-long datasets
+        hit = bufferIntersection$1(a[0], a[1], b[0], b[1], c[0], c[1], d[0], d[1]);
+        // TODO: disregard hits caused by oxbows
+        if (hit) {
+          // TODO: handle collinear segments
+          // if (hit.length != 2) console.log('COLLINEAR', hit)
+          // segments intersect -- replace two internal segment endpoints with xx point
+          while (arr.length > idx + 1) arr.pop();
+          appendPoint(arr, hit);
+          c = hit; // update starting point of the newly added segment
+        }
+      }
+      appendPoint(arr, d);
+    }
+
+  }
+
+  // Test if two points are within a snapping tolerance
+  // TODO: calculate the tolerance more sensibly
+  function veryClose(x1, y1, x2, y2, tol) {
+    var dist = geom.distance2D(x1, y1, x2, y2);
+    return dist < tol;
+  }
+
+  function appendPoint(arr, p) {
+    var prev = arr[arr.length - 1];
+    if (!prev || !veryClose(prev[0], prev[1], p[0], p[1], 1e-10)) {
+      arr.push(p);
+    }
+  }
+
+  // Exclude segments with non-intersecting bounding boxes before
+  // calling intersection function
+  // Possibly slightly faster than direct call... not worth it?
+  function bufferIntersection$1(ax, ay, bx, by, cx, cy, dx, dy) {
+    if (ax < cx && ax < dx && bx < cx && bx < dx ||
+        ax > cx && ax > dx && bx > cx && bx > dx ||
+        ay < cy && ay < dy && by < cy && by < dy ||
+        ay > cy && ay > dy && by > cy && by > dy) return null;
+    return geom.segmentIntersection(ax, ay, bx, by, cx, cy, dx, dy);
+  }
 
   // Returns a function for generating GeoJSON geometries (MultiLineString or MultiPolygon)
   function getPolylineBufferMaker(arcs, geod, getBearing, opts) {
@@ -32203,28 +31904,6 @@ ${svg}
     };
   }
 
-  function addBufferVertex(arr, d, maxBacktrack) {
-    var a, b, c, hit;
-    for (var i=0, idx = arr.length - 3; i<maxBacktrack && idx >= 0; i++, idx--) {
-      c = arr[arr.length - 1];
-      a = arr[idx];
-      b = arr[idx + 1];
-      // TODO: consider using a geodetic intersection function for lat-long datasets
-      hit = bufferIntersection(a[0], a[1], b[0], b[1], c[0], c[1], d[0], d[1]);
-      if (hit) {
-        // TODO: handle collinear segments
-        if (hit.length != 2) ;
-        // segments intersect -- replace two internal segment endpoints with xx point
-        while (arr.length > idx + 1) arr.pop();
-        // TODO: check proximity of hit to several points
-        arr.push(hit);
-      }
-    }
-
-    // TODO: check proximity to previous point
-    arr.push(d); // add new point
-  }
-
   // Exclude segments with non-intersecting bounding boxes before
   // calling intersection function
   // Possibly slightly faster than direct call... not worth it?
@@ -32236,302 +31915,6 @@ ${svg}
     return geom.segmentIntersection(ax, ay, bx, by, cx, cy, dx, dy);
   }
 
-  var PathBuffer = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    addBufferVertex: addBufferVertex,
-    bufferIntersection: bufferIntersection,
-    getPolylineBufferMaker: getPolylineBufferMaker
-  });
-
-  function getPolylineBufferMaker2(arcs, geod, getBearing, opts) {
-    var makeLeftBuffer = getPathBufferMaker2(arcs, geod, getBearing, opts);
-    var geomType = opts.geometry_type;
-
-    function polygonCoords(ring) {
-      return [ring];
-    }
-
-    function needLeftBuffer(path, arcs) {
-      if (geomType == 'polyline') {
-        return opts.type != 'right';
-      }
-      // assume polygon type
-      if (opts.type == 'outer') {
-        return geom.getPathWinding(path, arcs) == 1;
-      }
-      if (opts.type == 'inner') {
-        return geom.getPathWinding(path, arcs) == -1;
-      }
-      return true;
-    }
-
-    function needRightBuffer() {
-      return geomType == 'polyline' && opts.type != 'left';
-    }
-
-    function makeBufferParts(pathArcs, dist) {
-      var leftPartials, rightPartials, parts, revPathArcs;
-
-      if (needLeftBuffer(pathArcs, arcs)) {
-        leftPartials = makeLeftBuffer(pathArcs, dist);
-      }
-      if (needRightBuffer()) {
-        revPathArcs = reversePath(pathArcs.concat());
-        rightPartials = makeLeftBuffer(revPathArcs, dist);
-      }
-      parts = (leftPartials || []).concat(rightPartials || []);
-      return parts.map(polygonCoords);
-    }
-
-    // Returns a GeoJSON Geometry (MultiLineString or MultiPolygon) or null
-    return function(shape, dist) {
-      var geom = {
-        type: 'MultiPolygon',
-        coordinates: []
-      };
-      for (var i=0; i<shape.length; i++) {
-        geom.coordinates = geom.coordinates.concat(makeBufferParts(shape[i], dist));
-      }
-      return geom.coordinates.length == 0 ? null : geom;
-    };
-  }
-
-  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 partials, left, center;
-    var bounds;
-    // TODO: implement other join styles than round
-
-    // function updateTolerance(dist) {
-
-    // }
-
-    function addRoundJoin(x, y, startDir, angle, dist) {
-      var increment = 10;
-      var endDir = startDir + angle;
-      var dir = startDir + increment;
-      while (dir < endDir) {
-        addBufferVertex(geod(x, y, dir, dist));
-        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));
-    //     dir += increment;
-    //   }
-    // }
-
-    // Test if two points are within a snapping tolerance
-    // TODO: calculate the tolerance more sensibly
-    function veryClose(x1, y1, x2, y2, tol) {
-      var dist = geom.distance2D(x1, y1, x2, y2);
-      return dist < tol;
-    }
-
-    function veryCloseToPrevPoint(arr, x, y) {
-      var prev = arr[arr.length - 1];
-      return veryClose(prev[0], prev[1], x, y, 0.000001);
-    }
-
-    function appendPoint(arr, p) {
-      var prev = arr[arr.length - 1];
-      if (!veryClose(prev[0], prev[1], p[0], p[1], 1e-10)) {
-        arr.push(p);
-      }
-    }
-
-    // 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;
-    // }
-
-    // get angle between two extruded segments in degrees
-    // positive angle means join in convex (range: 0-180 degrees)
-    // negative angle means join is concave (range: -180-0 degrees)
-    function getJoinAngle(direction1, direction2) {
-      var delta = direction2 - direction1;
-      if (delta > 180) {
-        delta -= 360;
-      }
-      if (delta < -180) {
-        delta += 360;
-      }
-      return delta;
-    }
-
-
-    // TODO: handle polygon holes
-    function addBufferVertex(d) {
-      var arr = left;
-      var a, b, c, c0, hit;
-      // c is the start point of the segment formed by appending point d to the polyline.
-      c0 = c = arr[arr.length - 1];
-      for (var i=0, idx = arr.length - 3; idx >= 0; i++, idx--) {
-        a = arr[idx];
-        b = arr[idx + 1];
-        // TODO: consider using a geodetic intersection function for lat-long datasets
-        hit = bufferIntersection(a[0], a[1], b[0], b[1], c[0], c[1], d[0], d[1]);
-        if (hit) {
-          if (segmentTurn(a, b, c, d) == 1) {
-            // interpretation: segment cd crosses segment ab from outside to inside
-            // the buffer -- we need to start a new partial; otherwise,
-            // the following code would likely remove a loop representing
-            // an oxbow-type hole in the buffer.
-            //
-            finishPartial();
-            break;
-          }
-          // TODO: handle collinear segments (consider creating new partial)
-          // if (hit.length != 2) console.log('COLLINEAR', hit)
-
-          // segments intersect, indicating a spurious loop: remove the loop and
-          // replace the endpoints of the intersecting segments with the intersection point.
-          while (arr.length > idx + 1) arr.pop();
-          appendPoint(arr, hit);
-          c = hit; // update starting point of the newly added segment
-        }
-
-        // Maintain a bounding box around vertices before the backtrack limit.
-        // If the latest segment intersects this bounding box, there could be a self-
-        // intersection -- start a new partial to prevent self-intersection.
-        //
-        if (i >= backtrackSteps) {
-          if (!bounds) {
-            bounds = new Bounds();
-            bounds.mergePoint(a[0], a[1]);
-          }
-          bounds.mergePoint(b[0], b[1]);
-          if (testSegmentBoundsIntersection(c0, d, bounds)) {
-            finishPartial();
-          }
-          break;
-        }
-      }
-
-      appendPoint(arr, d);
-    }
-
-    function finishPartial() {
-      // Get endpoints of the two polylines, for starting the next partial
-      var leftEP = left[left.length - 1];
-      var centerEP = center[center.length - 1];
-
-      // Make a polygon ring
-      var ring = [];
-      extendArray(ring, left);
-      center.reverse();
-      extendArray(ring, center);
-      ring.push(ring[0]); // close ring
-      partials.push(ring);
-
-      // Start next partial
-      left.push(leftEP);
-      center.push(centerEP);
-
-      // clear bbox
-      // bbox = null;
-    }
-
-    function extendArray(arr, arr2) {
-      arr2.reverse();
-      while(arr2.length > 0) arr.push(arr2.pop());
-    }
-
-    return function(path, dist) {
-      // var x0, y0;
-      var x1, y1, x2, y2;
-      var p1, p2;
-      // var firstBearing;
-      var bearing, prevBearing, joinAngle;
-      partials = [];
-      left = [];
-      center = [];
-      pathIter.init(path);
-
-      // 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
-        x1 = x2;
-        y1 = y2;
-        x2 = pathIter.x;
-        y2 = pathIter.y;
-
-        prevBearing = bearing;
-        bearing = getBearing(x1, y1, x2, y2);
-        // shift original polyline segment to the left by buffer distance
-        p1 = geod(x1, y1, bearing - 90, dist);
-        p2 = geod(x2, y2, bearing - 90, dist);
-
-        if (center.length === 0) {
-          // first loop, second point in this partial
-          // if (partials.length === 0) {
-          //   firstBearing = bearing;
-          // }
-          left.push(p1, p2);
-          center.push([x1, y1], [x2, y2]);
-        } else {
-          //
-          joinAngle = getJoinAngle(prevBearing, bearing);
-          if (veryCloseToPrevPoint(left, p1[0], p1[1])) {
-            // skip first point
-            addBufferVertex(p2);
-          } else if (joinAngle > 0) {
-            addRoundJoin(x1, y1, prevBearing - 90, joinAngle, dist);
-            addBufferVertex(p1);
-            addBufferVertex(p2);
-          } else {
-            addBufferVertex(p1);
-            addBufferVertex(p2);
-          }
-          center.push([x2, y2]);
-        }
-      }
-
-      if (center.length > 1) {
-        finishPartial();
-      }
-      // TODO: handle defective polylines
-
-      // if (x2 == x0 && y2 == y0) {
-      //   // add join to finish closed path
-      //   joinAngle = getJoinAngle(bearing, firstBearing);
-      //   if (joinAngle > 0) {
-      //     addRoundJoin(leftpart, x2, y2, bearing - 90, joinAngle, dist);
-      //   }
-      // } else {
-      //   // add a cap to finish open path
-      //   leftpart.push.apply(leftpart, makeCap(x2, y2, bearing, dist));
-      // }
-
-      return partials;
-    };
-  }
-
   // GeographicLib docs: https://geographiclib.sourceforge.io/html/js/
   //   https://geographiclib.sourceforge.io/html/js/module-GeographicLib_Geodesic.Geodesic.html
   //   https://geographiclib.sourceforge.io/html/js/tutorial-2-interface.html
@@ -32628,30 +32011,43 @@ ${svg}
   });
 
   function makePolylineBuffer(lyr, dataset, opts) {
+    time('buffer');
     var geojson = makeShapeBufferGeoJSON(lyr, dataset, opts);
     var dataset2 = importGeoJSON(geojson, {});
-    dissolveBufferDataset(dataset2, opts);
+    if (!opts.debug_points) {
+      dissolveBufferDataset(dataset2, opts);
+    }
+    timeEnd('buffer');
     return dataset2;
   }
 
   function makeShapeBufferGeoJSON(lyr, dataset, opts) {
     var distanceFn = getBufferDistanceFunction(lyr, dataset, opts);
-    getBufferToleranceFunction(dataset, opts);
+    // var toleranceFn = getBufferToleranceFunction(dataset, opts);
     var geod = getFastGeodeticSegmentFunction(getDatasetCRS(dataset));
     var getBearing = getBearingFunction(dataset);
     var makerOpts = Object.assign({geometry_type: lyr.geometry_type}, opts);
-    var factory = opts.v2 ? getPolylineBufferMaker2 : getPolylineBufferMaker;
-    var makeShapeBuffer = factory(dataset.arcs, geod, getBearing, makerOpts);
-    lyr.data ? lyr.data.getRecords() : null;
-    var geometries = lyr.shapes.map(function(shape, i) {
-      var dist = distanceFn(i);
-      if (!dist || !shape) return null;
-      return makeShapeBuffer(shape, dist, lyr.geometry_type);
-    });
+    var makeShapeBuffer =
+      opts.v2 && getPolylineBufferMaker$1(dataset.arcs, geod, getBearing, makerOpts) ||
+      opts.v3 && getPolylineBufferMaker$2(dataset.arcs, geod, getBearing, makerOpts) ||
+      getPolylineBufferMaker(dataset.arcs, geod, getBearing, makerOpts);
+    // var records = lyr.data ? lyr.data.getRecords() : null;
+    var arr = lyr.shapes.reduce(function(memo, shape, i) {
+      var distance = distanceFn(i);
+      if (!distance || !shape) return memo;
+      // retn might be an array of features or a single feature
+      var retn = makeShapeBuffer(shape, distance);
+      return memo.concat(retn);
+    }, []);
+    var geojsonType = arr?.[0].type;
     // TODO: make sure that importer supports null geometries (not standard GeoJSON);
-    return {
+    // console.log(arr)
+    return geojsonType == 'Feature' ? {
+      type: 'FeatureCollection',
+      features: arr
+    } : {
       type: 'GeometryCollection',
-      geometries: geometries
+      geometries: arr
     };
   }
 
@@ -33103,8 +32499,7 @@ ${svg}
       stop("Unsupported geometry type");
     }
 
-    var lyr2 = mergeOutputLayerIntoDataset(lyr, dataset, dataset2, opts);
-    return [lyr2];
+    return mergeOutputLayersIntoDataset(lyr, dataset, dataset2, opts);
   }
 
   // currently undocumented, used in tests
@@ -37755,9 +37150,6 @@ ${svg}
     getLayerInfo: getLayerInfo
   });
 
-  // import { importGeoJSON } from '../geojson/geojson-import';
-
-
   function addTargetProxies(targets, ctx) {
     if (targets && targets.length > 0) {
       var proxies = expandCommandTargets(targets).reduce(function(memo, target) {
@@ -37780,11 +37172,19 @@ ${svg}
     var proxy = getLayerInfo(target.layer, target.dataset); // layer_name, feature_count etc
     proxy.layer = target.layer;
     proxy.dataset = target.dataset;
-    addGetters(proxy, {
-      // export as an object, not a string or buffer
-      geojson: getGeoJSON
+
+    Object.defineProperty(proxy, 'geojson', {
+      set: setGeoJSON,
+      get: getGeoJSON
     });
 
+    function setGeoJSON(o) {
+      var dataset2 = importGeoJSON(o);
+      var lyr2 = dataset2.layers[0];
+      lyr2.name = target.layer.name;
+      replaceLayerContents(target.layer, target.dataset, dataset2);
+    }
+
     function getGeoJSON() {
       var features = exportLayerAsGeoJSON(target.layer, target.dataset, {rfc7946: true}, true);
       return {
@@ -42303,7 +41703,7 @@ ${svg}
   function findPathMidpoint(path, arcs, useNearestVertex) {
     var halfLen = calcPathLen(path, arcs, false) / 2;
     var partialLen = 0;
-    var p;
+    var p = null;
     forEachSegmentInPath(path, arcs, function(i, j, xx, yy) {
       var a = xx[i],
           b = yy[i],
@@ -42323,7 +41723,7 @@ ${svg}
       partialLen += segLen;
     });
     if (!p) {
-      error('Geometry error');
+      debug('[findPathMidpoint()] defective path:', path);
     }
     return p;
   }
@@ -47259,7 +46659,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.110";
+  var version = "0.6.112";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.
@@ -47862,67 +47262,6 @@ ${svg}
     return false;
   }
 
-  // TODO: Need to rethink polygon repair: these function can cause problems
-  // when part of a self-intersecting polygon is removed
-  //
-  function repairPolygonGeometry(layers, dataset, opts) {
-    var nodes = addIntersectionCuts(dataset);
-    layers.forEach(function(lyr) {
-      repairSelfIntersections(lyr, nodes);
-    });
-    return layers;
-  }
-
-  // Remove any small shapes formed by twists in each ring
-  // // OOPS, NO // Retain only the part with largest area
-  // // this causes problems when a cut-off hole has a matching ring in another polygon
-  // TODO: consider cases where cut-off parts should be retained
-  //
-  function repairSelfIntersections(lyr, nodes) {
-    var splitter = getSelfIntersectionSplitter(nodes);
-
-    lyr.shapes = lyr.shapes.map(function(shp, i) {
-      return cleanPolygon(shp);
-    });
-
-    function cleanPolygon(shp) {
-      var cleanedPolygon = [];
-      forEachShapePart(shp, function(ids) {
-        // TODO: consider returning null if path can't be split
-        var splitIds = splitter(ids);
-        if (splitIds.length === 0) {
-          error("[cleanPolygon()] Defective path:", ids);
-        } else if (splitIds.length == 1) {
-          cleanedPolygon.push(splitIds[0]);
-        } else {
-          var shapeArea = geom.getPlanarPathArea(ids, nodes.arcs),
-              sign = shapeArea > 0 ? 1 : -1,
-              mainRing;
-
-          splitIds.reduce(function(max, ringIds, i) {
-            var pathArea = geom.getPlanarPathArea(ringIds, nodes.arcs) * sign;
-            if (pathArea > max) {
-              mainRing = ringIds;
-              max = pathArea;
-            }
-            return max;
-          }, 0);
-
-          if (mainRing) {
-            cleanedPolygon.push(mainRing);
-          }
-        }
-      });
-      return cleanedPolygon.length > 0 ? cleanedPolygon : null;
-    }
-  }
-
-  var PolygonRepair = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    repairPolygonGeometry: repairPolygonGeometry,
-    repairSelfIntersections: repairSelfIntersections
-  });
-
   // Attach functions exported by modules to the "internal" object,
   // so they can be run by tests and by the GUI.
   // TODO: rewrite tests to import functions directly from modules,
@@ -47969,7 +47308,7 @@ ${svg}
     ArcUtils,
     Bbox2Clipping,
     BinArray$1,
-    BufferCommon,
+    // BufferCommon,
     Calc,
     CalcUtils,
     Catalog$1,
@@ -48024,7 +47363,7 @@ ${svg}
     OverlayUtils,
     Pack, Unpack,
     ParseCommands,
-    PathBuffer,
+    // PathBuffer,
     PathEndpoints,
     PathExport,
     Pathfinder,