mapshaper 0.6.105 → 0.6.107

package/README.md

@@ -80,6 +80,14 @@ npm run build     # bundle source code files
 npm link          # (optional) add global symlinks so scripts are available systemwide
 ```
 
+## Using mapshaper with Bun
+
+Mapshaper's command line tools can be run with [Bun](https://bun.sh/) as an alternative to Node.js. The simplest option is to use `bunx`, like this:
+
+```
+bunx mapshaper [commands]
+```
+
 ## Building and testing
 
 From the project directory, run `npm run build` to build both the cli and web UI modules.

package/mapshaper.js

@@ -3927,7 +3927,10 @@
 
   function getValueType(val) {
     var type = null;
-    if (utils.isString(val)) {
+    if (val === null || val === undefined) {
+      // optimization, when scanning columns containing mostly null values
+      type = null;
+    } else if (utils.isString(val)) {
       type = 'string';
     } else if (utils.isNumber(val)) {
       type = 'number';
@@ -19290,7 +19293,7 @@
 
   // symType: point, polygon, polyline, label
   function applyStyleAttributes(svgObj, symType, rec, filter) {
-    var fields = findPropertiesBySymbolGeom(Object.keys(rec || {}), symType);
+    var fields = findStylePropertiesBySymbolGeom(Object.keys(rec || {}), symType);
     for (var i=0, n=fields.length; i<n; i++) {
       if (filter && !filter(fields[i])) continue;
       setAttribute(svgObj, fields[i], rec[fields[i]]);
@@ -19318,7 +19321,7 @@
     return name in symbolPropertyTypes;
   }
 
-  function findPropertiesBySymbolGeom(fields, type) {
+  function findStylePropertiesBySymbolGeom(fields, type) {
     var index = propertiesBySymbolType[type] || {};
     return fields.filter(function(name) {
       return name in index;
@@ -19467,7 +19470,7 @@
   var SvgProperties = /*#__PURE__*/Object.freeze({
     __proto__: null,
     applyStyleAttributes: applyStyleAttributes,
-    findPropertiesBySymbolGeom: findPropertiesBySymbolGeom,
+    findStylePropertiesBySymbolGeom: findStylePropertiesBySymbolGeom,
     getSymbolDataAccessor: getSymbolDataAccessor,
     getSymbolPropertyAccessor: getSymbolPropertyAccessor,
     isSupportedSvgStyleProperty: isSupportedSvgStyleProperty,
@@ -46041,7 +46044,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.105";
+  var version = "0.6.107";
 
   // 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.
@@ -46095,7 +46098,7 @@ ${svg}
     }
     if (!loggingEnabled()) argv += ' -quiet'; // kludge to pass logging setting to subprocess
     var mb = Math.round(gb * 1000);
-    var command = [process.execPath, '--max-old-space-size=' + mb, mapshaperScript, argv].join(' ');
+    var command = [`"${process.execPath}"`, '--max-old-space-size=' + mb, `"${mapshaperScript}"`, argv].join(' ');
     var child = require$1('child_process').exec(command, {}, function(err, stdout, stderr) {
       opts.callback(err);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.105",
+  "version": "0.6.107",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -94,5 +94,8 @@
   "homepage": "https://github.com/mbloch/mapshaper#readme",
   "directories": {
     "test": "test"
+  },
+  "optionalDependencies": {
+    "@rollup/rollup-linux-x64-gnu": "^4.44.1"
   }
 }

package/www/elements.css

@@ -130,7 +130,8 @@ div.tip {
 
 .btn {
 	text-align: center;
-	padding: 4px 7px 5px 7px;
+	/* padding: 4px 7px 5px 7px; */
+	padding: 3px 6px 4px 6px;
 	border-radius: 4px;
 	line-height: 1;
 	display: inline-block;

package/www/index.html

@@ -76,7 +76,7 @@
 		<input type="text" value="label" class="clicktext" />
 	</div></div>
 	<div id="mode-buttons" class="page-header-buttons">
-		<span class="console-btn header-btn btn">Console</span><span class="basemap-btn header-btn btn">Basemap</span><span class="separator"></span><span class="separator"></span><span class="simplify-btn header-btn btn">Simplify</span><span class="separator"></span><span class="export-btn header-btn btn">Export</span>
+		<span class="console-btn header-btn btn">Console</span><span class="display-btn header-btn btn">Display</span><span class="separator"></span><span class="separator"></span><span class="simplify-btn header-btn btn">Simplify</span><span class="separator"></span><span class="export-btn header-btn btn">Export</span>
 	</div>
 	<div id="splash-buttons" class="page-header-buttons">
 		<a href="https://github.com/mbloch/mapshaper/wiki"><span id="wiki-btn" class="header-btn btn">Wiki</span></a><span class="separator"></span><a href="https://github.com/mbloch/mapshaper"><span id="github-btn" class="header-btn btn">GitHub</span></a>
@@ -174,23 +174,30 @@ precision=0.001. Click to see all options.</div></div></div></a>
 		<div><span id="save-preference" style="display: none;"><input type="checkbox"/>choose output directory</span></div>
 		<div><span id="save-to-clipboard" style="display: inline-block;"><input type="checkbox"/>save to clipboard</span></div>
 		</div>
-		<div id="export-btn" class="btn dialog-btn" style="margin-top: 4px;">Export</div>
+		<div id="export-btn" class="btn dialog-btn" style="margin-top: 5px;">Export</div>
 
 	</div>
 </div>
 
-<div class="basemap-options main-area popup-dialog">
+<div class="display-options main-area popup-dialog">
 	<div class="info-box">
 		<div class="close2-btn"></div>
-		<h3>Basemap options</h3>
-		<p class="basemap-note"></p>
-		<p class="basemap-warning"></p>
-		<div class="basemap-styles basemap-buttons"></div>
-		<div>
-			<!-- <div class="close-btn btn dialog-btn">Close</div> -->
-			<div class="clear-btn btn dialog-btn disabled">Clear</div>
-			<div class="fade-btn btn dialog-btn disabled">Fade</div>
-			<!-- <div class="hide-btn btn dialog-btn disabled">Hide</div> -->
+		<h3>Display options</h3>
+
+		<div class=""><label for="intersections-opt"><input type="checkbox" id="intersections-opt" class="checkbox intersections-opt"/>detect line intersections</label></div>
+		<div class=""><label for="ghost-opt"><input type="checkbox" id="ghost-opt" class="checkbox ghost-opt"/>show reference lines</label></div>
+
+		<div class="basemap-opts">
+			<h4>Basemaps</h4>
+			<p class="basemap-warning"></p>
+			<div class="basemap-styles basemap-buttons"></div>
+			<p class="basemap-note"></p>
+			<div>
+				<!-- <div class="close-btn btn dialog-btn">Close</div> -->
+				<div class="clear-btn btn dialog-btn disabled">Clear</div>
+				<div class="fade-btn btn dialog-btn disabled">Fade</div>
+				<!-- <div class="hide-btn btn dialog-btn disabled">Hide</div> -->
+			</div>
 		</div>
 	</div>
 </div>
@@ -295,8 +302,7 @@ encoding=big5</span>. Click to see all options.</div></div></div></div>
 	</div>
 	<div class="mshp-main-map main-area map-area">
 		<div class="intersection-display">
-			<span class="intersection-check text-btn colored-text">Check line intersections</span><span class="intersection-count">0 line intersections</span>
-			<img class="close-btn" draggable="false" src="images/close.png">
+			<span class="intersection-count">0 line intersections</span>
 			<div class="repair-btn text-btn colored-text">Repair</div>
 		</div>
 		<div class="basemap-overlay-buttons basemap-buttons"></div>