mapshaper 0.5.118 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.118",
+	"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/mapshaper-gui.js

@@ -2261,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({
@@ -4412,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.
@@ -5487,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);
     }
   }