mapshaper 0.6.17 → 0.6.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -28,7 +28,7 @@
     "lint": "eslint --ext mjs src/",
     "prepublishOnly": "npm lint; npm test; ./pre-publish",
     "postpublish": "./release_web_ui; ./release_github_version",
-    "browserify": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r kdbush -r @tmcw/togeojson -r @placemarkio/tokml -r bson -o www/modules.js",
+    "browserify": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r kdbush -r @tmcw/togeojson -r @placemarkio/tokml -o www/modules.js",
     "dev": "rollup --config --watch"
   },
   "main": "./mapshaper.js",
@@ -40,6 +40,7 @@
     "!.DS_Store"
   ],
   "dependencies": {
+    "@msgpack/msgpack": "^2.8.0",
     "@placemarkio/tokml": "^0.3.3",
     "@tmcw/togeojson": "^5.6.0",
     "@xmldom/xmldom": "^0.8.6",

package/www/mapshaper-gui.js

@@ -3247,15 +3247,15 @@
   function updateLayerStackOrder(layers) {
     // 1. assign ascending ids to unassigned layers above the range of other layers
     layers.forEach(function(o, i) {
-      if (!o.layer.stack_id) o.layer.stack_id = 1e6 + i;
+      if (!o.layer.menu_order) o.layer.menu_order = 1e6 + i;
     });
     // 2. sort in ascending order
     layers.sort(function(a, b) {
-      return a.layer.stack_id - b.layer.stack_id;
+      return a.layer.menu_order - b.layer.menu_order;
     });
     // 3. assign consecutve ids
     layers.forEach(function(o, i) {
-      o.layer.stack_id = i + 1;
+      o.layer.menu_order = i + 1;
     });
     return layers;
   }
@@ -3535,8 +3535,8 @@
   }
 
   function LayerControl(gui) {
-    var map = gui.map;
     var model = gui.model;
+    var map = gui.map;
     var el = gui.container.findChild(".layer-control").on('click', GUI.handleDirectEvent(gui.clearMode));
     var btn = gui.container.findChild('.layer-control-btn');
     var isOpen = false;
@@ -3617,7 +3617,7 @@
       var dropLyr = findLayerById(dropId);
       var slug;
       if (dragId == dropId) return;
-      dragLyr.layer.stack_id = dropLyr.layer.stack_id + (above ? 0.5 : -0.5);
+      dragLyr.layer.menu_order = dropLyr.layer.menu_order + (above ? 0.5 : -0.5);
       slug = getLayerOrderSlug();
       if (slug != layerOrderSlug) {
         layerOrderSlug = slug;
@@ -10732,8 +10732,8 @@
 
     function sortMapLayers(layers) {
       layers.sort(function(a, b) {
-        // assume that each layer has a stack_id (assigned by updateLayerStackOrder())
-        return a.source.layer.stack_id - b.source.layer.stack_id;
+        // assume that each layer has a menu_order (assigned by updateLayerStackOrder())
+        return a.source.layer.menu_order - b.source.layer.menu_order;
       });
     }
 
@@ -10760,7 +10760,7 @@
         _ext.setFrame(isPreviewView() ? getFrameData() : null);
         _ext.setFullBounds(getFullBounds(), getStrictBounds());
         updateLayerStyles(contentLayers);
-        updateLayerStackOrder(model.getLayers());// update stack_id property of all layers
+        updateLayerStackOrder(model.getLayers());// update menu_order property of all layers
       }
       sortMapLayers(contentLayers);
       if (_intersectionLyr) {