mapshaper 0.6.103 → 0.6.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.103",
+  "version": "0.6.105",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -64,12 +64,13 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^28.0.6",
-    "@rollup/plugin-json": "^6.0.1",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "csv-spectrum": "^1.0.0",
     "eslint": "^8.16.0",
     "mocha": "^10.2.0",
-    "rollup": "^2.73.0",
+    "rollup": "^4.44.1",
+    "rollup-plugin-polyfill-node": "^0.13.0",
     "shell-quote": "^1.7.4",
     "underscore": "^1.13.1"
   },

package/www/basemap.js

@@ -1,7 +1,8 @@
 window.mapboxParams = {
   js: 'https://api.mapbox.com/mapbox-gl-js/v2.11.1/mapbox-gl.js',
   css: 'https://api.mapbox.com/mapbox-gl-js/v2.11.1/mapbox-gl.css',
-  key: 'pk.eyJ1IjoiZ3JhbW1hdGEiLCJhIjoiY2wxMzI4b3dqMDNhMjNpcDhzcmU0aGh5diJ9.m1lacx48pTYls-X3FVhG9g',
+  production_key: 'pk.eyJ1IjoiZ3JhbW1hdGEiLCJhIjoiY21jZ2RlbGk1MGhvNzJrcHV2dTYzZWE2byJ9.btkRnRrPW75c0AlQ5lH2cg',
+  localhost_key: 'pk.eyJ1IjoiZ3JhbW1hdGEiLCJhIjoiY21jZ2Rna2hrMGo2ZjJqcHFxMHAycDlyMSJ9.q8FchhB-NAN_FGBHN0AJeg',
   styles: [{
     name: 'Map',
     icon: 'images/thumb-map.jpg',

package/www/mapshaper-gui.js

@@ -2,105 +2,105 @@
 
   var utils = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    get addThousandsSep () { return addThousandsSep; },
+    get addslashes () { return addslashes; },
+    get arrayToIndex () { return arrayToIndex; },
+    get clamp () { return clamp; },
+    get cleanNumericString () { return cleanNumericString; },
+    get contains () { return contains; },
+    get copyElements () { return copyElements; },
+    get countValues () { return countValues; },
+    get createBuffer () { return createBuffer; },
     get default () { return utils; },
+    get defaults () { return defaults; },
+    get difference () { return difference; },
+    get endsWith () { return endsWith; },
+    get every () { return every; },
+    get expandoBuffer () { return expandoBuffer; },
+    get extend () { return extend; },
+    get extendBuffer () { return extendBuffer; },
+    get find () { return find; },
+    get findMedian () { return findMedian; },
+    get findQuantile () { return findQuantile; },
+    get findRankByValue () { return findRankByValue; },
+    get findStringPrefix () { return findStringPrefix; },
+    get findValueByPct () { return findValueByPct; },
+    get findValueByRank () { return findValueByRank; },
+    get forEach () { return forEach; },
+    get forEachProperty () { return forEachProperty; },
+    get format () { return format; },
+    get formatDateISO () { return formatDateISO; },
+    get formatIntlNumber () { return formatIntlNumber; },
+    get formatNumber () { return formatNumber; },
+    get formatNumberForDisplay () { return formatNumberForDisplay; },
+    get formatVersionedName () { return formatVersionedName; },
+    get formatter () { return formatter; },
+    get genericSort () { return genericSort; },
+    get getArrayBounds () { return getArrayBounds; },
+    get getGenericComparator () { return getGenericComparator; },
+    get getKeyComparator () { return getKeyComparator; },
+    get getSortedIds () { return getSortedIds; },
     get getUniqueName () { return getUniqueName; },
-    get isFunction () { return isFunction; },
-    get isPromise () { return isPromise; },
-    get isObject () { return isObject; },
-    get clamp () { return clamp; },
+    get groupBy () { return groupBy; },
+    get htmlEscape () { return htmlEscape; },
+    get indexOf () { return indexOf; },
+    get indexOn () { return indexOn; },
+    get inherit () { return inherit; },
+    get initializeArray () { return initializeArray; },
+    get intersection () { return intersection; },
     get isArray () { return isArray; },
-    get isNumber () { return isNumber; },
-    get isValidNumber () { return isValidNumber; },
+    get isArrayLike () { return isArrayLike; },
+    get isBoolean () { return isBoolean; },
+    get isDate () { return isDate; },
+    get isEven () { return isEven; },
     get isFiniteNumber () { return isFiniteNumber; },
-    get isNonNegNumber () { return isNonNegNumber; },
+    get isFunction () { return isFunction; },
     get isInteger () { return isInteger; },
-    get isEven () { return isEven; },
+    get isNonNegNumber () { return isNonNegNumber; },
+    get isNumber () { return isNumber; },
+    get isObject () { return isObject; },
     get isOdd () { return isOdd; },
+    get isPromise () { return isPromise; },
     get isString () { return isString; },
-    get isDate () { return isDate; },
-    get isBoolean () { return isBoolean; },
-    get formatDateISO () { return formatDateISO; },
-    get toArray () { return toArray; },
-    get isArrayLike () { return isArrayLike; },
-    get addslashes () { return addslashes; },
-    get regexEscape () { return regexEscape; },
-    get htmlEscape () { return htmlEscape; },
-    get defaults () { return defaults; },
-    get extend () { return extend; },
-    get inherit () { return inherit; },
-    get promisify () { return promisify; },
-    get reduceAsync () { return reduceAsync; },
+    get isValidNumber () { return isValidNumber; },
+    get lpad () { return lpad; },
+    get ltrim () { return ltrim; },
+    get mean () { return mean; },
     get merge () { return merge; },
-    get difference () { return difference; },
-    get intersection () { return intersection; },
-    get indexOf () { return indexOf; },
-    get contains () { return contains; },
-    get some () { return some; },
-    get every () { return every; },
-    get find () { return find; },
+    get mergeNames () { return mergeNames; },
+    get numToStr () { return numToStr; },
+    get parseIntlNumber () { return parseIntlNumber; },
+    get parseNumber () { return parseNumber; },
+    get parsePercent () { return parsePercent; },
+    get parseString () { return parseString; },
+    get pickOne () { return pickOne; },
+    get pluck () { return pluck; },
+    get pluralSuffix () { return pluralSuffix; },
+    get promisify () { return promisify; },
+    get quicksort () { return quicksort; },
+    get quicksortPartition () { return quicksortPartition; },
     get range () { return range; },
+    get reduceAsync () { return reduceAsync; },
+    get regexEscape () { return regexEscape; },
+    get reorderArray () { return reorderArray; },
     get repeat () { return repeat; },
-    get sum () { return sum; },
-    get getArrayBounds () { return getArrayBounds; },
-    get uniq () { return uniq; },
-    get pluck () { return pluck; },
-    get countValues () { return countValues; },
-    get indexOn () { return indexOn; },
-    get groupBy () { return groupBy; },
-    get arrayToIndex () { return arrayToIndex; },
-    get forEach () { return forEach; },
-    get forEachProperty () { return forEachProperty; },
-    get initializeArray () { return initializeArray; },
-    get replaceArray () { return replaceArray; },
     get repeatString () { return repeatString; },
-    get splitLines () { return splitLines; },
-    get pluralSuffix () { return pluralSuffix; },
-    get endsWith () { return endsWith; },
-    get lpad () { return lpad; },
+    get replaceArray () { return replaceArray; },
     get rpad () { return rpad; },
-    get trim () { return trim; },
-    get ltrim () { return ltrim; },
     get rtrim () { return rtrim; },
-    get addThousandsSep () { return addThousandsSep; },
-    get numToStr () { return numToStr; },
-    get formatNumber () { return formatNumber; },
-    get formatIntlNumber () { return formatIntlNumber; },
-    get formatNumberForDisplay () { return formatNumberForDisplay; },
     get shuffle () { return shuffle; },
-    get pickOne () { return pickOne; },
-    get sortOn () { return sortOn; },
-    get genericSort () { return genericSort; },
-    get getSortedIds () { return getSortedIds; },
+    get some () { return some; },
     get sortArrayIndex () { return sortArrayIndex; },
-    get reorderArray () { return reorderArray; },
-    get getKeyComparator () { return getKeyComparator; },
-    get getGenericComparator () { return getGenericComparator; },
-    get quicksort () { return quicksort; },
-    get quicksortPartition () { return quicksortPartition; },
-    get findRankByValue () { return findRankByValue; },
-    get findValueByPct () { return findValueByPct; },
-    get findValueByRank () { return findValueByRank; },
-    get findMedian () { return findMedian; },
-    get findQuantile () { return findQuantile; },
-    get mean () { return mean; },
-    get format () { return format; },
-    get formatter () { return formatter; },
-    get wildcardToRegExp () { return wildcardToRegExp; },
-    get createBuffer () { return createBuffer; },
+    get sortOn () { return sortOn; },
+    get splitLines () { return splitLines; },
+    get sum () { return sum; },
+    get toArray () { return toArray; },
     get toBuffer () { return toBuffer; },
-    get expandoBuffer () { return expandoBuffer; },
-    get copyElements () { return copyElements; },
-    get extendBuffer () { return extendBuffer; },
-    get mergeNames () { return mergeNames; },
-    get findStringPrefix () { return findStringPrefix; },
-    get parsePercent () { return parsePercent; },
-    get formatVersionedName () { return formatVersionedName; },
+    get trim () { return trim; },
+    get trimQuotes () { return trimQuotes; },
+    get uniq () { return uniq; },
     get uniqifyNames () { return uniqifyNames; },
-    get parseString () { return parseString; },
-    get parseNumber () { return parseNumber; },
-    get parseIntlNumber () { return parseIntlNumber; },
-    get cleanNumericString () { return cleanNumericString; },
-    get trimQuotes () { return trimQuotes; }
+    get wildcardToRegExp () { return wildcardToRegExp; }
   });
 
   var api = window.mapshaper; // assuming mapshaper is in global scope
@@ -2946,7 +2946,6 @@
         style.styler = getOverlayPointStyler(getCanvasDisplayStyle(baseLyr).styler, styler);
       }
       style.type = 'styled';
