mapshaper 0.6.30 → 0.6.32

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.30";
+  var VERSION = "0.6.32";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -24840,13 +24840,12 @@ ${svg}
 
     parser.command('run')
       .describe('create commands on-the-fly and run them')
-      .option('include', {
-        // TODO: remove this option
-      })
-      .option('commands', {
+      .option('expression', {
         DEFAULT: true,
-        describe: 'command string or JS expresson to generate command(s)'
+        describe: 'JS expression to generate command(s)'
       })
+      // deprecated
+      .option('commands', {alias_to: 'expression'})
       .option('target', targetOpt);
 
     parser.command('scalebar')
@@ -34730,7 +34729,64 @@ ${svg}
     };
   }
 
-  cmd.define = function(opts) {
+  function compileIfCommandExpression(expr, catalog, opts) {
+    return compileLayerExpression(expr, catalog, opts);
+  }
+
+
+  function compileLayerExpression(expr, catalog, opts) {
+    var targetId = opts.layer || opts.target || null;
+    var targets = catalog.findCommandTargets(targetId);
+    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
+    if (targets.length === 0 && targetId) {
+      stop('Layer not found:', targetId);
+    }
+    // var vars = getAssignedVars(exp);
+    var defs = getStashedVar('defs') || {};
+
+    var ctx;
+    if (isSingle) {
+      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
+    } else {
+      ctx = getNullLayerProxy(targets);
+    }
+    ctx.global = defs; // TODO: remove duplication with mapshaper.expressions.mjs
+    var exprOpts = Object.assign({returns: true}, opts);
+    var func = compileExpressionToFunction(expr, exprOpts);
+
+    // @geoType: optional geometry type (polygon, polyline, point, null);
+    ctx.layer_exists = function(name, geoType) {
+      try {
+        var targets = catalog.findCommandTargets(name, geoType);
+        if (targets.length > 0) return true;
+      } catch(e) {}
+      return false;
+    };
+
+    ctx.file_exists = function(file) {
+      return cli.isFile(file);
+    };
+
+    return function() {
+      try {
+        return func.call(ctx, defs, ctx);
+      } catch(e) {
+        // if (opts.quiet) throw e;
+        stop(e.name, "in expression [" + expr + "]:", e.message);
+      }
+    };
+  }
+
+  /*
+  cmd.define_v2 = function(catalog, opts) {
+    if (!opts.expression) {
+      stop('Missing an assignment expression');
+    }
+    compileLayerExpression(opts.expression, catalog, opts)();
+  };
+  */
+
+  cmd.define = function(catalog, opts) {
     if (!opts.expression) {
       stop('Missing an assignment expression');
     }
@@ -38418,46 +38474,6 @@ ${svg}
     return job.control || (job.control = {});
   }
 
-  function compileIfCommandExpression(expr, catalog, opts) {
-    var targetId = opts.layer || opts.target || null;
-    var targets = catalog.findCommandTargets(targetId);
-    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
-    if (targets.length === 0 && targetId) {
-      stop('Layer not found:', targetId);
-    }
-    var ctx;
-    if (isSingle) {
-      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
-    } else {
-      ctx = getNullLayerProxy(targets);
-    }
-    ctx.global = getStashedVar('defs') || {}; // TODO: remove duplication with mapshaper.expressions.mjs
-    var exprOpts = Object.assign({returns: true}, opts);
-    var func = compileExpressionToFunction(expr, exprOpts);
-
-    // @geoType: optional geometry type (polygon, polyline, point, null);
-    ctx.layer_exists = function(name, geoType) {
-      try {
-        var targets = catalog.findCommandTargets(name, geoType);
-        if (targets.length > 0) return true;
-      } catch(e) {}
-      return false;
-    };
-
-    ctx.file_exists = function(file) {
-      return cli.isFile(file);
-    };
-
-    return function() {
-      try {
-        return func.call(ctx, {}, ctx);
-      } catch(e) {
-        // if (opts.quiet) throw e;
-        stop(e.name, "in expression [" + expr + "]:", e.message);
-      }
-    };
-  }
-
   function skipCommand(cmdName, job) {
     // allow all control commands to run
     if (jobIsStopped(job)) return true;
@@ -40914,13 +40930,10 @@ ${svg}
 
   cmd.run = function(job, targets, opts, cb) {
     var commandStr, commands;
-    if (opts.include) {
-      cmd.include({file: opts.include});
-    }
-    if (!opts.commands) {
-      stop("Missing commands parameter");
+    if (!opts.expression) {
+      stop("Missing expression parameter");
     }
-    commandStr = runGlobalExpression(opts.commands, targets);
+    commandStr = runGlobalExpression(opts.expression, targets);
     if (commandStr) {
       commands = parseCommands(commandStr);
       runParsedCommands(commands, job, cb);
@@ -40937,6 +40950,8 @@ ${svg}
       targetData = getRunCommandData(targets[0]);
       Object.defineProperty(ctx, 'target', {value: targetData});
     }
+    // Add defined functions and data to the expression context
+    // (Such as functions imported via the -require command)
     utils.extend(ctx, getStashedVar('defs'));
     try {
       output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
@@ -43220,7 +43235,7 @@ ${svg}
         applyCommandToEachLayer(cmd.dashlines, targetLayers, targetDataset, opts);
 
       } else if (name == 'define') {
-        cmd.define(opts);
+        cmd.define(job.catalog, opts);
 
       } else if (name == 'dissolve') {
         outputLayers = applyCommandToEachLayer(cmd.dissolve, targetLayers, arcs, opts);
@@ -43648,7 +43663,6 @@ ${svg}
 
   // Unified function for processing calls to runCommands() and applyCommands()
   function _runCommands(argv, opts, callback) {
-
     var outputArr = opts.output || null,
         inputObj = opts.input,
         commands;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.30",
+  "version": "0.6.32",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -56,7 +56,7 @@
     "iconv-lite": "^0.6.3",
     "idb-keyval": "^6.2.0",
     "kdbush": "^3.0.0",
-    "mproj": "0.0.36",
+    "mproj": "0.0.37",
     "msgpackr": "^1.8.5",
     "opn": "^5.3.0",
     "rw": "~1.3.3",

package/www/index.html

@@ -100,7 +100,8 @@
 				<img class="pin-btn pinned" src="images/eye2.png">
 	</div>
 			<div class="layer-list"></div>
-			<h4>Sources</h4>
+			<!-- <h4>Sources</h4> -->
+			<h4>Source files</h4>
 			<div class="file-list"></div>
 			<div>
 				<div id="add-file-btn" class="dialog-btn btn">Add a file</div>
@@ -153,9 +154,14 @@
 		<div class="export-formats option-menu">
 		</div>
 
-		<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="option-menu"><input type="text" class="advanced-options" placeholder="command line options" />
+		<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-o-output" target="_mapshaper_output_docs">
+			<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. Click to see all options.</div></div></div></a>
+
+</div>
 		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
 		<div class="save-btn btn dialog-btn">Export</div>
 		<span id="save-preference"><input type="checkbox"/>choose directory</span>
@@ -192,8 +198,8 @@ the largest ring of multi-ring features.
 </div></div></div></div>
 			<div class="planar-opt-wrapper"><label for="planar-opt"><input type="checkbox" class="checkbox planar-opt"/>use planar geometry</label>
 							<div class="tip-button">?<div class="tip-anchor">
-			<div class="tip">Interpret x, y values as Cartesian coordinates
-on a plane, rather than longitude, latitude
+			<div class="tip">Treat x, y values as Cartesian coordinates
+on a plane, rather than as longitude, latitude
 coordinates on a sphere.
 </div></div></div></div>
 		</div>
@@ -256,7 +262,7 @@ a smoother appearance.</div></div></div></div>
 
 <div id="import-options" class="main-area popup-dialog">
 	<div class="info-box">
-		<!-- <h4>Queued files</h4> -->
+		<h3 class="list-header">Files</h3>
 
 		<div class="dropped-file-list"></div>
 		
@@ -272,20 +278,23 @@ a smoother appearance.</div></div></div></div>
 self-intersections, to help identify
 topological errors in a dataset.</div></div></div></div>
 
-				<div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
+				<!-- <div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
 				<div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Fix topology errors by snapping
 together points with nearly identical
 coordinates. This option does not
-apply to TopoJSON files.</div></div></div></div>
+apply to TopoJSON files.</div></div></div></div> -->
 <div style="height:5px"></div>
 
 		</div>
 
-		<div><input type="text" class="advanced-options" placeholder="import options" /><div class="tip-button">?<div class="tip-anchor">
+		<div><input type="text" class="advanced-options" placeholder="import options" />
+			<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-i-input" target="_mapshaper_import_docs">
+			<div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Enter options from the command line
-interface. Examples: "no-topology"
-"encoding=big5"</div></div></div></div>
+interface. Examples: <span id="import-option-examples">snap no-topology
+encoding=big5</span>. Click to see all options.</div></div></div></div>
+		</a>
 
 		</div>
 

package/www/mapshaper-gui.js

@@ -1834,6 +1834,7 @@
     var importCount = 0;
     var importTotal = 0;
     var overQuickView = false;
+    var useQuickView = false;
     var queuedFiles = [];
     var manifestFiles = opts.files || [];
     var catalog;
@@ -1863,21 +1864,17 @@
       }
     });
 
-    function useQuickView() {
-      return initialImport && (opts.quick_view || overQuickView);
-    }
-
     function initDropArea(el, isQuick) {
       var area = El(el)
         .on('dragleave', onout)
-        .on('dragover', onover)
+        .on('dragover', function() {overQuickView = !!isQuick; onover();})
         .on('mouseover', onover)
         .on('mouseout', onout);
 
       function onover() {
-        overQuickView = !!isQuick;
         area.addClass('dragover');
       }
+
       function onout() {
         overQuickView = false;
         area.removeClass('dragover');
@@ -1959,7 +1956,21 @@
     function showQueuedFiles() {
       var list = gui.container.findChild('.dropped-file-list').empty();
       queuedFiles.forEach(function(f) {
-        El('<p>').text(f.name).appendTo(list);
+        var html = '<span>' + f.name + '</span><img class="close-btn" draggable="false" src="images/close.png">';
+        var entry = El('<div>').html(html);
+        entry.appendTo(list);
+        // init delete button
+        GUI.onClick(entry.findChild('img.close-btn'), function(e) {
+          e.stopPropagation();
+          queuedFiles = queuedFiles.filter(function(item) {
+            return item != f;
+          });
+          if (queuedFiles.length > 0) {
+            showQueuedFiles();
+          } else {
+            gui.clearMode();
+          }
+        });
       });
     }
 
@@ -1967,6 +1978,7 @@
       var names = getFileNames(files);
       var expanded = [];
       if (files.length === 0) return;
+      useQuickView = importCount === 0 && (opts.quick_view || overQuickView);
       try {
         expanded = await expandFiles(files);
       } catch(e) {
@@ -1981,7 +1993,7 @@
         return;
       }
       gui.enterMode('import');
-      if (useQuickView()) {
+      if (useQuickView) {
         await importQueuedFiles();
       } else {
         gui.container.addClass('queued-files');
@@ -2077,13 +2089,13 @@
 
     function readImportOpts() {
       var importOpts;
-      if (useQuickView()) {
+      if (useQuickView) {
         importOpts = {}; // default opts using quickview
       } else {
         var freeform = El('#import-options .advanced-options').node().value;
         importOpts = GUI.parseFreeformOptions(freeform, 'i');
         importOpts.no_repair = !El("#repair-intersections-opt").node().checked;
-        importOpts.snap = !!El("#snap-points-opt").node().checked;
+        // importOpts.snap = !!El("#snap-points-opt").node().checked;
       }
       return importOpts;
     }

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.30";
+  var VERSION = "0.6.32";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -24840,13 +24840,12 @@ ${svg}
 
     parser.command('run')
       .describe('create commands on-the-fly and run them')
-      .option('include', {
-        // TODO: remove this option
-      })
-      .option('commands', {
+      .option('expression', {
         DEFAULT: true,
-        describe: 'command string or JS expresson to generate command(s)'
+        describe: 'JS expression to generate command(s)'
       })
+      // deprecated
+      .option('commands', {alias_to: 'expression'})
       .option('target', targetOpt);
 
     parser.command('scalebar')
@@ -34730,7 +34729,64 @@ ${svg}
     };
   }
 
-  cmd.define = function(opts) {
+  function compileIfCommandExpression(expr, catalog, opts) {
+    return compileLayerExpression(expr, catalog, opts);
+  }
+
+
+  function compileLayerExpression(expr, catalog, opts) {
+    var targetId = opts.layer || opts.target || null;
+    var targets = catalog.findCommandTargets(targetId);
+    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
+    if (targets.length === 0 && targetId) {
+      stop('Layer not found:', targetId);
+    }
+    // var vars = getAssignedVars(exp);
+    var defs = getStashedVar('defs') || {};
+
+    var ctx;
+    if (isSingle) {
+      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
+    } else {
+      ctx = getNullLayerProxy(targets);
+    }
+    ctx.global = defs; // TODO: remove duplication with mapshaper.expressions.mjs
+    var exprOpts = Object.assign({returns: true}, opts);
+    var func = compileExpressionToFunction(expr, exprOpts);
+
+    // @geoType: optional geometry type (polygon, polyline, point, null);
+    ctx.layer_exists = function(name, geoType) {
+      try {
+        var targets = catalog.findCommandTargets(name, geoType);
+        if (targets.length > 0) return true;
+      } catch(e) {}
+      return false;
+    };
+
+    ctx.file_exists = function(file) {
+      return cli.isFile(file);
+    };
+
+    return function() {
+      try {
+        return func.call(ctx, defs, ctx);
+      } catch(e) {
+        // if (opts.quiet) throw e;
+        stop(e.name, "in expression [" + expr + "]:", e.message);
+      }
+    };
+  }
+
+  /*
+  cmd.define_v2 = function(catalog, opts) {
+    if (!opts.expression) {
+      stop('Missing an assignment expression');
+    }
+    compileLayerExpression(opts.expression, catalog, opts)();
+  };
+  */
+
+  cmd.define = function(catalog, opts) {
     if (!opts.expression) {
       stop('Missing an assignment expression');
     }
@@ -38418,46 +38474,6 @@ ${svg}
     return job.control || (job.control = {});
   }
 
-  function compileIfCommandExpression(expr, catalog, opts) {
-    var targetId = opts.layer || opts.target || null;
-    var targets = catalog.findCommandTargets(targetId);
-    var isSingle = targets.length == 1 && targets[0].layers.length == 1;
-    if (targets.length === 0 && targetId) {
-      stop('Layer not found:', targetId);
-    }
-    var ctx;
-    if (isSingle) {
-      ctx = getLayerProxy(targets[0].layers[0], targets[0].dataset.arcs);
-    } else {
-      ctx = getNullLayerProxy(targets);
-    }
-    ctx.global = getStashedVar('defs') || {}; // TODO: remove duplication with mapshaper.expressions.mjs
-    var exprOpts = Object.assign({returns: true}, opts);
-    var func = compileExpressionToFunction(expr, exprOpts);
-
-    // @geoType: optional geometry type (polygon, polyline, point, null);
-    ctx.layer_exists = function(name, geoType) {
-      try {
-        var targets = catalog.findCommandTargets(name, geoType);
-        if (targets.length > 0) return true;
-      } catch(e) {}
-      return false;
-    };
-
-    ctx.file_exists = function(file) {
-      return cli.isFile(file);
-    };
-
-    return function() {
-      try {
-        return func.call(ctx, {}, ctx);
-      } catch(e) {
-        // if (opts.quiet) throw e;
-        stop(e.name, "in expression [" + expr + "]:", e.message);
-      }
-    };
-  }
-
   function skipCommand(cmdName, job) {
     // allow all control commands to run
     if (jobIsStopped(job)) return true;
@@ -40914,13 +40930,10 @@ ${svg}
 
   cmd.run = function(job, targets, opts, cb) {
     var commandStr, commands;
-    if (opts.include) {
-      cmd.include({file: opts.include});
-    }
-    if (!opts.commands) {
-      stop("Missing commands parameter");
+    if (!opts.expression) {
+      stop("Missing expression parameter");
     }
-    commandStr = runGlobalExpression(opts.commands, targets);
+    commandStr = runGlobalExpression(opts.expression, targets);
     if (commandStr) {
       commands = parseCommands(commandStr);
       runParsedCommands(commands, job, cb);
@@ -40937,6 +40950,8 @@ ${svg}
       targetData = getRunCommandData(targets[0]);
       Object.defineProperty(ctx, 'target', {value: targetData});
     }
+    // Add defined functions and data to the expression context
+    // (Such as functions imported via the -require command)
     utils.extend(ctx, getStashedVar('defs'));
     try {
       output = Function('ctx', 'with(ctx) {return (' + expression + ');}').call({}, ctx);
@@ -43220,7 +43235,7 @@ ${svg}
         applyCommandToEachLayer(cmd.dashlines, targetLayers, targetDataset, opts);
 
       } else if (name == 'define') {
-        cmd.define(opts);
+        cmd.define(job.catalog, opts);
 
       } else if (name == 'dissolve') {
         outputLayers = applyCommandToEachLayer(cmd.dissolve, targetLayers, arcs, opts);
@@ -43648,7 +43663,6 @@ ${svg}
 
   // Unified function for processing calls to runCommands() and applyCommands()
   function _runCommands(argv, opts, callback) {
-
     var outputArr = opts.output || null,
         inputObj = opts.input,
         commands;

package/www/modules.js

@@ -12530,7 +12530,10 @@ function wkt_unpack(str) {
   str = convert_wkt_quotes(str);
 
   // Convert WKT entities to JSON arrays
-  str = str.replace(/([A-Z0-9]+)\[/g, '["$1",');
+  // str = str.replace(/([A-Z0-9]+)\[/g, '["$1",');
+  // Changed to ignore some names that look like entities, like "GCS_TWD97[2020]"
+  // allow only [ or , character before the next quote (i.e. block close quotes)
+  str = str.replace(/([A-Z0-9]+)\[(?![^"]*[^\[,"]")/g, '["$1",');
 
   // Enclose axis keywords in quotes to create valid JSON strings
   str = str.replace(/, *([a-zA-Z]+) *(?=[,\]])/g, ',"$1"');

package/www/page.css

@@ -472,6 +472,25 @@ body.dragover #import-options-drop-area .drop-area {
 	overflow-y: auto;
 }
 
+.dropped-file-list img.close-btn {
+	position: absolute;
+	cursor: pointer;
+	width: 14px;
+	height: 14px;
+	padding: 0;
+	top: 3px;
+	right: 0px;
+}
+
+.dropped-file-list > div {
+	position: relative;
+}
+
+.dropped-file-list span {
+	margin-right: 16px;
+}
+
+
 #import-options .dropped-file-list p {
 	line-height: 1;
 	margin-bottom: 5px;
@@ -498,7 +517,7 @@ body.dragover #import-options-drop-area .drop-area {
 	text-align: left;
 	margin-top: 12px;
 	margin-right: 20px;
-	padding: 12px 18px 12px 18px;
+	padding: 12px 16px 12px 18px;
 	vertical-align: top;
 	display: inline-block;
 	/* border: 1px solid #aaa; */
@@ -512,6 +531,10 @@ body.dragover #import-options-drop-area .drop-area {
 	font-weight: normal;
 }
 
+.info-box h3.list-header {
+	margin-bottom: 0.1em;
+}
+
 .info-box h4 {
 	font-size: 1.085em;
 	font-weight: normal;
@@ -541,8 +564,8 @@ body.dragover #import-options-drop-area .drop-area {
 }
 
 .info-box .tip-button {
-	margin-left: 12px;
-	margin-top: 3px;
+	margin: 3px 2px 0 10px;
+
 }
 
 .info-box input[type="checkbox"] {
@@ -762,8 +785,10 @@ body.simplify .layer-control-btn {
 	padding: 0px 14px 2px 14px;
 }
 
+
 .pin-all img,
-.layer-item img {
+.layer-item img
+{
 	position: absolute;
 	width: 16px;
 	height: 16px;
@@ -784,7 +809,7 @@ img.close-btn {
 	height:  18px;
 	width:  18px;
 	margin-top: 1px;
-	margin-right: -5px;
+	margin-right: -3px;
 	cursor: pointer;
 	border-radius: 4px;
 }