mapshaper 0.6.68 → 0.6.70

package/mapshaper.js

@@ -6661,11 +6661,16 @@
         nn = arcData.nn,
         xx = arcData.xx,
         yy = arcData.yy,
-        nodeData;
+        nodeData,
+        globalFilter;
 
     // Accessor function for arcs
     Object.defineProperty(this, 'arcs', {value: arcs});
 
+    this.setArcFilter = function(f) {
+      globalFilter = f;
+    };
+
     this.toArray = function() {
       var chains = getNodeChains(),
           flags = new Uint8Array(chains.length),
@@ -6744,15 +6749,19 @@
     //    Returned ids lead into the node (as opposed to outwards from it)
     // An optional filter function receives the directed id (positive or negative)
     //    of each connected arc and excludes arcs for which the filter returns false.
-    //    The filter is also applied to the initial arc; if false, no arcs are returned.
+    //    // removed: The filter is also applied to the initial arc; if false, no arcs are returned.
     //
-    this.getConnectedArcs = function(arcId, filter) {
+    this.getConnectedArcs = function(arcId, localFilter) {
       var ids = [];
-      var filtered = !!filter;
       var nextId = nextConnectedArc(arcId);
-      if (filtered && !filter(arcId)) ;
+      // kludge: return empty result if arc fails global test
+      // ... applying the local filter causes tests to fail
+      if (globalFilter && !globalFilter(arcId)) {
+        return [];
+      }
       while (nextId != arcId) {
-        if (!filtered || filter(nextId)) {
+        // if (!filtered || filter && filter(nextId) ) {
+        if ((!localFilter || localFilter(nextId)) && (!globalFilter || globalFilter(nextId))) {
           ids.push(nextId);
         }
         nextId = nextConnectedArc(nextId);
@@ -7415,6 +7424,8 @@
   				return this ? this.unpack(source, options) : Unpackr.prototype.unpack.call(defaultOptions, source, options)
   			})
   		}
+  		if (!source.buffer && source.constructor === ArrayBuffer)
+  			source = typeof Buffer !== 'undefined' ? Buffer.from(source) : new Uint8Array(source);
   		if (typeof options === 'object') {
   			srcEnd = options.end || source.length;
   			position$1 = options.start || 0;
@@ -7460,10 +7471,10 @@
   			let size = source.length;
   			let value = this ? this.unpack(source, size) : defaultUnpackr.unpack(source, size);
   			if (forEach) {
-  				if (forEach(value) === false) return;
+  				if (forEach(value, lastPosition, position$1) === false) return;
   				while(position$1 < size) {
   					lastPosition = position$1;
-  					if (forEach(checkedRead()) === false) {
+  					if (forEach(checkedRead(), lastPosition, position$1) === false) {
   						return
   					}
   				}
@@ -7511,8 +7522,8 @@
   		}
   		return this.structures = loadedStructures
   	}
-  	decode(source, end) {
-  		return this.unpack(source, end)
+  	decode(source, options) {
+  		return this.unpack(source, options)
   	}
   }
   function checkedRead(options) {
@@ -7535,6 +7546,10 @@
   			position$1 = bundledStrings$1.postBundlePosition;
   			bundledStrings$1 = null;
   		}
+  		if (sequentialMode)
+  			// we only need to restore the structures if there was an error, but if we completed a read,
+  			// we can clear this out and keep the structures we read
+  			currentStructures.restoreStructures = null;
 
   		if (position$1 == srcEnd) {
   			// finished reading this source, cleanup references
@@ -7548,7 +7563,13 @@
   			// over read
   			throw new Error('Unexpected end of MessagePack data')
   		} else if (!sequentialMode) {
-  			throw new Error('Data read, but end of buffer not reached ' + JSON.stringify(result).slice(0, 100))
+  			let jsonView;
+  			try {
+  				jsonView = JSON.stringify(result, (_, value) => typeof value === "bigint" ? `${value}n` : value).slice(0, 100);
+  			} catch(error) {
+  				jsonView = '(JSON view not available ' + error + ')';
+  			}
+  			throw new Error('Data read, but end of buffer not reached ' + jsonView)
   		}
   		// else more to read, but we are reading sequentially, so don't clear source yet
   		return result
@@ -7704,6 +7725,9 @@
   					value += dataView.getUint32(position$1 + 4);
   				} else if (currentUnpackr.int64AsType === 'string') {
   					value = dataView.getBigUint64(position$1).toString();
+  				} else if (currentUnpackr.int64AsType === 'auto') {
+  					value = dataView.getBigUint64(position$1);
+  					if (value<=BigInt(2)<<BigInt(52)) value=Number(value);
   				} else
   					value = dataView.getBigUint64(position$1);
   				position$1 += 8;
@@ -7726,6 +7750,9 @@
   					value += dataView.getUint32(position$1 + 4);
   				} else if (currentUnpackr.int64AsType === 'string') {
   					value = dataView.getBigInt64(position$1).toString();
+  				} else if (currentUnpackr.int64AsType === 'auto') {
+  					value = dataView.getBigInt64(position$1);
+  					if (value>=BigInt(-2)<<BigInt(52)&&value<=BigInt(2)<<BigInt(52)) value=Number(value);
   				} else
   					value = dataView.getBigInt64(position$1);
   				position$1 += 8;
@@ -8183,7 +8210,7 @@
   			return readFixedString(length)
   	} else { // not cacheable, go back and do a standard read
   		position$1--;
-  		return read().toString()
+  		return asSafeString(read())
   	}
   	let key = ((length << 5) ^ (length > 1 ? dataView.getUint16(position$1) : length > 0 ? src[position$1] : 0)) & 0xfff;
   	let entry = keyCache[key];
@@ -8235,16 +8262,25 @@
   	return entry.string = readFixedString(length)
   }
 
