mapshaper 0.7.22 → 0.7.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.7.22",
+  "version": "0.7.24",
   "description": "A tool for editing geospatial data for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -52,7 +52,6 @@
     "@tmcw/togeojson": "^5.6.0",
     "@xmldom/xmldom": "^0.8.6",
     "adm-zip": "^0.5.9",
-    "big.js": "^7.0.1",
     "commander": "^14.0.3",
     "cookies": "^0.8.0",
     "d3-color": "3.1.0",
@@ -60,10 +59,9 @@
     "d3-scale-chromatic": "3.0.0",
     "delaunator": "^5.0.0",
     "fflate": "0.8.2",
-    "flatbush": "^3.2.1",
+    "flatbush": "^4.6.0",
     "flatgeobuf": "^4.3.4",
     "geographiclib-geodesic": "^2.2.0",
-    "geokdbush": "^1.1.0",
     "geotiff": "^3.0.5",
     "geotiff-geokeys-to-proj4": "^2024.4.13",
     "hyparquet": "^1.25.6",
@@ -74,7 +72,7 @@
     "jpeg-js": "^0.4.4",
     "kdbush": "^3.0.0",
     "mproj": "0.1.3",
-    "msgpackr": "^1.10.1",
+    "msgpackr": "^1.11.12",
     "open": "^11.0.0",
     "pngjs": "^7.0.0",
     "rw": "~1.3.3",
@@ -85,6 +83,7 @@
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
+    "big.js": "^7.0.1",
     "csv-spectrum": "^1.0.0",
     "eslint": "^8.16.0",
     "highlight.js": "^11.11.1",
@@ -117,6 +116,10 @@
     "test": "test"
   },
   "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.44.1"
+    "@rollup/rollup-linux-x64-gnu": "^4.44.1",
+    "better-sqlite3": "^12.10.0"
+  },
+  "overrides": {
+    "better-sqlite3": "^12.10.0"
   }
 }

package/www/geopackage.js

@@ -3033,6 +3033,9 @@
 			before.run();
 			try {
 				const result = apply.call(fn, this, arguments);
+				if (result && typeof result.then === 'function') {
+					throw new TypeError('Transaction function cannot return a promise');
+				}
 				after.run();
 				return result;
 			} catch (ex) {
@@ -4276,7 +4279,7 @@
 			}
 
 			// Make sure the specified directory exists
