mapshaper 0.6.31 → 0.6.32

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.31";
+  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.31",
+  "version": "0.6.32",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/index.html

@@ -154,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>
@@ -283,10 +288,13 @@ apply to TopoJSON files.</div></div></div></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: <span id="import-option-examples">no-topology
-encoding=big5</span></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');
@@ -1981,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) {
@@ -1995,7 +1993,7 @@
         return;
       }
       gui.enterMode('import');
-      if (useQuickView()) {
+      if (useQuickView) {
         await importQueuedFiles();
       } else {
         gui.container.addClass('queued-files');
@@ -2091,7 +2089,7 @@
 
     function readImportOpts() {
       var importOpts;
-      if (useQuickView()) {
+      if (useQuickView) {
         importOpts = {}; // default opts using quickview
       } else {
         var freeform = El('#import-options .advanced-options').node().value;

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.31";
+  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;