mapshaper 0.5.66 → 0.5.70

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+v0.5.70
+* Added -join duplication option, which duplicates features in the target layer when many-to-one joins occur.
+
+v0.5.69
+* Added undocumented -ignore command.
+* Bug fix
+
+v0.5.68
+* Bug fix
+
+v0.5.67
+* Bug fix
+
 v0.5.66
 * Improve interactive selection.
 * Added undocumented -define command.

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.65";
+  var VERSION = "0.5.69";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1167,6 +1167,10 @@
     throw new UserError(formatLogArgs(arguments));
   };
 
+  var _interrupt = function() {
+    throw new NonFatalError(formatLogArgs(arguments));
+  };
+
   var _message = function() {
     logArgs(arguments);
   };
@@ -1185,10 +1189,14 @@
   }
 
   // Handle an error caused by invalid input or misuse of API
-  function stop () {
+  function stop() {
     _stop.apply(null, utils.toArray(arguments));
   }
 
+  function interrupt() {
+    _interrupt.apply(null, utils.toArray(arguments));
+  }
+
   // Print a status message
   function message() {
     _message.apply(null, messageArgs(arguments));
@@ -1228,7 +1236,9 @@
     if (utils.isString(err)) {
       err = new UserError(err);
     }
-    if (err.name == 'UserError') {
+    if (err.name == 'NonFatalError') {
+      console.error(messageArgs([err.message]).join(' '));
+    } else if (err.name == 'UserError') {
       msg = err.message;
       if (!/Error/.test(msg)) {
         msg = "Error: " + msg;
@@ -1248,6 +1258,12 @@
     return err;
   }
 
+  function NonFatalError(msg) {
+    var err = new Error(msg);
+    err.name = 'NonFatalError';
+    return err;
+  }
+
   function formatColumns(arr, alignments) {
     var widths = arr.reduce(function(memo, line) {
       return line.map(function(str, i) {
@@ -1308,6 +1324,7 @@
     loggingEnabled: loggingEnabled,
     error: error,
     stop: stop,
+    interrupt: interrupt,
     message: message,
     setLoggingFunctions: setLoggingFunctions,
     print: print,
@@ -1315,6 +1332,7 @@
     debug: debug,
     printError: printError,
     UserError: UserError,
+    NonFatalError: NonFatalError,
     formatColumns: formatColumns,
     formatStringsAsGrid: formatStringsAsGrid,
     formatLogArgs: formatLogArgs,
@@ -14306,7 +14324,7 @@
       joinStr = obj.tag == 'text' || obj.tag == 'tspan' ? '' : '\n';
       svg += '>' + joinStr;
       if (obj.value) {
-        svg += obj.value;
+        svg += stringEscape(obj.value);
       }
       if (obj.children) {
         svg += obj.children.map(stringify).join(joinStr);
@@ -14329,8 +14347,13 @@
         "'": '''
       };
   function stringEscape(s) {
-    return String(s).replace(rxp, function(s) {
-      return map[s];
+    return String(s).replace(rxp, function(match, i) {
+      var entity = map[match];
+      // don't replace & with &
+      if (match == '&' && s.substr(i, entity.length) == entity) {
+        return '&';
+      }
+      return entity;
     });
   }
 
@@ -17140,7 +17163,7 @@ ${svg}
       c = buf[i];
       if (c == DQUOTE) {
         inQuotedText = !inQuotedText;
-      } else if (c == CR || c == LF) {
+      } else if ((c == CR || c == LF) && !inQuotedText) {
         if (c == CR && i + 1 < bufLen && buf[i + 1] == LF) {
           // first half of CRLF pair: advance one byte
           i++;
@@ -17234,6 +17257,7 @@ ${svg}
     getRowConverter: getRowConverter,
     parseDelimHeaderSection: parseDelimHeaderSection,
     getDelimFieldFilter: getDelimFieldFilter,
+    readLinesAsString: readLinesAsString,
     parseDelimText: parseDelimText
   });
 
@@ -18415,6 +18439,9 @@ ${svg}
         type: 'strings',
         describe: '[CSV] comma-sep. list of fields to import'
       })
+      // .option('csv-comment', {
+      //   describe: '[CSV] comment line character(s)'
+      // })
       .option('decimal-comma', {
         type: 'flag',
         describe: '[CSV] import numbers formatted like 1.000,01 or 1 000,01'
@@ -19164,6 +19191,14 @@ ${svg}
       .option('target', targetOpt)
       .option('no-replace', noReplaceOpt);
 
+    parser.command('ignore')
+      // .describe('stop processing if a condition is met')
+      .option('empty', {
+        describe: 'ignore empty files',
+        type: 'flag'
+      })
+      .option('target', targetOpt);
+
     parser.command('inlay')
       .describe('inscribe a polygon layer inside another polygon layer')
       .option('source', {
@@ -19235,6 +19270,10 @@ ${svg}
         // describe: 'use planar geometry when interpolating by area' // useful for testing
         type: 'flag'
       })
+      .option('duplication', {
+        describe: 'duplicate target features on many-to-one joins',
+        type: 'flag'
+      })
       .option('string-fields', stringFieldsOpt)
       .option('field-types', fieldTypesOpt)
       .option('sum-fields', {
@@ -29801,13 +29840,19 @@ ${svg}
     getJoinFilter: getJoinFilter
   });
 
+  function joinTables(dest, src, join, opts) {
+    return joinTableToLayer({data: dest}, src, join, opts);
+  }
+
   // Join data from @src table to records in @dest table
   // @join function
   //    Receives index of record in the dest table
   //    Returns array of matching records in src table, or null if no matches
   //
-  function joinTables(dest, src, join, opts) {
-    var srcRecords = src.getRecords(),
+  function joinTableToLayer(destLyr, src, join, opts) {
+    var dest = destLyr.data,
+        useDuplication = !!opts.duplication,
+        srcRecords = src.getRecords(),
         destRecords = dest.getRecords(),
         prefix = opts.prefix || '',
         unmatchedRecords = [],
@@ -29822,6 +29867,14 @@ ${svg}
         retn = {},
         srcRec, srcId, destRec, joins, count, filter, calc, i, j, n, m;
 
+    // support for duplication
+    var duplicateRecords, destShapes;
+    if (useDuplication) {
+      if (opts.calc) stop('duplication and calc options cannot be used together');
+      duplicateRecords = dest.clone().getRecords();
+      destShapes = destLyr.shapes || [];
+    }
+
     if (opts.where) {
       filter = getJoinFilter(src, opts.where);
     }
@@ -29831,7 +29884,8 @@ ${svg}
     }
 
     // join source records to target records
-    for (i=0, n=destRecords.length; i<n; i++) {
+    n = destRecords.length;
+    for (i=0; i<n; i++) {
       destRec = destRecords[i];
       joins = join(i);
       if (joins && filter) {
@@ -29842,7 +29896,12 @@ ${svg}
       for (j=0, count=0, m=joins ? joins.length : 0; j<m; j++) {
         srcId = joins[j];
         srcRec = srcRecords[srcId];
-        if (count === 0) {
+        if (count > 0 && useDuplication) {
+          destRec = copyRecord(duplicateRecords[i]);
+          destRecords.push(destRec);
+          destShapes.push(cloneShape(destShapes[i]));
+        }
+        if (count === 0 || useDuplication) {
           if (copyFields.length > 0) {
             // only copying the first match
             joinByCopy(destRec, srcRec, copyFields, prefix);
@@ -29874,7 +29933,7 @@ ${svg}
       }
     }
 
-    printJoinMessage(matchCount, destRecords.length,
+    printJoinMessage(matchCount, n,
         countJoins(joinCounts), srcRecords.length, skipCount, collisionCount, collisionFields);
 
     if (opts.unjoined) {
@@ -29902,6 +29961,7 @@ ${svg}
     });
   }
 
+
   function countJoins(counts) {
     var joinCount = 0;
     for (var i=0, n=counts.length; i<n; i++) {
@@ -29964,14 +30024,16 @@ ${svg}
 
   function printJoinMessage(matches, n, joins, m, skipped, collisions, collisionFields) {
     // TODO: add tip for troubleshooting join problems, if join is less than perfect.
+    var unmatched = n - matches;
     if (matches > 0 === false) {
       message("No records could be joined");
       return;
     }
     message(utils.format("Joined data from %'d source record%s to %'d target record%s",
         joins, utils.pluralSuffix(joins), matches, utils.pluralSuffix(matches)));
-    if (matches < n) {
-      message(utils.format('%d/%d target records received no data', n-matches, n));
+    if (unmatched > 0) {
+      message(utils.format('%d target record%s received no data', unmatched, utils.pluralSuffix(unmatched)));
+      // message(utils.format('%d target records received no data', n-matches));
     }
     if (joins < m) {
       message(utils.format("%d/%d source records could not be joined", m-joins, m));
@@ -30020,6 +30082,7 @@ ${svg}
   var JoinTables = /*#__PURE__*/Object.freeze({
     __proto__: null,
     joinTables: joinTables,
+    joinTableToLayer: joinTableToLayer,
     validateFieldNames: validateFieldNames,
     updateUnmatchedRecord: updateUnmatchedRecord,
     findCollisionFields: findCollisionFields,
@@ -31486,13 +31549,13 @@ ${svg}
     // TODO: option to copy points that can't be joined to a new layer
     var joinFunction = getPolygonToPointsFunction(targetLyr, arcs, pointLyr, opts);
     prepJoinLayers(targetLyr, pointLyr);
-    return joinTables(targetLyr.data, pointLyr.data, joinFunction, opts);
+    return joinTableToLayer(targetLyr, pointLyr.data, joinFunction, opts);
   }
 
   function joinPolygonsToPoints(targetLyr, polygonLyr, arcs, opts) {
     var joinFunction = getPointToPolygonsFunction(targetLyr, polygonLyr, arcs, opts);
     prepJoinLayers(targetLyr, polygonLyr);
-    return joinTables(targetLyr.data, polygonLyr.data, joinFunction, opts);
+    return joinTableToLayer(targetLyr, polygonLyr.data, joinFunction, opts);
   }
 
 
@@ -33278,6 +33341,12 @@ ${svg}
     };
   }
 
+  cmd.ignore = function(targetLayer, dataset, opts) {
+    if (opts.empty && layerIsEmpty(targetLayer)) {
+      interrupt('Layer is empty, stopping processing');
+    }
+  };
+
   cmd.include = function(opts) {
     var content, obj, context;
     // TODO: handle web context
@@ -33653,9 +33722,10 @@ ${svg}
 
     var joinOpts = utils.extend({}, opts);
     var joinFunction = getPolygonToPolygonFunction(targetLyr, sourceLyr, mosaicIndex, opts);
-    var retn = joinTables(targetLyr.data, sourceLyr.data, joinFunction, joinOpts);
+    var retn = joinTableToLayer(targetLyr, sourceLyr.data, joinFunction, joinOpts);
 
     if (opts.interpolate) {
+      if (opts.duplication) stop('duplication and interpolate options cannot be used together');
       interpolateFieldsByArea(targetLyr, sourceLyr, mosaicIndex, opts);
     }
     return retn;
@@ -34570,7 +34640,7 @@ ${svg}
   function joinPointsToPoints(targetLyr, srcLyr, crs, opts) {
     var joinFunction = getPointToPointFunction(targetLyr, srcLyr, crs, opts);
     prepJoinLayers(targetLyr, srcLyr);
-    return joinTables(targetLyr.data, srcLyr.data, joinFunction, opts);
+    return joinTableToLayer(targetLyr, srcLyr.data, joinFunction, opts);
   }
 
   function getPointToPointFunction(targetLyr, srcLyr, crs, opts) {
@@ -34620,14 +34690,14 @@ ${svg}
     }
   };
 
-  function joinAttributesToFeatures(lyr, srcTable, opts) {
+  function joinAttributesToFeatures(destLyr, srcTable, opts) {
     var keys = opts.keys,
         destKey = keys[0],
         srcKey = keys[1],
-        destTable = lyr.data,
+        destTable = destLyr.data,
         joinFunction = getJoinByKey(destTable, destKey, srcTable, srcKey);
     validateFieldNames(keys);
-    return joinTables(destTable, srcTable, joinFunction, opts);
+    return joinTableToLayer(destLyr, srcTable, joinFunction, opts);
   }
 
   // Return a function for translating a target id to an array of source ids based on values
@@ -37703,6 +37773,9 @@ ${svg}
           outputLayers = targetDataset.layers; // kludge to allow layer naming below
         }
 
+      } else if (name == 'ignore') {
+        applyCommandToEachLayer(cmd.ignore, targetLayers, targetDataset, opts);
+
       } else if (name == 'include') {
         cmd.include(opts);
 
@@ -38073,6 +38146,7 @@ ${svg}
         cmd.options.output = outputArr;
       }
     });
+
     runParsedCommands(commands, null, callback);
   }
 
@@ -38133,10 +38207,6 @@ ${svg}
       error("Changed in v0.4: runParsedCommands() takes a Catalog object");
     }
 
-    if (!utils.isFunction(done)) {
-      error("Missing a callback function");
-    }
-
     if (!utils.isArray(commands)) {
       error("Expected an array of parsed commands");
     }
@@ -38157,18 +38227,25 @@ ${svg}
       // that it can modify the output dataset in-place instead of making a copy.
       commands[commands.length-1].options.final = true;
     }
-    commands = divideImportCommand(commands);
-    utils.reduceAsync(commands, catalog, nextCommand, done);
 
-    function nextCommand(catalog, cmd, next) {
-      setStateVar('current_command', cmd.name); // for log msgs
-      setStateVar('verbose', !!cmd.options.verbose);
-      setStateVar('debug', !!cmd.options.debug);
-      runCommand(cmd, catalog, next);
+    var groups = divideImportCommand(commands);
+    if (groups.length == 1) {
+      // run a simple sequence of commands (input files are not batched)
+      return runParsedCommands2(commands, catalog, done);
+    }
+
+    // run duplicated commands (i.e. batch mode)
+    utils.reduceAsync(groups, catalog, nextGroup, done);
+
+    function nextGroup(catalog, commands, next) {
+      runParsedCommands2(commands, catalog, function(err, catalog) {
+        err = filterError(err);
+        next(err, catalog);
+      });
     }
 
     function done(err, catalog) {
-      if (err) printError(err);
+      err = filterError(err);
       cb(err, catalog);
       setStateVar('current_command', null);
       setStateVar('verbose', false);
@@ -38176,11 +38253,31 @@ ${svg}
     }
   }
 
+  function filterError(err) {
+    if (err) printError(err);
+    if (err && err.name == 'NonFatalError') {
+      return null;
+    }
+    return err;
+  }
+
+  function runParsedCommands2(commands, catalog, cb) {
+    utils.reduceAsync(commands, catalog, nextCommand, cb);
+
+    function nextCommand(catalog, cmd, next) {
+      setStateVar('current_command', cmd.name); // for log msgs
+      setStateVar('verbose', !!cmd.options.verbose);
+      setStateVar('debug', !!cmd.options.debug);
+      runCommand(cmd, catalog, 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
   // @commands Array of parsed commands
-  // Returns: either original command array or array of duplicated commands.
+  // Returns: Array of one or more sequences of parsed commands
   //
   function divideImportCommand(commands) {
     var firstCmd = commands[0],
@@ -38188,23 +38285,23 @@ ${svg}
 
     if (firstCmd.name != 'i' || opts.stdin || opts.merge_files ||
       opts.combine_files || !opts.files || opts.files.length < 2) {
-      return commands;
+      return [commands];
     }
 
-    return (opts.files).reduce(function(memo, file) {
-      var importCmd = {
+    return opts.files.map(function(file) {
+      var group = [{
         name: 'i',
         options: utils.defaults({
           files:[file],
           replace: true  // kludge to replace data catalog
         }, opts)
-      };
-      memo.push(importCmd);
-      memo.push.apply(memo, commands.slice(1));
-      return memo;
-    }, []);
+      }];
+      group.push.apply(group, commands.slice(1));
+      return group;
+    });
   }
 
+
   function printStartupMessages() {
     // print heap memory message if running with a custom amount
     var rxp = /^--max-old-space-size=([0-9]+)$/;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.66",
+	"version": "0.5.70",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -42,7 +42,8 @@
 	"dependencies": {
 		"commander": "^5.1.0",
 		"cookies": "^0.8.0",
-		"d3-scale-chromatic": "^2.0.0",
+		"d3-color": "2.0.0",
+		"d3-scale-chromatic": "2.0.0",
 		"delaunator": "^5.0.0",
 		"flatbush": "^3.2.1",
 		"geokdbush": "^1.1.0",

package/www/elements.css

@@ -144,7 +144,7 @@ div.tip {
 
 .dialog-btn {
 	display: inline-block;
-	margin-bottom: 4px;
+	margin-bottom: 1px;
 	margin-top: 1px;
 	font-size: 13px;
 	color: white;

package/www/mapshaper-gui.js

@@ -3976,6 +3976,10 @@
     throw new UserError$1(formatLogArgs(arguments));
   };
 
+  var _interrupt = function() {
+    throw new NonFatalError(formatLogArgs(arguments));
+  };
+
   var _message = function() {
     logArgs(arguments);
   };
@@ -3994,10 +3998,14 @@
   }
 
   // Handle an error caused by invalid input or misuse of API
-  function stop$1 () {
+  function stop$1() {
     _stop.apply(null, utils$1.toArray(arguments));
   }
 
+  function interrupt() {
+    _interrupt.apply(null, utils$1.toArray(arguments));
+  }
+
   // Print a status message
   function message$1() {
     _message.apply(null, messageArgs(arguments));
@@ -4037,7 +4045,9 @@
     if (utils$1.isString(err)) {
       err = new UserError$1(err);
     }
-    if (err.name == 'UserError') {
+    if (err.name == 'NonFatalError') {
+      console.error(messageArgs([err.message]).join(' '));
+    } else if (err.name == 'UserError') {
       msg = err.message;
       if (!/Error/.test(msg)) {
         msg = "Error: " + msg;
@@ -4057,6 +4067,12 @@
     return err;
   }
 
+  function NonFatalError(msg) {
+    var err = new Error(msg);
+    err.name = 'NonFatalError';
+    return err;
+  }
+
   function formatColumns(arr, alignments) {
     var widths = arr.reduce(function(memo, line) {
       return line.map(function(str, i) {
@@ -9526,7 +9542,6 @@
     return style;
   }
 
-
   // Returns a display style for the overlay layer.
   // The overlay layer renders several kinds of feature, each of which is displayed
   // with a different style.

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.65";
+  var VERSION = "0.5.69";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -1167,6 +1167,10 @@
     throw new UserError(formatLogArgs(arguments));
   };
 
+  var _interrupt = function() {
+    throw new NonFatalError(formatLogArgs(arguments));
+  };
+
   var _message = function() {
     logArgs(arguments);
   };
@@ -1185,10 +1189,14 @@
   }
 
   // Handle an error caused by invalid input or misuse of API
-  function stop () {
+  function stop() {
     _stop.apply(null, utils.toArray(arguments));
   }
 
+  function interrupt() {
+    _interrupt.apply(null, utils.toArray(arguments));
+  }
+
   // Print a status message
   function message() {
     _message.apply(null, messageArgs(arguments));
@@ -1228,7 +1236,9 @@
     if (utils.isString(err)) {
       err = new UserError(err);
     }
-    if (err.name == 'UserError') {
+    if (err.name == 'NonFatalError') {
+      console.error(messageArgs([err.message]).join(' '));
+    } else if (err.name == 'UserError') {
       msg = err.message;
       if (!/Error/.test(msg)) {
         msg = "Error: " + msg;
@@ -1248,6 +1258,12 @@
     return err;
   }
 
+  function NonFatalError(msg) {
+    var err = new Error(msg);
+    err.name = 'NonFatalError';
+    return err;
+  }
+
   function formatColumns(arr, alignments) {
     var widths = arr.reduce(function(memo, line) {
       return line.map(function(str, i) {
@@ -1308,6 +1324,7 @@
     loggingEnabled: loggingEnabled,
     error: error,
     stop: stop,
+    interrupt: interrupt,
     message: message,
     setLoggingFunctions: setLoggingFunctions,
     print: print,
@@ -1315,6 +1332,7 @@
     debug: debug,
     printError: printError,
     UserError: UserError,
+    NonFatalError: NonFatalError,
     formatColumns: formatColumns,
     formatStringsAsGrid: formatStringsAsGrid,
     formatLogArgs: formatLogArgs,
@@ -14306,7 +14324,7 @@
       joinStr = obj.tag == 'text' || obj.tag == 'tspan' ? '' : '\n';
       svg += '>' + joinStr;
       if (obj.value) {
-        svg += obj.value;
+        svg += stringEscape(obj.value);
       }
       if (obj.children) {
         svg += obj.children.map(stringify).join(joinStr);
@@ -14329,8 +14347,13 @@
         "'": '''
       };
   function stringEscape(s) {
-    return String(s).replace(rxp, function(s) {
-      return map[s];
+    return String(s).replace(rxp, function(match, i) {
+      var entity = map[match];
+      // don't replace & with &
+      if (match == '&' && s.substr(i, entity.length) == entity) {
+        return '&';
+      }
+      return entity;
     });
   }
 
@@ -17140,7 +17163,7 @@ ${svg}
       c = buf[i];
       if (c == DQUOTE) {
         inQuotedText = !inQuotedText;
-      } else if (c == CR || c == LF) {
+      } else if ((c == CR || c == LF) && !inQuotedText) {
         if (c == CR && i + 1 < bufLen && buf[i + 1] == LF) {
           // first half of CRLF pair: advance one byte
           i++;
@@ -17234,6 +17257,7 @@ ${svg}
     getRowConverter: getRowConverter,
     parseDelimHeaderSection: parseDelimHeaderSection,
     getDelimFieldFilter: getDelimFieldFilter,
+    readLinesAsString: readLinesAsString,
     parseDelimText: parseDelimText
   });
 
@@ -18415,6 +18439,9 @@ ${svg}
         type: 'strings',
         describe: '[CSV] comma-sep. list of fields to import'
       })
+      // .option('csv-comment', {
+      //   describe: '[CSV] comment line character(s)'
+      // })
       .option('decimal-comma', {
         type: 'flag',
         describe: '[CSV] import numbers formatted like 1.000,01 or 1 000,01'
@@ -19164,6 +19191,14 @@ ${svg}
       .option('target', targetOpt)
       .option('no-replace', noReplaceOpt);
 
+    parser.command('ignore')
+      // .describe('stop processing if a condition is met')
+      .option('empty', {
+        describe: 'ignore empty files',
+        type: 'flag'
+      })
+      .option('target', targetOpt);
+
     parser.command('inlay')
       .describe('inscribe a polygon layer inside another polygon layer')
       .option('source', {
@@ -19235,6 +19270,10 @@ ${svg}
         // describe: 'use planar geometry when interpolating by area' // useful for testing
         type: 'flag'
       })
+      .option('duplication', {
+        describe: 'duplicate target features on many-to-one joins',
+        type: 'flag'
+      })
       .option('string-fields', stringFieldsOpt)
       .option('field-types', fieldTypesOpt)
       .option('sum-fields', {
@@ -29801,13 +29840,19 @@ ${svg}
     getJoinFilter: getJoinFilter
   });
 
+  function joinTables(dest, src, join, opts) {
+    return joinTableToLayer({data: dest}, src, join, opts);
+  }
+
   // Join data from @src table to records in @dest table
   // @join function
   //    Receives index of record in the dest table
   //    Returns array of matching records in src table, or null if no matches
   //
-  function joinTables(dest, src, join, opts) {
-    var srcRecords = src.getRecords(),
+  function joinTableToLayer(destLyr, src, join, opts) {
+    var dest = destLyr.data,
+        useDuplication = !!opts.duplication,
+        srcRecords = src.getRecords(),
         destRecords = dest.getRecords(),
         prefix = opts.prefix || '',
         unmatchedRecords = [],
@@ -29822,6 +29867,14 @@ ${svg}
         retn = {},
         srcRec, srcId, destRec, joins, count, filter, calc, i, j, n, m;
 
+    // support for duplication
+    var duplicateRecords, destShapes;
+    if (useDuplication) {
+      if (opts.calc) stop('duplication and calc options cannot be used together');
+      duplicateRecords = dest.clone().getRecords();
+      destShapes = destLyr.shapes || [];
+    }
+
     if (opts.where) {
       filter = getJoinFilter(src, opts.where);
     }
@@ -29831,7 +29884,8 @@ ${svg}
     }
 
     // join source records to target records
-    for (i=0, n=destRecords.length; i<n; i++) {
+    n = destRecords.length;
+    for (i=0; i<n; i++) {
       destRec = destRecords[i];
       joins = join(i);
       if (joins && filter) {
@@ -29842,7 +29896,12 @@ ${svg}
       for (j=0, count=0, m=joins ? joins.length : 0; j<m; j++) {
         srcId = joins[j];
         srcRec = srcRecords[srcId];
-        if (count === 0) {
+        if (count > 0 && useDuplication) {
+          destRec = copyRecord(duplicateRecords[i]);
+          destRecords.push(destRec);
+          destShapes.push(cloneShape(destShapes[i]));
+        }
+        if (count === 0 || useDuplication) {
           if (copyFields.length > 0) {
             // only copying the first match
             joinByCopy(destRec, srcRec, copyFields, prefix);
@@ -29874,7 +29933,7 @@ ${svg}
       }
     }
 
-    printJoinMessage(matchCount, destRecords.length,
+    printJoinMessage(matchCount, n,
         countJoins(joinCounts), srcRecords.length, skipCount, collisionCount, collisionFields);
 
     if (opts.unjoined) {
@@ -29902,6 +29961,7 @@ ${svg}
     });
   }
 
+
   function countJoins(counts) {
     var joinCount = 0;
     for (var i=0, n=counts.length; i<n; i++) {
@@ -29964,14 +30024,16 @@ ${svg}
 
   function printJoinMessage(matches, n, joins, m, skipped, collisions, collisionFields) {
     // TODO: add tip for troubleshooting join problems, if join is less than perfect.
+    var unmatched = n - matches;
     if (matches > 0 === false) {
       message("No records could be joined");
       return;
     }
     message(utils.format("Joined data from %'d source record%s to %'d target record%s",
         joins, utils.pluralSuffix(joins), matches, utils.pluralSuffix(matches)));
-    if (matches < n) {
-      message(utils.format('%d/%d target records received no data', n-matches, n));
+    if (unmatched > 0) {
+      message(utils.format('%d target record%s received no data', unmatched, utils.pluralSuffix(unmatched)));
+      // message(utils.format('%d target records received no data', n-matches));
     }
     if (joins < m) {
       message(utils.format("%d/%d source records could not be joined", m-joins, m));
@@ -30020,6 +30082,7 @@ ${svg}
   var JoinTables = /*#__PURE__*/Object.freeze({
     __proto__: null,
     joinTables: joinTables,
+    joinTableToLayer: joinTableToLayer,
     validateFieldNames: validateFieldNames,
     updateUnmatchedRecord: updateUnmatchedRecord,
     findCollisionFields: findCollisionFields,
@@ -31486,13 +31549,13 @@ ${svg}
     // TODO: option to copy points that can't be joined to a new layer
     var joinFunction = getPolygonToPointsFunction(targetLyr, arcs, pointLyr, opts);
     prepJoinLayers(targetLyr, pointLyr);
-    return joinTables(targetLyr.data, pointLyr.data, joinFunction, opts);
+    return joinTableToLayer(targetLyr, pointLyr.data, joinFunction, opts);
   }
 
   function joinPolygonsToPoints(targetLyr, polygonLyr, arcs, opts) {
     var joinFunction = getPointToPolygonsFunction(targetLyr, polygonLyr, arcs, opts);
     prepJoinLayers(targetLyr, polygonLyr);
-    return joinTables(targetLyr.data, polygonLyr.data, joinFunction, opts);
+    return joinTableToLayer(targetLyr, polygonLyr.data, joinFunction, opts);
   }
 
 
@@ -33278,6 +33341,12 @@ ${svg}
     };
   }
 
+  cmd.ignore = function(targetLayer, dataset, opts) {
+    if (opts.empty && layerIsEmpty(targetLayer)) {
+      interrupt('Layer is empty, stopping processing');
+    }
+  };
+
   cmd.include = function(opts) {
     var content, obj, context;
     // TODO: handle web context
@@ -33653,9 +33722,10 @@ ${svg}
 
     var joinOpts = utils.extend({}, opts);
     var joinFunction = getPolygonToPolygonFunction(targetLyr, sourceLyr, mosaicIndex, opts);
-    var retn = joinTables(targetLyr.data, sourceLyr.data, joinFunction, joinOpts);
+    var retn = joinTableToLayer(targetLyr, sourceLyr.data, joinFunction, joinOpts);
 
     if (opts.interpolate) {
+      if (opts.duplication) stop('duplication and interpolate options cannot be used together');
       interpolateFieldsByArea(targetLyr, sourceLyr, mosaicIndex, opts);
     }
     return retn;
@@ -34570,7 +34640,7 @@ ${svg}
   function joinPointsToPoints(targetLyr, srcLyr, crs, opts) {
     var joinFunction = getPointToPointFunction(targetLyr, srcLyr, crs, opts);
     prepJoinLayers(targetLyr, srcLyr);
-    return joinTables(targetLyr.data, srcLyr.data, joinFunction, opts);
+    return joinTableToLayer(targetLyr, srcLyr.data, joinFunction, opts);
   }
 
   function getPointToPointFunction(targetLyr, srcLyr, crs, opts) {
@@ -34620,14 +34690,14 @@ ${svg}
     }
   };
 
-  function joinAttributesToFeatures(lyr, srcTable, opts) {
+  function joinAttributesToFeatures(destLyr, srcTable, opts) {
     var keys = opts.keys,
         destKey = keys[0],
         srcKey = keys[1],
-        destTable = lyr.data,
+        destTable = destLyr.data,
         joinFunction = getJoinByKey(destTable, destKey, srcTable, srcKey);
     validateFieldNames(keys);
-    return joinTables(destTable, srcTable, joinFunction, opts);
+    return joinTableToLayer(destLyr, srcTable, joinFunction, opts);
   }
 
   // Return a function for translating a target id to an array of source ids based on values
@@ -37703,6 +37773,9 @@ ${svg}
           outputLayers = targetDataset.layers; // kludge to allow layer naming below
         }
 
+      } else if (name == 'ignore') {
+        applyCommandToEachLayer(cmd.ignore, targetLayers, targetDataset, opts);
+
       } else if (name == 'include') {
         cmd.include(opts);
 
@@ -38073,6 +38146,7 @@ ${svg}
         cmd.options.output = outputArr;
       }
     });
+
     runParsedCommands(commands, null, callback);
   }
 
@@ -38133,10 +38207,6 @@ ${svg}
       error("Changed in v0.4: runParsedCommands() takes a Catalog object");
     }
 
-    if (!utils.isFunction(done)) {
-      error("Missing a callback function");
-    }
-
     if (!utils.isArray(commands)) {
       error("Expected an array of parsed commands");
     }
@@ -38157,18 +38227,25 @@ ${svg}
       // that it can modify the output dataset in-place instead of making a copy.
       commands[commands.length-1].options.final = true;
     }
-    commands = divideImportCommand(commands);
-    utils.reduceAsync(commands, catalog, nextCommand, done);
 
-    function nextCommand(catalog, cmd, next) {
-      setStateVar('current_command', cmd.name); // for log msgs
-      setStateVar('verbose', !!cmd.options.verbose);
-      setStateVar('debug', !!cmd.options.debug);
-      runCommand(cmd, catalog, next);
+    var groups = divideImportCommand(commands);
+    if (groups.length == 1) {
+      // run a simple sequence of commands (input files are not batched)
+      return runParsedCommands2(commands, catalog, done);
+    }
+
+    // run duplicated commands (i.e. batch mode)
+    utils.reduceAsync(groups, catalog, nextGroup, done);
+
+    function nextGroup(catalog, commands, next) {
+      runParsedCommands2(commands, catalog, function(err, catalog) {
+        err = filterError(err);
+        next(err, catalog);
+      });
     }
 
     function done(err, catalog) {
-      if (err) printError(err);
+      err = filterError(err);
       cb(err, catalog);
       setStateVar('current_command', null);
       setStateVar('verbose', false);
@@ -38176,11 +38253,31 @@ ${svg}
     }
   }
 
+  function filterError(err) {
+    if (err) printError(err);
+    if (err && err.name == 'NonFatalError') {
+      return null;
+    }
+    return err;
+  }
+
+  function runParsedCommands2(commands, catalog, cb) {
+    utils.reduceAsync(commands, catalog, nextCommand, cb);
+
+    function nextCommand(catalog, cmd, next) {
+      setStateVar('current_command', cmd.name); // for log msgs
+      setStateVar('verbose', !!cmd.options.verbose);
+      setStateVar('debug', !!cmd.options.debug);
+      runCommand(cmd, catalog, 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
   // @commands Array of parsed commands
-  // Returns: either original command array or array of duplicated commands.
+  // Returns: Array of one or more sequences of parsed commands
   //
   function divideImportCommand(commands) {
     var firstCmd = commands[0],
@@ -38188,23 +38285,23 @@ ${svg}
 
     if (firstCmd.name != 'i' || opts.stdin || opts.merge_files ||
       opts.combine_files || !opts.files || opts.files.length < 2) {
-      return commands;
+      return [commands];
     }
 
-    return (opts.files).reduce(function(memo, file) {
-      var importCmd = {
+    return opts.files.map(function(file) {
+      var group = [{
         name: 'i',
         options: utils.defaults({
           files:[file],
           replace: true  // kludge to replace data catalog
         }, opts)
-      };
-      memo.push(importCmd);
-      memo.push.apply(memo, commands.slice(1));
-      return memo;
-    }, []);
+      }];
+      group.push.apply(group, commands.slice(1));
+      return group;
+    });
   }
 
+
   function printStartupMessages() {
     // print heap memory message if running with a custom amount
     var rxp = /^--max-old-space-size=([0-9]+)$/;

package/www/page.css

@@ -456,7 +456,7 @@ body.dragover #import-options-drop-area .drop-area {
 	text-align: left;
 	margin-top: 12px;
 	margin-right: 20px;
-	padding: 11px 15px 9px 15px;
+	padding: 12px 18px 12px 18px;
 	vertical-align: top;
 	display: inline-block;
 	/* border: 1px solid #aaa; */
@@ -904,7 +904,7 @@ img.close-btn:hover,
 	box-sizing: border-box;
 	overflow: hidden;
 	overflow-y: auto;
-	padding: 4px 12px;
+	padding: 4px 12px 3px;
 	line-height: 1.2;
 }