mapshaper 0.6.4 → 0.6.5

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.4";
+  var VERSION = "0.6.5";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -30940,7 +30940,7 @@ ${svg}
 
   var plasma = ramp(colors("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"));
 
-  var lib = /*#__PURE__*/Object.freeze({
+  var d3Scales = /*#__PURE__*/Object.freeze({
     __proto__: null,
     schemeCategory10: category10,
     schemeAccent: Accent,
@@ -31077,7 +31077,6 @@ ${svg}
   }
 
   function testLib() {
-    var lib = require('d3-scale-chromatic');
     schemes(index.categorical);
     schemes(index.sequential);
     schemes(index.diverging);
@@ -31087,7 +31086,7 @@ ${svg}
 
     function schemes(arr) {
       arr.forEach(function(name) {
-        if (!lib['scheme' + name]) {
+        if (!d3Scales['scheme' + name]) {
           message('Warning: missing data for', name);
         }
       });
@@ -31095,7 +31094,7 @@ ${svg}
 
     function interpolators(arr) {
       arr.forEach(function(name) {
-        if (!lib['interpolate' + name]) {
+        if (!d3Scales['interpolate' + name]) {
           message('Missing interpolator for', name);
         }
       });
@@ -31134,7 +31133,7 @@ ${svg}
     if (!isColorSchemeName(name)) {
       stop('Unknown color scheme name:', name);
     } else if (isCategoricalColorScheme(name)) {
-      colors = ramps[name] || require('d3-scale-chromatic')['scheme' + name];
+      colors = ramps[name] || d3Scales['scheme' + name];
     } else {
       colors = getColorRamp(name, n);
     }
@@ -31168,9 +31167,8 @@ ${svg}
   function getColorRamp(name, n, stops) {
     initSchemes();
     name = standardName(name);
-    // var lib = require('d3-scale-chromatic');
-    var ramps = lib['scheme' + name];
-    var interpolate = lib['interpolate' + name];
+    var ramps = d3Scales['scheme' + name];
+    var interpolate = d3Scales['interpolate' + name];
     var ramp;
     if (!ramps && !interpolate) {
       stop('Unknown color scheme name:', name);
@@ -36806,6 +36804,7 @@ ${svg}
     } 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);
 
@@ -42084,6 +42083,13 @@ ${svg}
       inputObj = null;
     }
 
+    if (commands.length === 0) {
+      return callback(new UserError("No commands to run"));
+    }
+
+    commands = runAndRemoveInfoCommands(commands);
+    if (commands.length === 0) return done(null);
+
     // add options to -i -o -join -clip -erase commands to bypass file i/o
     // TODO: find a less kludgy solution
     commands.forEach(function(cmd) {
@@ -42095,7 +42101,20 @@ ${svg}
       }
     });
 
-    runParsedCommands(commands, null, callback);
+    var batches = divideImportCommand(commands);
+    utils.reduceAsync(batches, null, nextGroup, done);
+
+    function nextGroup(prevJob, commands, next) {
+      runParsedCommands(commands, new Job(), function(err, job) {
+        err = filterError(err);
+        next(err, job);
+      });
+    }
+
+    function done(err, job) {
+      err = filterError(err);
+      callback(err, job);
+    }
   }
 
   function commandTakesFileInput(name) {
@@ -42142,23 +42161,19 @@ ${svg}
     });
   }
 
+
   // Execute a sequence of parsed commands
   // @commands Array of parsed commands
-  // @job: Optional Job object containing previously imported data
-  // @cb: function(<error>, <catalog>)
+  // @job: Job object containing previously imported data
+  // @done: function([error], [job])
   //
-  function runParsedCommands(commands, job, cb) {
-    if (!job) {
-      job = new Job();
-    }
-
-    if (!utils.isArray(commands)) {
-      error("Expected an array of parsed commands");
-    }
-
-    if (commands.length === 0) {
-      return done(new UserError("No commands to run"));
+  function runParsedCommands(commands, job, done) {
+    if (!runningInBrowser() && commands[commands.length-1].name == 'o') {
+      // in CLI, set 'final' flag on final -o command, so the export function knows
+      // that it can modify the output dataset in-place instead of making a copy.
+      commands[commands.length-1].options.final = true;
     }
+    if (!job) job = new Job();
     commands = readAndRemoveSettings(job, commands);
     if (!runningInBrowser()) {
       printStartupMessages();
@@ -42167,31 +42182,13 @@ ${svg}
     if (commands.length === 0) {
       return done(null);
     }
-    if (!runningInBrowser() && commands[commands.length-1].name == 'o') {
-      // in CLI, set 'final' flag on final -o command, so the export function knows
-      // that it can modify the output dataset in-place instead of making a copy.
-      commands[commands.length-1].options.final = true;
-    }
-
-    var groups = divideImportCommand(commands);
-    if (groups.length == 1) {
-      // run a simple sequence of commands (input files are not batched)
-      return runParsedCommands2(commands, job, done);
-    }
-
-    // run duplicated commands (i.e. batch mode)
-    utils.reduceAsync(groups, job, nextGroup, done);
-
-    function nextGroup(job, commands, next) {
-      runParsedCommands2(commands, job, function(err, job) {
-        err = filterError(err);
-        next(err, job);
-      });
-    }
+    // we're no longer using the same Job for all batches -- no reset needed
+    // // resetting closes any unterminated -if blocks from a previous command sequence
+    // resetControlFlow(job);
+    utils.reduceAsync(commands, job, nextCommand, done);
 
-    function done(err, job) {
-      err = filterError(err);
-      cb(err, job);
+    function nextCommand(job, cmd, next) {
+      runCommand(cmd, job, next);
     }
   }
 
@@ -42203,17 +42200,6 @@ ${svg}
     return err;
   }
 
-  function runParsedCommands2(commands, job, cb) {
-    // resetting closes any unterminated -if blocks from a previous command sequence
-    resetControlFlow(job);
-    utils.reduceAsync(commands, job, nextCommand, cb);
-
-    function nextCommand(job, cmd, next) {
-      runCommand(cmd, job, next);
-    }
-  }
-
-
   // If an initial import command indicates that several input files should be
   //   processed separately, then duplicate the sequence of commands to run
   //   once for each input file

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.6.4",
+	"version": "0.6.5",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",

package/www/mapshaper-gui.js

@@ -2488,6 +2488,7 @@
     var historyId = 0;
     var _isOpen = false;
     var btn = gui.container.findChild('.console-btn').on('click', toggle);
+    var globals = {}; // share user-defined globals between runs
 
     // expose this function, so other components can run commands (e.g. box tool)
     this.runMapshaperCommands = runMapshaperCommands;
@@ -2863,7 +2864,12 @@
       if (commands.length === 0) return done();
       applyParsedCommands(commands, function(err, flags) {
         if (!err) {
-          gui.session.consoleCommands(internal.standardizeConsoleCommands(str));
+          str = internal.standardizeConsoleCommands(str);
+          gui.session.consoleCommands(str);
+          // kludge to terminate unclosed -if blocks
+          if (str.includes('-if') && !str.includes('-endif')) {
+            gui.session.consoleCommands('-endif');
+          }
         }
         if (flags) {
           // if the command may have changed data, and a tool with an edit mode is being used,
@@ -2884,6 +2890,8 @@
           prevTableSize = prevTable ? prevTable.size() : 0,
           prevArcCount = prevArcs ? prevArcs.size() : 0,
           job = new internal.Job(model);
+
+      job.defs = globals; // share globals between runs
       internal.runParsedCommands(commands, job, function(err) {
         var flags = getCommandFlags(commands),
             active2 = model.getActiveLayer(),

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.4";
+  var VERSION = "0.6.5";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -30940,7 +30940,7 @@ ${svg}
 
   var plasma = ramp(colors("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"));
 
-  var lib = /*#__PURE__*/Object.freeze({
+  var d3Scales = /*#__PURE__*/Object.freeze({
     __proto__: null,
     schemeCategory10: category10,
     schemeAccent: Accent,
@@ -31077,7 +31077,6 @@ ${svg}
   }
 
   function testLib() {
-    var lib = require('d3-scale-chromatic');
     schemes(index.categorical);
     schemes(index.sequential);
     schemes(index.diverging);
@@ -31087,7 +31086,7 @@ ${svg}
 
     function schemes(arr) {
       arr.forEach(function(name) {
-        if (!lib['scheme' + name]) {
+        if (!d3Scales['scheme' + name]) {
           message('Warning: missing data for', name);
         }
       });
@@ -31095,7 +31094,7 @@ ${svg}
 
     function interpolators(arr) {
       arr.forEach(function(name) {
-        if (!lib['interpolate' + name]) {
+        if (!d3Scales['interpolate' + name]) {
           message('Missing interpolator for', name);
         }
       });
@@ -31134,7 +31133,7 @@ ${svg}
     if (!isColorSchemeName(name)) {
       stop('Unknown color scheme name:', name);
     } else if (isCategoricalColorScheme(name)) {
-      colors = ramps[name] || require('d3-scale-chromatic')['scheme' + name];
+      colors = ramps[name] || d3Scales['scheme' + name];
     } else {
       colors = getColorRamp(name, n);
     }
@@ -31168,9 +31167,8 @@ ${svg}
   function getColorRamp(name, n, stops) {
     initSchemes();
     name = standardName(name);
-    // var lib = require('d3-scale-chromatic');
-    var ramps = lib['scheme' + name];
-    var interpolate = lib['interpolate' + name];
+    var ramps = d3Scales['scheme' + name];
+    var interpolate = d3Scales['interpolate' + name];
     var ramp;
     if (!ramps && !interpolate) {
       stop('Unknown color scheme name:', name);
@@ -36806,6 +36804,7 @@ ${svg}
     } 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);
 
@@ -42084,6 +42083,13 @@ ${svg}
       inputObj = null;
     }
 
+    if (commands.length === 0) {
+      return callback(new UserError("No commands to run"));
+    }
+
+    commands = runAndRemoveInfoCommands(commands);
+    if (commands.length === 0) return done(null);
+
     // add options to -i -o -join -clip -erase commands to bypass file i/o
     // TODO: find a less kludgy solution
     commands.forEach(function(cmd) {
@@ -42095,7 +42101,20 @@ ${svg}
       }
     });
 
-    runParsedCommands(commands, null, callback);
+    var batches = divideImportCommand(commands);
+    utils.reduceAsync(batches, null, nextGroup, done);
+
+    function nextGroup(prevJob, commands, next) {
+      runParsedCommands(commands, new Job(), function(err, job) {
+        err = filterError(err);
+        next(err, job);
+      });
+    }
+
+    function done(err, job) {
+      err = filterError(err);
+      callback(err, job);
+    }
   }
 
   function commandTakesFileInput(name) {
@@ -42142,23 +42161,19 @@ ${svg}
     });
   }
 
+
   // Execute a sequence of parsed commands
   // @commands Array of parsed commands
-  // @job: Optional Job object containing previously imported data
-  // @cb: function(<error>, <catalog>)
+  // @job: Job object containing previously imported data
+  // @done: function([error], [job])
   //
-  function runParsedCommands(commands, job, cb) {
-    if (!job) {
-      job = new Job();
-    }
-
-    if (!utils.isArray(commands)) {
-      error("Expected an array of parsed commands");
-    }
-
-    if (commands.length === 0) {
-      return done(new UserError("No commands to run"));
+  function runParsedCommands(commands, job, done) {
+    if (!runningInBrowser() && commands[commands.length-1].name == 'o') {
+      // in CLI, set 'final' flag on final -o command, so the export function knows
+      // that it can modify the output dataset in-place instead of making a copy.
+      commands[commands.length-1].options.final = true;
     }
+    if (!job) job = new Job();
     commands = readAndRemoveSettings(job, commands);
     if (!runningInBrowser()) {
       printStartupMessages();
@@ -42167,31 +42182,13 @@ ${svg}
     if (commands.length === 0) {
       return done(null);
     }
-    if (!runningInBrowser() && commands[commands.length-1].name == 'o') {
-      // in CLI, set 'final' flag on final -o command, so the export function knows
-      // that it can modify the output dataset in-place instead of making a copy.
-      commands[commands.length-1].options.final = true;
-    }
-
-    var groups = divideImportCommand(commands);
-    if (groups.length == 1) {
-      // run a simple sequence of commands (input files are not batched)
-      return runParsedCommands2(commands, job, done);
-    }
-
-    // run duplicated commands (i.e. batch mode)
-    utils.reduceAsync(groups, job, nextGroup, done);
-
-    function nextGroup(job, commands, next) {
-      runParsedCommands2(commands, job, function(err, job) {
-        err = filterError(err);
-        next(err, job);
-      });
-    }
+    // we're no longer using the same Job for all batches -- no reset needed
+    // // resetting closes any unterminated -if blocks from a previous command sequence
+    // resetControlFlow(job);
+    utils.reduceAsync(commands, job, nextCommand, done);
 
-    function done(err, job) {
-      err = filterError(err);
-      cb(err, job);
+    function nextCommand(job, cmd, next) {
+      runCommand(cmd, job, next);
     }
   }
 
@@ -42203,17 +42200,6 @@ ${svg}
     return err;
   }
 
-  function runParsedCommands2(commands, job, cb) {
-    // resetting closes any unterminated -if blocks from a previous command sequence
-    resetControlFlow(job);
-    utils.reduceAsync(commands, job, nextCommand, cb);
-
-    function nextCommand(job, cmd, next) {
-      runCommand(cmd, job, next);
-    }
-  }
-
-
   // If an initial import command indicates that several input files should be
   //   processed separately, then duplicate the sequence of commands to run
   //   once for each input file