-
     }
     return ids.length > 0 ? style : null;
   }
@@ -8228,7 +8227,7 @@
           }
         });
         return {
-          ids: hits
+          ids: utils$1.uniq(hits)
         };
       };
     }
@@ -8414,7 +8413,7 @@
     mouse.on('contextmenu', function(e) {
       e.originalEvent.preventDefault();
       if (El('body').hasClass('map-view')) {
-        triggerHitEvent('contextmenu', e);
+        triggerPointerEvent('contextmenu', e);
       }
     });
 
@@ -8510,7 +8509,7 @@
       if (storedData.id == id) return;
       storedData.id = id;
       storedData.ids = id == -1 ? [] : [id];
-      triggerHitEvent('change');
+      triggerChangeEvent();
     };
 
     // Get a reference to the active layer, so listeners to hit events can interact
@@ -8529,7 +8528,7 @@
     self.setPinning = function(val) {
       if (pinnedOn != val) {
         pinnedOn = val;
-        triggerHitEvent('change');
+        triggerChangeEvent();
       }
     };
 
@@ -8537,7 +8536,7 @@
       // turnOn('selection');
       transientIds = ids || [];
       if (active) {
-        triggerHitEvent('change');
+        triggerChangeEvent();
       }
     };
 
@@ -8552,9 +8551,9 @@
       self.triggerChangeEvent();
     };
 
