mapshaper 0.5.116 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.116",
+	"version": "0.6.0",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -9,6 +9,7 @@
 		"cartography",
 		"simplification",
 		"topology",
+    "csv",
 		"gis"
 	],
 	"author": "Matthew Bloch <masiyou@gmail.com>",
@@ -19,16 +20,14 @@
 		"url": "https://github.com/mbloch/mapshaper"
 	},
 	"engines": {
-		"node": ">=6.0.0"
+		"node": ">=12.0.0"
 	},
 	"scripts": {
-		"test": "mocha -r esm --parallel --jobs 4 --check-leaks -R dot",
+		"test": "mocha test",
 		"build": "rollup --config",
 		"prepublishOnly": "npm test; ./pre-publish",
 		"postpublish": "./release_web_ui; ./release_github_version",
-		"browserify_old": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r d3-scale-chromatic -r d3-color -r d3-interpolate -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 d3-scale-chromatic -r d3-color -r d3-interpolate -r kdbush -r @tmcw/togeojson -o www/modules.js",
-		"watch": "rollup --config --watch",
+		"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 -o www/modules.js",
 		"dev": "rollup --config --watch"
 	},
 	"main": "./mapshaper.js",
@@ -50,7 +49,7 @@
 		"delaunator": "^5.0.0",
 		"flatbush": "^3.2.1",
 		"geokdbush": "^1.1.0",
-		"iconv-lite": "0.4.24",
+		"iconv-lite": "^0.6.3",
 		"kdbush": "^3.0.0",
 		"mproj": "0.0.35",
 		"opn": "^5.3.0",
@@ -59,16 +58,22 @@
 		"tinyqueue": "^2.0.3"
 	},
 	"devDependencies": {
-		"@rollup/plugin-node-resolve": "^13.0.6",
+		"@rollup/plugin-node-resolve": "^13.3.0",
 		"browserify": "^17.0.0",
 		"csv-spectrum": "^1.0.0",
-		"deep-eql": ">=0.1.3",
-		"esm": "^3.2.25",
-		"mocha": "^8.4.0",
-		"rollup": "^2.60.0",
+		"mocha": "^10.0.0",
+		"rollup": "^2.73.0",
 		"shell-quote": "^1.6.1",
 		"underscore": "^1.13.1"
 	},
+	"mocha": {
+		"reporter": "dot",
+		"node-option": [
+			"experimental-specifier-resolution=node"
+		],
+		"parallel": true,
+		"jobs": 4
+	},
 	"bin": {
 		"mapshaper": "./bin/mapshaper",
 		"mapshaper-gui": "./bin/mapshaper-gui",

package/www/elements.css

@@ -67,10 +67,10 @@ div.tip {
 	z-index: 500;
 	cursor: pointer;
 	text-align: center;
-	font-size: 13px;
+	font-size: 14px;
 	line-height: 1;
 	font-weight: normal;
-	color: #799FCB;
+	color: #1385B7;
 }
 
 .tip-button .tip-anchor {

package/www/index.html

@@ -130,7 +130,8 @@
 
 <div class="export-options main-area popup-dialog">
 	<div class="info-box">
-		<h3>Export menu</h3>
+		<div class="close2-btn"></div>
+		<h3>Export options</h3>
 		<div style="height:3px"></div>
 		<div class=export-layers>
 			<h4 class="menu-title">Layers</h4>
@@ -140,22 +141,23 @@
 		<div class="export-formats option-menu">
 		</div>
 
-		<div class="option-menu"><input type="text" class="advanced-options" placeholder="export options" /><div class="tip-button">?<div class="tip-anchor">
+		<div class="option-menu"><input type="text" class="advanced-options" placeholder="command line options" /><div class="tip-button">?<div class="tip-anchor">
 		<div class="tip">Enter options from the command line interface for the -o command. Examples: "bbox" "no-quantization"
 "precision=0.001"</div></div></div></div>
-		<div class="cancel-btn btn dialog-btn">Cancel</div>
+		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
 		<div class="save-btn btn dialog-btn">Export</div>
 	</div>
 </div>
 
 <div class="basemap-options main-area popup-dialog">
 	<div class="info-box">
+		<div class="close2-btn"></div>
 		<h3>Basemap options</h3>
 		<p class="basemap-note">Your data will be displayed using the Mercator projection.</p>
 		<p class="basemap-warning"></p>
 		<div class="basemap-styles"></div>
 		<div>
-			<div class="close-btn btn dialog-btn">Close</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> -->
@@ -165,7 +167,8 @@
 
 <div class="simplify-options main-area popup-dialog">
 	<div class="info-box">
-		<h3>Simplification menu</h3>
+		<div class="close2-btn"></div>
+		<h3>Simplification</h3>
 		<div class="option-menu">
 			<div><label for="import-retain-opt"><input type="checkbox" class="checkbox import-retain-opt"/>prevent shape removal</label>
 							<div class="tip-button">?<div class="tip-anchor">
@@ -208,7 +211,7 @@ a smoother appearance.</div></div></div></div>
 		</div> <!-- option menu -->
 
 		<div>
-			<div class="cancel-btn btn dialog-btn">Cancel</div>
+<!-- 			<div class="cancel-btn btn dialog-btn">Cancel</div> -->
 			<div class="submit-btn btn dialog-btn">Apply</div>
 		</div>
 	</div> <!-- .info-box -->

package/www/mapshaper-gui.js

@@ -310,7 +310,6 @@
 
   // tests if filename is a type that can be used
   GUI.isReadableFileType = function(filename) {
-    var ext = internal.getFileExtension(filename).toLowerCase();
     return !!internal.guessInputFileType(filename) || internal.couldBeDsvFile(filename) ||
       internal.isZipFile(filename);
   };
@@ -1354,7 +1353,6 @@
         }
       }
       model.updated({select: true});