+  function asSafeString(property) {
+  	if (typeof property === 'string') return property;
+  	if (typeof property === 'number') return property.toString();
+  	throw new Error('Invalid property type for record', typeof property);
+  }
   // the registration of the record definition extension (as "r")
   const recordDefinition = (id, highByte) => {
-  	let structure = read().map(property => property.toString()); // ensure that all keys are strings and that the array is mutable
+  	let structure = read().map(asSafeString); // ensure that all keys are strings and
+  	// that the array is mutable
   	let firstByte = id;
   	if (highByte !== undefined) {
   		id = id < 32 ? -((highByte << 5) + id) : ((highByte << 5) + id);
   		structure.highByte = highByte;
   	}
   	let existingStructure = currentStructures[id];
-  	if (existingStructure && existingStructure.isShared) {
+  	// If it is a shared structure, we need to restore any changes after reading.
+  	// Also in sequential mode, we may get incomplete reads and thus errors, and we need to restore
+  	// to the state prior to an incomplete read in order to properly resume.
+  	if (existingStructure && (existingStructure.isShared || sequentialMode)) {
   		(currentStructures.restoreStructures || (currentStructures.restoreStructures = []))[id] = existingStructure;
   	}
   	currentStructures[id] = structure;
@@ -8254,13 +8290,26 @@
   currentExtensions[0] = () => {}; // notepack defines extension 0 to mean undefined, so use that as the default here
   currentExtensions[0].noBuffer = true;
 
+  currentExtensions[0x42] = (data) => {
+  	// decode bigint
+  	let length = data.length;
+  	let value = BigInt(data[0] & 0x80 ? data[0] - 0x100 : data[0]);
+  	for (let i = 1; i < length; i++) {
+  		value <<= 8n;
+  		value += BigInt(data[i]);
+  	}
+  	return value;
+  };
+
+  let errors = { Error, TypeError, ReferenceError };
   currentExtensions[0x65] = () => {
   	let data = read();
-  	return (globalThis[data[0]] || Error)(data[1])
+  	return (errors[data[0]] || Error)(data[1])
   };
 
   currentExtensions[0x69] = (data) => {
   	// id extension (for structured clones)
+  	if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
   	let id = dataView.getUint32(position$1 - 4);
   	if (!referenceMap)
   		referenceMap = new Map();
@@ -8284,6 +8333,7 @@
 
   currentExtensions[0x70] = (data) => {
   	// pointer extension (for structured clones)
+  	if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
   	let id = dataView.getUint32(position$1 - 4);
   	let refEntry = referenceMap.get(id);
   	refEntry.used = true;
@@ -8294,13 +8344,14 @@
 
   const typedArrays = ['Int8','Uint8','Uint8Clamped','Int16','Uint16','Int32','Uint32','Float32','Float64','BigInt64','BigUint64'].map(type => type + 'Array');
 
+  let glbl = typeof globalThis === 'object' ? globalThis : window;
   currentExtensions[0x74] = (data) => {
   	let typeCode = data[0];
   	let typedArrayName = typedArrays[typeCode];
   	if (!typedArrayName)
   		throw new Error('Could not find typed array for code ' + typeCode)
   	// we have to always slice/copy here to get a new ArrayBuffer that is word/byte aligned
-  	return new globalThis[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
+  	return new glbl[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
   };
   currentExtensions[0x78] = () => {
   	let data = read();
@@ -8465,6 +8516,7 @@
   			} else
   				position = (position + 7) & 0x7ffffff8; // Word align to make any future copying of this buffer faster
   			start = position;
+  			if (encodeOptions & RESERVE_START_SPACE) position += (encodeOptions & 0xff);
   			referenceMap = packr.structuredClone ? new Map() : null;
   			if (packr.bundleStrings && typeof value !== 'string') {
   				bundledStrings = [];
@@ -8506,8 +8558,9 @@
   			}
   			if (hasSharedUpdate)
   				hasSharedUpdate = false;
+  			let encodingError;
   			try {
-  				if (packr.randomAccessStructure && value.constructor && value.constructor === Object)
+  				if (packr.randomAccessStructure && value && value.constructor && value.constructor === Object)
   					writeStruct(value);
   				else
   					pack(value);
@@ -8556,42 +8609,51 @@
   					return target
   				}
   				return target.subarray(start, position) // position can change if we call pack again in saveStructures, so we get the buffer now
+  			} catch(error) {
+  				encodingError = error;
+  				throw error;
   			} finally {
   				if (structures) {
-  					if (serializationsSinceTransitionRebuild < 10)
-  						serializationsSinceTransitionRebuild++;
-  					let sharedLength = structures.sharedLength || 0;
-  					if (structures.length > sharedLength)
-  						structures.length = sharedLength;
-  					if (transitionsCount > 10000) {
-  						// force a rebuild occasionally after a lot of transitions so it can get cleaned up
-  						structures.transitions = null;
-  						serializationsSinceTransitionRebuild = 0;
-  						transitionsCount = 0;
-  						if (recordIdsToRemove.length > 0)
-  							recordIdsToRemove = [];
-  					} else if (recordIdsToRemove.length > 0 && !isSequential) {
-  						for (let i = 0, l = recordIdsToRemove.length; i < l; i++) {
-  							recordIdsToRemove[i][RECORD_SYMBOL] = 0;
-  						}
-  						recordIdsToRemove = [];
-  					}
+  					resetStructures();
   					if (hasSharedUpdate && packr.saveStructures) {
+  						let sharedLength = structures.sharedLength || 0;
   						// we can't rely on start/end with REUSE_BUFFER_MODE since they will (probably) change when we save
   						let returnBuffer = target.subarray(start, position);
   						let newSharedData = prepareStructures(structures, packr);
-  						if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
-  							// get updated structures and try again if the update failed
-  							return packr.pack(value)
+  						if (!encodingError) { // TODO: If there is an encoding error, should make the structures as uninitialized so they get rebuilt next time
+  							if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
+  								// get updated structures and try again if the update failed
+  								return packr.pack(value, encodeOptions)
+  							}
+  							packr.lastNamedStructuresLength = sharedLength;
+  							return returnBuffer
   						}
-  						packr.lastNamedStructuresLength = sharedLength;
-  						return returnBuffer
   					}
   				}
   				if (encodeOptions & RESET_BUFFER_MODE)
   					position = start;
   			}
   		};
+  		const resetStructures = () => {
+  			if (serializationsSinceTransitionRebuild < 10)
+  				serializationsSinceTransitionRebuild++;
+  			let sharedLength = structures.sharedLength || 0;
+  			if (structures.length > sharedLength && !isSequential)
+  				structures.length = sharedLength;
+  			if (transitionsCount > 10000) {
+  				// force a rebuild occasionally after a lot of transitions so it can get cleaned up
+  				structures.transitions = null;
+  				serializationsSinceTransitionRebuild = 0;
+  				transitionsCount = 0;
+  				if (recordIdsToRemove.length > 0)
+  					recordIdsToRemove = [];
+  			} else if (recordIdsToRemove.length > 0 && !isSequential) {
+  				for (let i = 0, l = recordIdsToRemove.length; i < l; i++) {
+  					recordIdsToRemove[i][RECORD_SYMBOL] = 0;
+  				}
+  				recordIdsToRemove = [];
+  			}
+  		};
   		const packArray = (value) => {
   			var length = value.length;
   			if (length < 0x10) {
@@ -8769,7 +8831,7 @@
   					targetView.setFloat64(position, value);
   					position += 8;
   				}
-  			} else if (type === 'object') {
+  			} else if (type === 'object' || type === 'function') {
   				if (!value)
   					target[position++] = 0xc0;
   				else {
@@ -8794,21 +8856,24 @@
   					} else if (constructor === Array) {
   						packArray(value);
   					} else if (constructor === Map) {
-  						length = value.size;
-  						if (length < 0x10) {
-  							target[position++] = 0x80 | length;
-  						} else if (length < 0x10000) {
-  							target[position++] = 0xde;
-  							target[position++] = length >> 8;
-  							target[position++] = length & 0xff;
-  						} else {
-  							target[position++] = 0xdf;
-  							targetView.setUint32(position, length);
-  							position += 4;
-  						}
-  						for (let [ key, entryValue ] of value) {
-  							pack(key);
-  							pack(entryValue);
+  						if (this.mapAsEmptyObject) target[position++] = 0x80;
+  						else {
+  							length = value.size;
+  							if (length < 0x10) {
+  								target[position++] = 0x80 | length;
+  							} else if (length < 0x10000) {
+  								target[position++] = 0xde;
+  								target[position++] = length >> 8;
+  								target[position++] = length & 0xff;
+  							} else {
+  								target[position++] = 0xdf;
+  								targetView.setUint32(position, length);
+  								position += 4;
+  							}
+  							for (let [key, entryValue] of value) {
+  								pack(key);
+  								pack(entryValue);
+  							}
   						}
   					} else {	
   						for (let i = 0, l = extensions.length; i < l; i++) {
@@ -8871,6 +8936,18 @@
   						if (Array.isArray(value)) {
   							packArray(value);
   						} else {
+  							// use this as an alternate mechanism for expressing how to serialize
+  							if (value.toJSON) {
+  								const json = value.toJSON();
+  								// if for some reason value.toJSON returns itself it'll loop forever
+  								if (json !== value)
+  									return pack(json)
+  							}
+  							
+  							// if there is a writeFunction, use it, otherwise just encode as undefined
+  							if (type === 'function')
+  								return pack(this.writeFunction && this.writeFunction(value));
+  							
   							// no extension found, write as object
   							writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
   						}
@@ -8892,8 +8969,26 @@
   					if (this.largeBigIntToFloat) {
   						target[position++] = 0xcb;
   						targetView.setFloat64(position, Number(value));
+  					} else if (this.useBigIntExtension && value < 2n**(1023n) && value > -(2n**(1023n))) {
+  						target[position++] = 0xc7;
+  						position++;
+  						target[position++] = 0x42; // "B" for BigInt
+  						let bytes = [];
+  						let alignedSign;
+  						do {
+  							let byte = value & 0xffn;
+  							alignedSign = (byte & 0x80n) === (value < 0n ? 0x80n : 0n);
+  							bytes.push(byte);
+  							value >>= 8n;
+  						} while (!((value === 0n || value === -1n) && alignedSign));
+  						target[position-2] = bytes.length;
+  						for (let i = bytes.length; i > 0;) {
+  							target[position++] = Number(bytes[--i]);
+  						}
+  						return
   					} else {
-  						throw new RangeError(value + ' was too large to fit in MessagePack 64-bit integer format, set largeBigIntToFloat to convert to float-64')
+  						throw new RangeError(value + ' was too large to fit in MessagePack 64-bit integer format, use' +
+  							' useBigIntExtension or set largeBigIntToFloat to convert to float-64')
   					}
   				}
   				position += 8;
@@ -8905,14 +9000,12 @@
   					target[position++] = 0;
   					target[position++] = 0;
   				}
-  			} else if (type === 'function') {
-  				pack(this.writeFunction && this.writeFunction()); // if there is a writeFunction, use it, otherwise just encode as undefined
   			} else {
   				throw new Error('Unknown type: ' + type)
   			}
   		};
 
-  		const writeObject = this.useRecords === false ? this.variableMapSize ? (object) => {
+  		const writePlainObject = (this.variableMapSize || this.coercibleKeyAsNumber) ? (object) => {
   			// this method is slightly slower, but generates "preferred serialization" (optimally small for smaller objects)
   			let keys = Object.keys(object);
   			let length = keys.length;
@@ -8928,9 +9021,19 @@
   				position += 4;
   			}
   			let key;
-  			for (let i = 0; i < length; i++) {
-  				pack(key = keys[i]);
-  				pack(object[key]);
+  			if (this.coercibleKeyAsNumber) {
+  				for (let i = 0; i < length; i++) {
+  					key = keys[i];
+  					let num = Number(key);
+  					pack(isNaN(num) ? key : num);
+  					pack(object[key]);
+  				}
+
+  			} else {
+  				for (let i = 0; i < length; i++) {
+  					pack(key = keys[i]);
+  					pack(object[key]);
+  				}
   			}
   		} :
   		(object, safePrototype) => {
@@ -8947,7 +9050,9 @@
   			}
   			target[objectOffset++ + start] = size >> 8;
   			target[objectOffset + start] = size & 0xff;
-  		} :
+  		};
+
+  		const writeRecord = this.useRecords === false ? writePlainObject :
   		(options.progressiveRecords && !useTwoByteRecords) ?  // this is about 2% faster for highly stable structures, since it only requires one for-in loop (but much more expensive when new structure needs to be written)
   		(object, safePrototype) => {
   			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null));
@@ -9016,9 +9121,18 @@
   			}
   			// now write the values
   			for (let key in object)