-    self.triggerChangeEvent = function() {
-      triggerHitEvent('change');
-    };
+    self.triggerChangeEvent = triggerChangeEvent;
+
+    self.getHitState = getHitState;
 
     self.clearDrawingId = function() {
       self.setDrawingId(-1);
@@ -8566,14 +8565,14 @@
       if (p2 && p2[0] == p[0] && p2[1] == p[1]) return;
       storedData.hit_coordinates = p;
       storedData.hit_type = type || '';
-      triggerHitEvent('change');
+      triggerChangeEvent();
     };
 
     self.clearHoverVertex = function() {
       if (!storedData.hit_coordinates) return;
       delete storedData.hit_coordinates;
       delete storedData.hit_type;
-      triggerHitEvent('change');
+      triggerChangeEvent();
     };
 
     self.clearSelection = function() {
@@ -8607,7 +8606,7 @@
       if (n < 2 || pinnedId() == -1) return;
       storedData.id = (pinnedId() + n + diff) % n;
       storedData.ids = [storedData.id];
-      triggerHitEvent('change');
+      triggerChangeEvent();
     }
 
     // diff: 1 or -1
@@ -8617,7 +8616,7 @@
       var n = storedData.ids.length;
       if (i < 0 || n < 2) return;
       storedData.id = storedData.ids[(i + diff + n) % n];