-
     }
 
     function clearQueuedFiles() {
@@ -1451,9 +1449,8 @@
     }
 
 
-    // TODO: support .cpg
     function isShapefilePart(name) {
-      return /\.(shp|shx|dbf|prj)$/i.test(name);
+      return /\.(shp|shx|dbf|prj|cpg)$/i.test(name);
     }
 
     function readImportOpts() {
@@ -2131,7 +2128,7 @@
 
     // init settings menu
     new SimpleButton(menu.findChild('.submit-btn').addClass('default-btn')).on('click', onSubmit);
-    new SimpleButton(menu.findChild('.cancel-btn')).on('click', function() {
+    new SimpleButton(menu.findChild('.close2-btn')).on('click', function() {
       if (el.visible()) {
         // cancel just hides menu if slider is visible
         menu.hide();
@@ -2264,7 +2261,7 @@
       menu.hide();
       setTimeout(function() {
         var opts = getSimplifyOptions();
-        mapshaper.simplify(dataset, opts);
+        mapshaper.cmd.simplify(dataset, opts);
         gui.session.simplificationApplied(getSimplifyOptionsAsString());
         updateZ(gui.map.getActiveLayer()); // question: does this update all display layers?
         model.updated({
@@ -3159,7 +3156,7 @@
     var layersArr = [];
     var toggleBtn = null; // checkbox <input> for toggling layer selection
     var exportBtn = gui.container.findChild('.export-btn');
-    new SimpleButton(menu.findChild('.cancel-btn')).on('click', gui.clearMode);
+    new SimpleButton(menu.findChild('.close2-btn')).on('click', gui.clearMode);
 
     if (!GUI.exportIsSupported()) {
       exportBtn.on('click', function() {
@@ -4415,7 +4412,8 @@
     return self;
   }
 
-  var Buffer = require('buffer').Buffer; // works with browserify
+  // Fall back to browserify's Buffer polyfill
+  var B = typeof Buffer != 'undefined' ? Buffer : require('buffer').Buffer;
 
   // This module provides a way for multiple jobs to run together asynchronously
   // while keeping job-level context variables (like "defs") separate.
@@ -5490,10 +5488,10 @@
 
   function createBuffer(arg, arg2) {
     if (isInteger(arg)) {
-      return Buffer.allocUnsafe ? Buffer.allocUnsafe(arg) : new Buffer(arg);
+      return B.allocUnsafe ? B.allocUnsafe(arg) : new B(arg);
     } else {
       // check allocUnsafe to make sure Buffer.from() will accept strings (it didn't before Node v5.10)
-      return Buffer.from && Buffer.allocUnsafe ? Buffer.from(arg, arg2) : new Buffer(arg, arg2);
+      return B.from && B.allocUnsafe ? B.from(arg, arg2) : new B(arg, arg2);
     }
   }
 
@@ -9764,7 +9762,7 @@
     var menu = gui.container.findChild('.basemap-options');
     // var hideBtn = new SimpleButton(menu.findChild('.hide-btn'));
     var fadeBtn = new SimpleButton(menu.findChild('.fade-btn'));
-    var closeBtn = new SimpleButton(menu.findChild('.close-btn'));
+    var closeBtn = new SimpleButton(menu.findChild('.close2-btn'));
     var clearBtn = new SimpleButton(menu.findChild('.clear-btn'));
     var list = menu.findChild('.basemap-styles');
     var container = gui.container.findChild('.basemap-container');