-			if (!anonymous && !fs.existsSync(path.dirname(filename))) {
+			if (!anonymous && !filename.startsWith('file:') && !fs.existsSync(path.dirname(filename))) {
 				throw new TypeError('Cannot open database because the directory does not exist');
 			}
 

package/www/index.html

@@ -344,29 +344,31 @@ encoding=big5</span>. Click to see all options.</div></div></div>
 
 <!-- TODO: remove #mshp-main-page without causing the map to jitter when resized -->
 <div id="mshp-main-page">
-
-	<div class="layer-control main-area layer-area sidebar-panel">
-		<div class="info-box">
-			<div class="info-box-scrolled">
-			<div class="layer-menu">
-				<div class="layer-add-links">
-					<span id="add-file-btn" class="layer-menu-link">Add files</span><span class="layer-menu-link-separator">&nbsp;&nbsp;·&nbsp;&nbsp;</span><span id="add-empty-btn" class="layer-menu-link">Add empty layer</span>
-				</div>
-				<div class="layer-item">
-					<h3>Layers</h3>
-					<div class="pin-all pinnable">
-						<img class="eye-btn black-eye" src="images/eye.png" alt="">
-						<img class="eye-btn green-eye" src="images/eye2.png" alt="">
+	<div class="main-area sidebar-panels">
+		<div class="layer-control layer-area sidebar-panel">
+			<div class="info-box">
+				<div class="info-box-scrolled">
+				<div class="layer-menu">
+					<div class="layer-add-links">
+						<span id="add-file-btn" class="layer-menu-link">Add files</span><span class="layer-menu-link-separator">&nbsp;&nbsp;·&nbsp;&nbsp;</span><span id="add-empty-btn" class="layer-menu-link">Add empty layer</span>
 					</div>
+					<div class="layer-item">
+						<h3>Layers</h3>
+						<div class="pin-all pinnable">
+							<img class="eye-btn black-eye" src="images/eye.png" alt="">
+							<img class="eye-btn green-eye" src="images/eye2.png" alt="">
+						</div>
+					</div>
+					<div class="layer-list"></div>
+					<div class="no-layer-note">No data has been added</div>
+				</div>
 				</div>
-				<div class="layer-list"></div>
-				<div class="no-layer-note">No data has been added</div>
-			</div>
 			</div>
 		</div>
-	</div>
-	<div class="console main-area console-area sidebar-panel">
-		<div class="console-window"><div class="console-buffer selectable"></div></div>
+		<div class="console console-area sidebar-panel">
+			<div class="sidebar-panels-resize-handle" role="separator" aria-orientation="horizontal" aria-label="Resize panels"></div>
+			<div class="console-window"><div class="console-buffer selectable"></div></div>
+		</div>
 	</div>
 	<div class="sidebar-resize-handle" role="separator" aria-orientation="vertical" aria-label="Resize sidebar"></div>
 	<div class="sidebar-tabs">

package/www/mapshaper-gui.js

@@ -9348,7 +9348,7 @@
     this.runCommand = function(str) {
       str = str.trim();
       if (!str) return;
-      gui.setSidebarPanel('console');
+      gui.toggleSidebarPanel('console');
       submit(str);
     };
 
@@ -9370,9 +9370,9 @@
     }
 
     gui.on('sidebar', function(e) {
-      if (e.name == 'console') {
+      if (e.panels.includes('console')) {
         turnOn();
-      } else if (e.prev == 'console') {
+      } else if (e.prev.includes('console')) {
         turnOff();
       }
     });
@@ -9431,6 +9431,7 @@
         // gui instances with the console open. E.g. console could close
         // when an instance loses focus.
         internal.setLoggingFunctions(consoleMessage, consoleError, consoleStop, consoleWarn);
+        el.addClass('open');
         el.show();
         input.node().focus();
         history = getHistory();
@@ -9444,6 +9445,7 @@
         if (GUI.isActiveInstance(gui)) {
           setLoggingForGUI(gui); // reset stop, message and error functions
         }
+        el.removeClass('open');
         el.hide();
         input.node().blur();
         saveHistory();
@@ -9506,7 +9508,7 @@
         if (gui.getMode()) {
           gui.clearMode(); // esc closes any open panels
         } else {
-          gui.setSidebarPanel(null);
+          gui.setSidebarPanels([]);
         }
         capture = true;
 
@@ -10916,7 +10918,7 @@
   function LayerControl(gui) {
     var model = gui.model;
     var map = gui.map;
-    var el = gui.container.findChild(".layer-control");
+    var el = gui.container.findChild(".layer-control").hide();
     var btn = gui.container.findChild('.layer-control-btn');
     var headerBtn = btn.findChild('.active-layer-label');
     var tab = gui.container.findChild('.layer-tab');
@@ -10959,9 +10961,9 @@
     }
 
     gui.on('sidebar', function(e) {
-      if (e.name == 'layers') {
+      if (e.panels.includes('layers')) {
         turnOn();
-      } else if (e.prev == 'layers') {
+      } else if (e.prev.includes('layers')) {
         turnOff();
       }
     });
@@ -11054,6 +11056,7 @@
       isOpen = true;
       tab.addClass('active').attr('aria-expanded', 'true');
       render();
+      el.addClass('open');
       el.show();
     }
 
@@ -11062,6 +11065,7 @@
       stopDragging();
       isOpen = false;
       tab.removeClass('active').attr('aria-expanded', 'false');
+      el.removeClass('open');
       el.hide();
     }
 
@@ -23691,9 +23695,10 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
 
     gui.state = {};
-    var sidebarPanel = null;
-    var lastSidebarPanel = 'console';
+    var sidebarPanels = [];
+    var lastSidebarPanels = ['console'];
     var sidebarWidth = GUI.getSavedValue('sidebar_width') || 0;
+    var sidebarPanelsSeparatorPosition = GUI.getSavedValue('sidebar_panels_separator_position') || 0;
     var sidebarResizeFrame = null;
 
     var msgCount = 0;
@@ -23744,45 +23749,53 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       setSidebarWidth(sidebarWidth);
     }
 