-      triggerHitEvent('change');
+      triggerChangeEvent();
     }
 
     // make sure popup is unpinned and turned off when switching editing modes
@@ -8644,7 +8643,6 @@
     mouse.on('drag', handlePointerEvent, null, priority);
     mouse.on('dragend', handlePointerEvent, null, priority);
 
-
     mouse.on('click', function(e) {
       var pinned = storedData.pinned;
       if (!hitTest || !active) return;
@@ -8661,7 +8659,7 @@
         // a new point doesn't get made
         return;
       }
-      triggerHitEvent('click', e);
+      triggerPointerEvent('click', e);
     }, null, priority);
 
     // Hits are re-detected on 'hover' (if hit detection is active)
@@ -8775,7 +8773,7 @@
       storedData = newData;
       gui.container.findChild('.map-layers').classed('symbol-hit', nonEmpty);
       if (active) {
-        triggerHitEvent('change');
+        triggerChangeEvent();
       }
     }
 
@@ -8827,40 +8825,50 @@
     function handlePointerEvent(e) {
       if (eventIsEnabled(e.type)) {
         possiblyStopPropagation(e);
-        triggerHitEvent(e.type, e);
+        triggerPointerEvent(e.type, e);
       }
     }
 
+    function triggerChangeEvent() {
+      self.dispatchEvent('change', getHitState());
+    }
+
     // evt: event data (may be a pointer event object, an ordinary object or null)
-    function triggerHitEvent(type, evt) {
-      var eventData = {
-        mode: interactionMode()
-      };
+    function triggerPointerEvent(type, evt) {
+      var eventData = getHitState();
       if (evt) {
         // data coordinates
         eventData.projected_coordinates = gui.map.pixelCoordsToProjectedCoords(evt.x, evt.y);
         eventData.lonlat_coordinates = gui.map.pixelCoordsToLngLatCoords(evt.x, evt.y);
         eventData.originalEvent = evt;
         eventData.overMap = isOverMap(evt);
+        utils$1.defaults(eventData, evt.data);
       }
+      // utils.defaults(eventData, evt && evt.data || {}, storedData);
+      self.dispatchEvent(type, eventData);
+    }
+
+    function getHitState() {
+      var data = {
+        mode: interactionMode()
+      };
       // Merge stored hit data into the event data
-      utils$1.defaults(eventData, evt && evt.data || {}, storedData);
-      // utils.extend(eventData, storedData);
+      utils$1.defaults(data, storedData);
       if (transientIds.length) {
         // add transient ids to any other hit ids
-        eventData.ids = utils$1.uniq(transientIds.concat(eventData.ids || []));
+        data.ids = utils$1.uniq(transientIds.concat(data.ids || []));
       }
       // when drawing, we want the overlay layer to show the path being currently
       // drawn.
       if (drawingId >= 0) {
-        // eventData.ids = [drawingId];
-        // eventData.id = drawingId;
-        eventData.ids = utils$1.uniq(eventData.ids.concat([drawingId]));
+        // data.ids = [drawingId];
+        // data.id = drawingId;
+        data.ids = utils$1.uniq(data.ids.concat([drawingId]));
       }
       if (pinnedOn) {
-        eventData.pinned = true;
+        data.pinned = true;
       }
-      self.dispatchEvent(type, eventData);
+      return data;
     }
 
     // Test if two hit data objects are equivalent
@@ -13567,12 +13575,14 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     }
 
     function initMap() {
+      var accessToken = (window.location.hostname == 'localhost' ?
+        params.localhost_key : params.production_key) || params.key;
       if (!enabled() || map || loading) return;
       loading = true;
       loadStylesheet(params.css);
       loadScript(params.js, function() {
         map = new window.mapboxgl.Map({
-          accessToken: params.key,
+          accessToken: accessToken,
           logoPosition: 'bottom-left',
           container: mapEl.node(),
           style: activeStyle.url,
@@ -13761,6 +13771,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
   // This is the entry point for bundling mapshaper's web UI
 
+
   onload(function() {
     if (!GUI.browserIsSupported()) {
       El("#mshp-not-supported").show();