-  				if (safePrototype || object.hasOwnProperty(key))
+  				if (safePrototype || object.hasOwnProperty(key)) {
   					pack(object[key]);
+  				}
   		};
+
+  		// craete reference to useRecords if useRecords is a function
+  		const checkUseRecords = typeof this.useRecords == 'function' && this.useRecords;
+  		
+  		const writeObject = checkUseRecords ? (object, safePrototype) => {
+  			checkUseRecords(object) ? writeRecord(object,safePrototype) : writePlainObject(object,safePrototype);
+  		} : writeRecord;
+
   		const makeRoom = (end) => {
   			let newSize;
   			if (end > 0x1000000) {
@@ -9122,12 +9236,13 @@
   			}
   		};
   		const writeStruct = (object, safePrototype) => {
-  			let newPosition = writeStructSlots(object, target, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
+  			let newPosition = writeStructSlots(object, target, start, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
   				if (notifySharedUpdate)
   					return hasSharedUpdate = true;
   				position = newPosition;
   				let startTarget = target;
   				pack(value);
+  				resetStructures();
   				if (startTarget !== target) {
   					return { position, targetView, target }; // indicate the buffer was re-allocated
   				}
@@ -9191,6 +9306,10 @@
   	}
   }, {
   	pack(set, allocateForWrite, pack) {
+  		if (this.setAsEmptyObject) {
+  			allocateForWrite(0);
+  			return pack({})
+  		}
   		let array = Array.from(set);
   		let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
   		if (this.moreTypes) {
@@ -9371,6 +9490,7 @@
   defaultPackr.pack;
   const REUSE_BUFFER_MODE = 512;
   const RESET_BUFFER_MODE = 1024;
+  const RESERVE_START_SPACE = 2048;
 
   // DEFLATE is a complex format; to read this code, you should probably check the RFC first:
   // https://tools.ietf.org/html/rfc1951
@@ -41204,6 +41324,8 @@ ${svg}
     }
     requirePolygonLayer(lyr);
     var nodes = addIntersectionCuts(dataset, opts);
+    // ignore arcs that don't belong to this layer
+    nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var mosaicIndex = new MosaicIndex(lyr, nodes, {flat: false});
     var mosaicShapes = mosaicIndex.mosaic;
     var records2;
@@ -42314,6 +42436,8 @@ ${svg}
 
   function createPolygonLayer(lyr, dataset, opts) {
     var nodes = closeUndershoots(lyr, dataset, opts);
+    // ignore arcs that don't belong to this layer
+    nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var data = buildPolygonMosaic(nodes);
     return {
       geometry_type: 'polygon',
@@ -45304,7 +45428,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.68";
+  var version = "0.6.70";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.68",
+  "version": "0.6.70",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -57,7 +57,7 @@
     "idb-keyval": "^6.2.0",
     "kdbush": "^3.0.0",
     "mproj": "0.0.37",
-    "msgpackr": "^1.8.5",
+    "msgpackr": "^1.10.1",
     "opn": "^5.3.0",
     "rw": "~1.3.3",
     "sync-request": "5.0.0",

package/www/mapshaper-gui.js

@@ -2417,7 +2417,7 @@
       // Show a popup error message, then throw an error
       var msg = GUI.formatMessageArgs(arguments);
       gui.alert(msg);
-      throw new Error(msg);
+      throw new internal.UserError(msg);
     }
 
     function error() {
@@ -3882,7 +3882,11 @@
           } else {
             // stack seems to change if Error is logged directly
             console.error(err.stack);
-            gui.alert('Export failed for an unknown reason');
+            var msg = 'Export failed for an unknown reason';
+            if (err.name == 'UserError') {
+              msg = err.message;
+            }
+            gui.alert(msg, 'Export failed');
           }
         }).finally(function() {
           gui.clearProgressMessage();
@@ -8827,11 +8831,11 @@
     return textNode.childNodes.length > 1;
   }
 
-  function toggleTextAlign(textNode, rec) {
-    var curr = rec['text-anchor'] || 'middle';
-    var value = curr == 'middle' && 'start' || curr == 'start' && 'end' || 'middle';
-    updateTextAnchor(value, textNode, rec);
-  }
+  // export function toggleTextAlign(textNode, rec) {
+  //   var curr = rec['text-anchor'] || 'middle';
+  //   var value = curr == 'middle' && 'start' || curr == 'start' && 'end' || 'middle';
+  //   updateTextAnchor(value, textNode, rec);
+  // }
 
   // Set an attribute on a <text> node and any child <tspan> elements
   // (mapshaper's svg labels require tspans to have the same x and dx values
@@ -8863,6 +8867,7 @@
     var rect = textNode.getBoundingClientRect();
     var labelCenterX = rect.left - svg.getBoundingClientRect().left + rect.width / 2;
     var xpct = (labelCenterX - p[0]) / rect.width; // offset of label center from anchor center
+
     var value = xpct < -0.25 && 'end' || xpct > 0.25 && 'start' || 'middle';
     updateTextAnchor(value, textNode, rec);
   }
@@ -8874,7 +8879,6 @@
     var curr = rec['text-anchor'] || 'middle';
     var xshift = 0;
 
-    // console.log("anchor() curr:", curr, "xpct:", xpct, "left:", rect.left, "anchorX:", anchorX, "targ:", targ, "dx:", xshift)
     if (curr == 'middle' && value == 'end' || curr == 'start' && value == 'middle') {
       xshift = width / 2;
     } else if (curr == 'middle' && value == 'start' || curr == 'end' && value == 'middle') {
@@ -8886,16 +8890,29 @@
     }
     if (xshift) {
       rec['text-anchor'] = value;
-      applyDelta(rec, 'dx', Math.round(xshift));
+      applyDelta(rec, 'dx', xshift / getScaleAttribute(textNode));
     }
   }
 
-  // handle either numeric strings or numbers in fields
+  function getScaleAttribute(node) {
+    // this is fragile, consider passing in the value of <MapExtent>.getSymbolScale()
+    var transform = node.getAttribute('transform') ||
+      node.parentNode.getAttribute('transform'); // compound label puts it here
+    var match = /scale\(([^)]+)\)/.exec(transform || '');
+    return match ? parseFloat(match[1]) : 1;
+  }
+
+  // handle either numeric strings or numbers in record
   function applyDelta(rec, key, delta) {
     var currVal = rec[key];
-    var isString = utils$1.isString(currVal);
     var newVal = (+currVal + delta) || 0;
-    rec[key] = isString ? String(newVal) : newVal;
+    updateNumber(rec, key, newVal);
+  }
+
+  // handle either numeric strings or numbers in record
+  function updateNumber(rec, key, num) {
+    var isString = utils$1.isString(rec[key]);
+    rec[key] = isString ? String(num) : num;
   }
 
   function initLabelDragging(gui, ext, hit) {
@@ -8909,9 +8926,9 @@
 
     hit.on('dragstart', function(e) {
       if (!active(e)) return;
-      var textNode = getTextTarget3(e);
+      var symNode = getSymbolTarget(e);
       var table = hit.getTargetDataTable();
-      if (!textNode || !table) {
+      if (!symNode || !table) {
         activeId = -1;
         return false;
       }
@@ -8927,18 +8944,22 @@
         error$1("Mismatched hit ids:", e.id, activeId);
       }
       var scale = ext.getSymbolScale() || 1;
-      var textNode;
+      var symNode, textNode;
       applyDelta(activeRecord, 'dx', e.dx / scale);
       applyDelta(activeRecord, 'dy', e.dy / scale);
-      textNode = getTextTarget3(e);
-      if (!isMultilineLabel(textNode)) {
-        // update anchor position of single-line labels based on label position
-        // relative to anchor point, for better placement when eventual display font is
-        // different from mapshaper's font.
-        autoUpdateTextAnchor(textNode, activeRecord, getDisplayCoordsById(activeId, hit.getHitTarget().layer, ext));
-      }
-      // updateSymbol(targetTextNode, activeRecord);
-      updateSymbol2(textNode, activeRecord, activeId);
+      symNode = getSymbolTarget(e);
+      textNode = getTextNode(symNode);
+      // update anchor position of labels based on label position relative
+      // to anchor point, for better placement when eventual display font is
+      // different from mapshaper's font.
+      // if (!isMultilineLabel(textNode)) {
+      autoUpdateTextAnchor(textNode, activeRecord, getDisplayCoordsById(activeId, hit.getHitTarget().layer, ext));
+      // }
+      updateNumber(activeRecord, 'dx', internal.roundToDigits(+activeRecord.dx, 3));
+      updateNumber(activeRecord, 'dy', internal.roundToDigits(+activeRecord.dy, 3));
+      updateTextNode(textNode, activeRecord);
+      // updateSymbolNode(symNode, activeRecord, activeId);
+      gui.dispatchEvent('popup-needs-refresh');
     });
 
     hit.on('dragend', function(e) {
@@ -8962,32 +8983,37 @@
       return coords[0];
     }
 
-    function getTextTarget3(e) {
+    function getSymbolTarget(e) {
       if (e.id > -1 === false || !e.container) return null;
       return getSymbolNodeById(e.id, e.container);
     }
 
+    function getTextNode(symNode) {
+      if (symNode.tagName == 'text') return symNode;
+      return symNode.querySelector('text');
+    }
+
     function getSymbolNodeById(id, parent) {
       // TODO: optimize selector
       var sel = '[data-id="' + id + '"]';
       return parent.querySelector(sel);
     }
 
-    function getTextTarget2(e) {
-      var el = e && e.targetSymbol || null;
-      if (el && el.tagName == 'tspan') {
-        el = el.parentNode;
-      }
-      return el && el.tagName == 'text' ? el : null;
-    }
+    // function getTextTarget2(e) {
+    //   var el = e && e.targetSymbol || null;
+    //   if (el && el.tagName == 'tspan') {
+    //     el = el.parentNode;
+    //   }
+    //   return el && el.tagName == 'text' ? el : null;
+    // }
 
-    function getTextTarget(e) {
-      var el = e.target;
-      if (el.tagName == 'tspan') {
-        el = el.parentNode;
-      }
-      return el.tagName == 'text' ? el : null;
-    }
+    // function getTextTarget(e) {
+    //   var el = e.target;
+    //   if (el.tagName == 'tspan') {
+    //     el = el.parentNode;
+    //   }
+    //   return el.tagName == 'text' ? el : null;
+    // }
 
     function getLabelRecordById(id) {
       var table = hit.getTargetDataTable();
@@ -9006,7 +9032,7 @@
     }
 
     // update symbol by setting attributes
-    function updateSymbol(node, d) {
+    function updateTextNode(node, d) {
       var a = d['text-anchor'];
       if (a) node.setAttribute('text-anchor', a);
       setMultilineAttribute(node, 'dx', d.dx || 0);
@@ -9014,7 +9040,8 @@
     }
 
     // update symbol by re-rendering it
-    function updateSymbol2(node, d, id) {
+    // fails when symbol includes a dot (<g><circle/><text/></g> structure)
+    function updateSymbolNode(node, d, id) {
       var o = internal.svg.renderStyledLabel(d); // TODO: symbol support
       var activeLayer = hit.getHitTarget().layer;
       var xy = activeLayer.shapes[id][0];
@@ -9027,8 +9054,6 @@
       g.innerHTML = internal.svg.stringify(o);
       node2 = g.firstChild;
       node.parentNode.replaceChild(node2, node);
-      gui.dispatchEvent('popup-needs-refresh');
-      return node2;
     }
   }
 
@@ -9427,15 +9452,16 @@
     var styler = function(style, i) {
       var defaultStyle = i === topIdx ? topStyle : outlineStyle;
       if (baseStyle.styler) {
-        Object.assign(style, baseStyle);
-        baseStyle.styler(style, i);
+        // TODO: render default stroke widths without scaling
+        // (will need to pass symbol scale to the styler function)
+        style.strokeWidth = defaultStyle.strokeWidth;
+        baseStyle.styler(style, i); // get styled stroke width (if set)
         style.strokeColor = defaultStyle.strokeColor;
         style.fillColor = defaultStyle.fillColor;
       } else {
         Object.assign(style, defaultStyle);
       }
     };
-    // var baseStyle = getDefaultStyle(baseLyr, selectionStyles[geomType]);
     var baseStyle = getActiveLayerStyle(baseLyr, opts);
     var outlineStyle = getDefaultStyle(baseLyr, selectionStyles[geomType]);
     var topStyle;
@@ -10308,7 +10334,9 @@
       for (var i=0; i<shapes.length; i++) {
         shp = shapes[i];
         if (!shp || filter && !filter(shp)) continue;
-        if (styler) styler(style, i);
+        if (styler) {
+          styler(style, i);
+        }
         if (style.overlay || style.opacity < 1 || style.fillOpacity < 1 || style.strokeOpacity < 1 || style.fillEffect) {
           // don't batch shapes with opacity, in case they overlap
           drawPaths([shp], startPath, draw, style);
@@ -11738,6 +11766,7 @@
       }
 
       _activeLyr = getDisplayLayer(e.layer, e.dataset, getDisplayOptions());
+      _activeLyr.style = getActiveLayerStyle(_activeLyr.layer, getGlobalStyleOptions());
       _activeLyr.active = true;
 
       if (popupCanStayOpen(e.flags)) {
@@ -11841,7 +11870,12 @@
     }
 
     function calcFullBounds() {
-      var b = getContentLayerBounds();
+      var b;
+      if (isPreviewView()) {
+        b = new Bounds(getFrameData().bbox);
+      } else {
+        b = getContentLayerBounds();
+      }
 
       // add margin
       // use larger margin for small sizes
@@ -11868,7 +11902,7 @@
     }
 
     function isTableView() {
-      return !isPreviewView() && !!_activeLyr.tabular;
+      return !!_activeLyr.tabular;
     }
 
     function findFrameLayer() {
@@ -11879,8 +11913,7 @@
 
     // Preview view: symbols are scaled based on display size of frame layer
     function isPreviewView() {
-      var data = getFrameData();
-      return !!data;
+      return !isTableView() && !!getFrameData();
     }
 
     function getFrameData() {
@@ -11919,7 +11952,9 @@
 
     function getContentLayers() {
       var layers = getVisibleMapLayers();
-      if (isTableView()) return findActiveLayer(layers);
+      if (isTableView()) {
+        return findActiveLayer(layers);
+      }
       return layers.filter(function(o) {
         return !!o.geographic;
       });

package/www/mapshaper.js

@@ -6661,11 +6661,16 @@
         nn = arcData.nn,
         xx = arcData.xx,
         yy = arcData.yy,
-        nodeData;
+        nodeData,
+        globalFilter;
 
     // Accessor function for arcs
     Object.defineProperty(this, 'arcs', {value: arcs});
 
+    this.setArcFilter = function(f) {
+      globalFilter = f;
+    };
+
     this.toArray = function() {
       var chains = getNodeChains(),
           flags = new Uint8Array(chains.length),
@@ -6744,15 +6749,19 @@
     //    Returned ids lead into the node (as opposed to outwards from it)
     // An optional filter function receives the directed id (positive or negative)
     //    of each connected arc and excludes arcs for which the filter returns false.
-    //    The filter is also applied to the initial arc; if false, no arcs are returned.
+    //    // removed: The filter is also applied to the initial arc; if false, no arcs are returned.
     //
-    this.getConnectedArcs = function(arcId, filter) {
+    this.getConnectedArcs = function(arcId, localFilter) {
       var ids = [];
-      var filtered = !!filter;
       var nextId = nextConnectedArc(arcId);
-      if (filtered && !filter(arcId)) ;
+      // kludge: return empty result if arc fails global test
+      // ... applying the local filter causes tests to fail
+      if (globalFilter && !globalFilter(arcId)) {
+        return [];
+      }
       while (nextId != arcId) {
-        if (!filtered || filter(nextId)) {
+        // if (!filtered || filter && filter(nextId) ) {
+        if ((!localFilter || localFilter(nextId)) && (!globalFilter || globalFilter(nextId))) {
           ids.push(nextId);
         }
         nextId = nextConnectedArc(nextId);
@@ -7415,6 +7424,8 @@
   				return this ? this.unpack(source, options) : Unpackr.prototype.unpack.call(defaultOptions, source, options)
   			})
   		}
+  		if (!source.buffer && source.constructor === ArrayBuffer)
+  			source = typeof Buffer !== 'undefined' ? Buffer.from(source) : new Uint8Array(source);
   		if (typeof options === 'object') {
   			srcEnd = options.end || source.length;
   			position$1 = options.start || 0;
@@ -7460,10 +7471,10 @@
   			let size = source.length;
   			let value = this ? this.unpack(source, size) : defaultUnpackr.unpack(source, size);
   			if (forEach) {
-  				if (forEach(value) === false) return;
+  				if (forEach(value, lastPosition, position$1) === false) return;
   				while(position$1 < size) {
   					lastPosition = position$1;
-  					if (forEach(checkedRead()) === false) {
+  					if (forEach(checkedRead(), lastPosition, position$1) === false) {
   						return
   					}
   				}
@@ -7511,8 +7522,8 @@
   		}
   		return this.structures = loadedStructures
   	}
-  	decode(source, end) {
-  		return this.unpack(source, end)
+  	decode(source, options) {
+  		return this.unpack(source, options)
   	}
   }
   function checkedRead(options) {
@@ -7535,6 +7546,10 @@
   			position$1 = bundledStrings$1.postBundlePosition;
   			bundledStrings$1 = null;
   		}
+  		if (sequentialMode)
+  			// we only need to restore the structures if there was an error, but if we completed a read,
+  			// we can clear this out and keep the structures we read
+  			currentStructures.restoreStructures = null;
 
   		if (position$1 == srcEnd) {
   			// finished reading this source, cleanup references
@@ -7548,7 +7563,13 @@
   			// over read
   			throw new Error('Unexpected end of MessagePack data')
   		} else if (!sequentialMode) {
-  			throw new Error('Data read, but end of buffer not reached ' + JSON.stringify(result).slice(0, 100))
+  			let jsonView;
+  			try {
+  				jsonView = JSON.stringify(result, (_, value) => typeof value === "bigint" ? `${value}n` : value).slice(0, 100);
+  			} catch(error) {
+  				jsonView = '(JSON view not available ' + error + ')';
+  			}
+  			throw new Error('Data read, but end of buffer not reached ' + jsonView)
   		}
   		// else more to read, but we are reading sequentially, so don't clear source yet
   		return result
@@ -7704,6 +7725,9 @@
   					value += dataView.getUint32(position$1 + 4);
   				} else if (currentUnpackr.int64AsType === 'string') {
   					value = dataView.getBigUint64(position$1).toString();
+  				} else if (currentUnpackr.int64AsType === 'auto') {
+  					value = dataView.getBigUint64(position$1);
+  					if (value<=BigInt(2)<<BigInt(52)) value=Number(value);
   				} else
   					value = dataView.getBigUint64(position$1);
   				position$1 += 8;
@@ -7726,6 +7750,9 @@
   					value += dataView.getUint32(position$1 + 4);
   				} else if (currentUnpackr.int64AsType === 'string') {
   					value = dataView.getBigInt64(position$1).toString();
+  				} else if (currentUnpackr.int64AsType === 'auto') {
+  					value = dataView.getBigInt64(position$1);
+  					if (value>=BigInt(-2)<<BigInt(52)&&value<=BigInt(2)<<BigInt(52)) value=Number(value);
   				} else
   					value = dataView.getBigInt64(position$1);
   				position$1 += 8;
@@ -8183,7 +8210,7 @@
   			return readFixedString(length)
   	} else { // not cacheable, go back and do a standard read
   		position$1--;
-  		return read().toString()
+  		return asSafeString(read())
   	}
   	let key = ((length << 5) ^ (length > 1 ? dataView.getUint16(position$1) : length > 0 ? src[position$1] : 0)) & 0xfff;
   	let entry = keyCache[key];
@@ -8235,16 +8262,25 @@
   	return entry.string = readFixedString(length)
   }
 
+  function asSafeString(property) {
+  	if (typeof property === 'string') return property;
+  	if (typeof property === 'number') return property.toString();
+  	throw new Error('Invalid property type for record', typeof property);
+  }
   // the registration of the record definition extension (as "r")
   const recordDefinition = (id, highByte) => {
-  	let structure = read().map(property => property.toString()); // ensure that all keys are strings and that the array is mutable
+  	let structure = read().map(asSafeString); // ensure that all keys are strings and
+  	// that the array is mutable
   	let firstByte = id;
   	if (highByte !== undefined) {
   		id = id < 32 ? -((highByte << 5) + id) : ((highByte << 5) + id);
   		structure.highByte = highByte;
   	}
   	let existingStructure = currentStructures[id];
-  	if (existingStructure && existingStructure.isShared) {
+  	// If it is a shared structure, we need to restore any changes after reading.
+  	// Also in sequential mode, we may get incomplete reads and thus errors, and we need to restore
+  	// to the state prior to an incomplete read in order to properly resume.
+  	if (existingStructure && (existingStructure.isShared || sequentialMode)) {
   		(currentStructures.restoreStructures || (currentStructures.restoreStructures = []))[id] = existingStructure;
   	}
   	currentStructures[id] = structure;
@@ -8254,13 +8290,26 @@
   currentExtensions[0] = () => {}; // notepack defines extension 0 to mean undefined, so use that as the default here
   currentExtensions[0].noBuffer = true;
 
+  currentExtensions[0x42] = (data) => {
+  	// decode bigint
+  	let length = data.length;
+  	let value = BigInt(data[0] & 0x80 ? data[0] - 0x100 : data[0]);
+  	for (let i = 1; i < length; i++) {
+  		value <<= 8n;
+  		value += BigInt(data[i]);
+  	}
+  	return value;
+  };
+
+  let errors = { Error, TypeError, ReferenceError };
   currentExtensions[0x65] = () => {
   	let data = read();
-  	return (globalThis[data[0]] || Error)(data[1])
+  	return (errors[data[0]] || Error)(data[1])
   };
 
   currentExtensions[0x69] = (data) => {
   	// id extension (for structured clones)
+  	if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
   	let id = dataView.getUint32(position$1 - 4);
   	if (!referenceMap)
   		referenceMap = new Map();
@@ -8284,6 +8333,7 @@
 
   currentExtensions[0x70] = (data) => {
   	// pointer extension (for structured clones)
+  	if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
   	let id = dataView.getUint32(position$1 - 4);
   	let refEntry = referenceMap.get(id);
   	refEntry.used = true;
@@ -8294,13 +8344,14 @@
 
   const typedArrays = ['Int8','Uint8','Uint8Clamped','Int16','Uint16','Int32','Uint32','Float32','Float64','BigInt64','BigUint64'].map(type => type + 'Array');
 
+  let glbl = typeof globalThis === 'object' ? globalThis : window;
   currentExtensions[0x74] = (data) => {
   	let typeCode = data[0];
   	let typedArrayName = typedArrays[typeCode];
   	if (!typedArrayName)
   		throw new Error('Could not find typed array for code ' + typeCode)
   	// we have to always slice/copy here to get a new ArrayBuffer that is word/byte aligned
-  	return new globalThis[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
+  	return new glbl[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
   };
   currentExtensions[0x78] = () => {
   	let data = read();
@@ -8465,6 +8516,7 @@
   			} else
   				position = (position + 7) & 0x7ffffff8; // Word align to make any future copying of this buffer faster
   			start = position;
+  			if (encodeOptions & RESERVE_START_SPACE) position += (encodeOptions & 0xff);
   			referenceMap = packr.structuredClone ? new Map() : null;
   			if (packr.bundleStrings && typeof value !== 'string') {
   				bundledStrings = [];
@@ -8506,8 +8558,9 @@
   			}
   			if (hasSharedUpdate)
   				hasSharedUpdate = false;
+  			let encodingError;
   			try {
-  				if (packr.randomAccessStructure && value.constructor && value.constructor === Object)
+  				if (packr.randomAccessStructure && value && value.constructor && value.constructor === Object)
   					writeStruct(value);
   				else
   					pack(value);
@@ -8556,42 +8609,51 @@
   					return target
   				}
   				return target.subarray(start, position) // position can change if we call pack again in saveStructures, so we get the buffer now
+  			} catch(error) {
+  				encodingError = error;
+  				throw error;
   			} finally {
   				if (structures) {
-  					if (serializationsSinceTransitionRebuild < 10)
-  						serializationsSinceTransitionRebuild++;
-  					let sharedLength = structures.sharedLength || 0;
-  					if (structures.length > sharedLength)
-  						structures.length = sharedLength;
-  					if (transitionsCount > 10000) {
-  						// force a rebuild occasionally after a lot of transitions so it can get cleaned up
-  						structures.transitions = null;
-  						serializationsSinceTransitionRebuild = 0;
-  						transitionsCount = 0;
-  						if (recordIdsToRemove.length > 0)
-  							recordIdsToRemove = [];
-  					} else if (recordIdsToRemove.length > 0 && !isSequential) {
-  						for (let i = 0, l = recordIdsToRemove.length; i < l; i++) {
-  							recordIdsToRemove[i][RECORD_SYMBOL] = 0;
-  						}
-  						recordIdsToRemove = [];
-  					}
+  					resetStructures();
   					if (hasSharedUpdate && packr.saveStructures) {
+  						let sharedLength = structures.sharedLength || 0;
   						// we can't rely on start/end with REUSE_BUFFER_MODE since they will (probably) change when we save
   						let returnBuffer = target.subarray(start, position);
   						let newSharedData = prepareStructures(structures, packr);
-  						if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
-  							// get updated structures and try again if the update failed
-  							return packr.pack(value)
+  						if (!encodingError) { // TODO: If there is an encoding error, should make the structures as uninitialized so they get rebuilt next time
+  							if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
+  								// get updated structures and try again if the update failed
+  								return packr.pack(value, encodeOptions)
+  							}
+  							packr.lastNamedStructuresLength = sharedLength;
+  							return returnBuffer
   						}
-  						packr.lastNamedStructuresLength = sharedLength;
-  						return returnBuffer
   					}
   				}
   				if (encodeOptions & RESET_BUFFER_MODE)
   					position = start;
   			}
   		};
+  		const resetStructures = () => {
+  			if (serializationsSinceTransitionRebuild < 10)
+  				serializationsSinceTransitionRebuild++;
+  			let sharedLength = structures.sharedLength || 0;
+  			if (structures.length > sharedLength && !isSequential)
+  				structures.length = sharedLength;
+  			if (transitionsCount > 10000) {
+  				// force a rebuild occasionally after a lot of transitions so it can get cleaned up
+  				structures.transitions = null;
+  				serializationsSinceTransitionRebuild = 0;
+  				transitionsCount = 0;
+  				if (recordIdsToRemove.length > 0)
+  					recordIdsToRemove = [];
+  			} else if (recordIdsToRemove.length > 0 && !isSequential) {
+  				for (let i = 0, l = recordIdsToRemove.length; i < l; i++) {
+  					recordIdsToRemove[i][RECORD_SYMBOL] = 0;
+  				}
+  				recordIdsToRemove = [];
+  			}
+  		};
   		const packArray = (value) => {
   			var length = value.length;
   			if (length < 0x10) {
@@ -8769,7 +8831,7 @@
   					targetView.setFloat64(position, value);
   					position += 8;
   				}
-  			} else if (type === 'object') {
+  			} else if (type === 'object' || type === 'function') {
   				if (!value)
   					target[position++] = 0xc0;
   				else {
@@ -8794,21 +8856,24 @@
   					} else if (constructor === Array) {
   						packArray(value);
   					} else if (constructor === Map) {
-  						length = value.size;
-  						if (length < 0x10) {
-  							target[position++] = 0x80 | length;
-  						} else if (length < 0x10000) {
-  							target[position++] = 0xde;
-  							target[position++] = length >> 8;
-  							target[position++] = length & 0xff;
-  						} else {
-  							target[position++] = 0xdf;
-  							targetView.setUint32(position, length);
-  							position += 4;
-  						}
-  						for (let [ key, entryValue ] of value) {
-  							pack(key);
-  							pack(entryValue);
+  						if (this.mapAsEmptyObject) target[position++] = 0x80;
+  						else {
+  							length = value.size;
+  							if (length < 0x10) {
+  								target[position++] = 0x80 | length;
+  							} else if (length < 0x10000) {
+  								target[position++] = 0xde;
+  								target[position++] = length >> 8;
+  								target[position++] = length & 0xff;
+  							} else {
+  								target[position++] = 0xdf;
+  								targetView.setUint32(position, length);
+  								position += 4;
+  							}
+  							for (let [key, entryValue] of value) {
+  								pack(key);
+  								pack(entryValue);
+  							}
   						}
   					} else {	
   						for (let i = 0, l = extensions.length; i < l; i++) {
@@ -8871,6 +8936,18 @@
   						if (Array.isArray(value)) {
   							packArray(value);
   						} else {
+  							// use this as an alternate mechanism for expressing how to serialize
+  							if (value.toJSON) {
+  								const json = value.toJSON();
+  								// if for some reason value.toJSON returns itself it'll loop forever
+  								if (json !== value)
+  									return pack(json)
+  							}
+  							
+  							// if there is a writeFunction, use it, otherwise just encode as undefined
+  							if (type === 'function')
+  								return pack(this.writeFunction && this.writeFunction(value));
+  							
   							// no extension found, write as object
   							writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
   						}
@@ -8892,8 +8969,26 @@
   					if (this.largeBigIntToFloat) {
   						target[position++] = 0xcb;
   						targetView.setFloat64(position, Number(value));
+  					} else if (this.useBigIntExtension && value < 2n**(1023n) && value > -(2n**(1023n))) {
+  						target[position++] = 0xc7;
+  						position++;
+  						target[position++] = 0x42; // "B" for BigInt
+  						let bytes = [];
+  						let alignedSign;
+  						do {
+  							let byte = value & 0xffn;
+  							alignedSign = (byte & 0x80n) === (value < 0n ? 0x80n : 0n);
+  							bytes.push(byte);
+  							value >>= 8n;
+  						} while (!((value === 0n || value === -1n) && alignedSign));
+  						target[position-2] = bytes.length;
+  						for (let i = bytes.length; i > 0;) {
+  							target[position++] = Number(bytes[--i]);
+  						}
+  						return
   					} else {
-  						throw new RangeError(value + ' was too large to fit in MessagePack 64-bit integer format, set largeBigIntToFloat to convert to float-64')
+  						throw new RangeError(value + ' was too large to fit in MessagePack 64-bit integer format, use' +
+  							' useBigIntExtension or set largeBigIntToFloat to convert to float-64')
   					}
   				}
   				position += 8;
@@ -8905,14 +9000,12 @@
   					target[position++] = 0;
   					target[position++] = 0;
   				}
-  			} else if (type === 'function') {
-  				pack(this.writeFunction && this.writeFunction()); // if there is a writeFunction, use it, otherwise just encode as undefined
   			} else {
   				throw new Error('Unknown type: ' + type)
   			}
   		};
 
-  		const writeObject = this.useRecords === false ? this.variableMapSize ? (object) => {
+  		const writePlainObject = (this.variableMapSize || this.coercibleKeyAsNumber) ? (object) => {
   			// this method is slightly slower, but generates "preferred serialization" (optimally small for smaller objects)
   			let keys = Object.keys(object);
   			let length = keys.length;
@@ -8928,9 +9021,19 @@
   				position += 4;
   			}
   			let key;
-  			for (let i = 0; i < length; i++) {
-  				pack(key = keys[i]);
-  				pack(object[key]);
+  			if (this.coercibleKeyAsNumber) {
+  				for (let i = 0; i < length; i++) {
+  					key = keys[i];
+  					let num = Number(key);
+  					pack(isNaN(num) ? key : num);
+  					pack(object[key]);
+  				}
+
+  			} else {
+  				for (let i = 0; i < length; i++) {
+  					pack(key = keys[i]);
+  					pack(object[key]);
+  				}
   			}
   		} :
   		(object, safePrototype) => {
@@ -8947,7 +9050,9 @@
   			}
   			target[objectOffset++ + start] = size >> 8;
   			target[objectOffset + start] = size & 0xff;
-  		} :
+  		};
+
+  		const writeRecord = this.useRecords === false ? writePlainObject :
   		(options.progressiveRecords && !useTwoByteRecords) ?  // this is about 2% faster for highly stable structures, since it only requires one for-in loop (but much more expensive when new structure needs to be written)
   		(object, safePrototype) => {
   			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null));
@@ -9016,9 +9121,18 @@
   			}
   			// now write the values
   			for (let key in object)
-  				if (safePrototype || object.hasOwnProperty(key))
+  				if (safePrototype || object.hasOwnProperty(key)) {
   					pack(object[key]);
+  				}
   		};
+
+  		// craete reference to useRecords if useRecords is a function
+  		const checkUseRecords = typeof this.useRecords == 'function' && this.useRecords;
+  		
+  		const writeObject = checkUseRecords ? (object, safePrototype) => {
+  			checkUseRecords(object) ? writeRecord(object,safePrototype) : writePlainObject(object,safePrototype);
+  		} : writeRecord;
+
   		const makeRoom = (end) => {
   			let newSize;
   			if (end > 0x1000000) {
@@ -9122,12 +9236,13 @@
   			}
   		};
   		const writeStruct = (object, safePrototype) => {
-  			let newPosition = writeStructSlots(object, target, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
+  			let newPosition = writeStructSlots(object, target, start, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
   				if (notifySharedUpdate)
   					return hasSharedUpdate = true;
   				position = newPosition;
   				let startTarget = target;
   				pack(value);
+  				resetStructures();
   				if (startTarget !== target) {
   					return { position, targetView, target }; // indicate the buffer was re-allocated
   				}
@@ -9191,6 +9306,10 @@
   	}
   }, {
   	pack(set, allocateForWrite, pack) {
+  		if (this.setAsEmptyObject) {
+  			allocateForWrite(0);
+  			return pack({})
+  		}
   		let array = Array.from(set);
   		let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
   		if (this.moreTypes) {
@@ -9371,6 +9490,7 @@
   defaultPackr.pack;
   const REUSE_BUFFER_MODE = 512;
   const RESET_BUFFER_MODE = 1024;
+  const RESERVE_START_SPACE = 2048;
 
   // DEFLATE is a complex format; to read this code, you should probably check the RFC first:
   // https://tools.ietf.org/html/rfc1951
@@ -41204,6 +41324,8 @@ ${svg}
     }
     requirePolygonLayer(lyr);
     var nodes = addIntersectionCuts(dataset, opts);
+    // ignore arcs that don't belong to this layer
+    nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var mosaicIndex = new MosaicIndex(lyr, nodes, {flat: false});
     var mosaicShapes = mosaicIndex.mosaic;
     var records2;
@@ -42314,6 +42436,8 @@ ${svg}
 
   function createPolygonLayer(lyr, dataset, opts) {
     var nodes = closeUndershoots(lyr, dataset, opts);
+    // ignore arcs that don't belong to this layer
+    nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var data = buildPolygonMosaic(nodes);
     return {
       geometry_type: 'polygon',
@@ -45304,7 +45428,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.68";
+  var version = "0.6.70";
 
   // 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.