-    gui.getSidebarPanel = function() {
-      return sidebarPanel;
+    if (sidebarPanelsSeparatorPosition) {
+      setSidebarPanelsSeparatorPosition(sidebarPanelsSeparatorPosition);
+    }
+
+    gui.getSidebarPanels = function() {
+      return sidebarPanels;
     };
 
-    gui.setSidebarPanel = function(name) {
-      var prev = sidebarPanel;
-      sidebarPanel = name || null;
-      if (sidebarPanel && gui.getMode()) {
+    gui.setSidebarPanels = function(panels) {
+      var prev = sidebarPanels;
+      sidebarPanels = panels || [];
+      if (sidebarPanels.length && gui.getMode()) {
         gui.clearMode();
       }
-      if (sidebarPanel == prev) return;
-      if (sidebarPanel) {
-        lastSidebarPanel = sidebarPanel;
+      if (sidebarPanels.join('|') === prev.join('|')) return;
+      if (sidebarPanels.length) {
+        lastSidebarPanels = sidebarPanels;
       }
       gui.container
-        .classed('sidebar-open', !!sidebarPanel)
-        .classed('layers-open', sidebarPanel == 'layers')
-        .classed('console-open', sidebarPanel == 'console');
-      gui.dispatchEvent('sidebar', {name: sidebarPanel, prev: prev});
-      gui.dispatchEvent('resize', {source: 'sidebar'});
+        .classed('sidebar-open', sidebarPanels.length > 0)
+        .classed('layers-open', sidebarPanels.includes('layers'))
+        .classed('console-open', sidebarPanels.includes('console'));
+      gui.dispatchEvent('sidebar', {panels: sidebarPanels, prev: prev});
+      gui.dispatchEvent('resize');
     };
 
     gui.toggleSidebarPanel = function(name) {
-      gui.setSidebarPanel(sidebarPanel == name ? null : name);
+      gui.setSidebarPanels(sidebarPanels.includes(name)
+        ? sidebarPanels.filter((n) => n !== name)
+        : [...sidebarPanels, name].sort()
+      );
     };
 
     gui.toggleSidebar = function() {
-      gui.setSidebarPanel(sidebarPanel ? null : lastSidebarPanel);
+      gui.setSidebarPanels(sidebarPanels.length ? null : lastSidebarPanels);
     };
 
     gui.sidebarPanelIsOpen = function() {
-      return !!sidebarPanel;
+      return sidebarPanels.length > 0;
     };
 
     gui.consoleIsOpen = function() {
-      return sidebarPanel == 'console';
+      return sidebarPanels.includes('console');
     };
 
     initSidebarResizing();
+    initSidebarPanelsResizing();
 
     gui.getRuntimeStateContext = function() {
       return getRuntimeStateContext(gui);
@@ -23869,6 +23882,40 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
         gui.dispatchEvent('resize', {source: 'sidebar-resize'});
       });
     }
+
+    function initSidebarPanelsResizing() {
+      var handle = gui.container.findChild('.sidebar-panels-resize-handle');
+      if (!handle) return;
+      handle.on('mousedown', function(e) {
+        if (!gui.sidebarPanelIsOpen()) return;
+        e.preventDefault();
+        e.stopPropagation();
+        gui.container.addClass('sidebar-panels-resizing');
+        window.addEventListener('mousemove', onMove);
+        window.addEventListener('mouseup', onRelease);
+      });
+
+      function onMove(e) {
+        sidebarPanelsSeparatorPosition = clampSidebarPanelsSeparatorPosition(e.pageY);
+        setSidebarPanelsSeparatorPosition(sidebarPanelsSeparatorPosition);
+      }
+
+      function onRelease() {
+        window.removeEventListener('mousemove', onMove);
+        window.removeEventListener('mouseup', onRelease);
+        gui.container.removeClass('sidebar-panels-resizing');
+        GUI.setSavedValue('sidebar_panels_separator_position', sidebarPanelsSeparatorPosition);
+      }
+    }
+
+    function setSidebarPanelsSeparatorPosition(sidebarPanelsSeparatorPosition) {
+      gui.container.node().style.setProperty('--sidebar-panels-separator-position', sidebarPanelsSeparatorPosition + '%');
+    }
+
+    function clampSidebarPanelsSeparatorPosition(pageY) {
+      var pct = 100 * (pageY - 29) / (window.innerHeight - 29);
+      return Math.max(15, Math.min(85, pct));
+    }
   }
 
   function createUndoTestApi(gui) {