mapshaper 0.6.50 → 0.6.52

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.50";
+  var VERSION = "0.6.52";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -11259,12 +11259,6 @@
     return ss && ss.isFile() || false;
   };
 
-  cli.checkCommandEnv = function(cname) {
-    var blocked = ['i', 'include', 'require', 'external'];
-    if (runningInBrowser() && blocked.includes(cname)) {
-      stop('The -' + cname + ' command cannot be run in the browser');
-    }
-  };
 
   // cli.fileSize = function(path) {
   //   var ss = cli.statSync(path);
@@ -14580,6 +14574,18 @@
     return merged[0];
   }
 
+  cmd.calc = function(layers, arcs, opts) {
+    var arr = layers.map(lyr => applyCalcExpression(lyr, arcs, opts));
+    if (!opts.to_layer) return null;
+    return {
+      info: {},
+      layers: [{
+        name: opts.name || 'info',
+        data: new DataTable(arr)
+      }]
+    };
+  };
+
   // Calculate an expression across a group of features, print and return the result
   // Supported functions include sum(), average(), max(), min(), median(), count()
   // Functions receive an expression to be applied to each feature (like the -each command)
@@ -14587,9 +14593,9 @@
   // opts.expression  Expression to evaluate
   // opts.where  Optional filter expression (see -filter command)
   //
-  cmd.calc = function(lyr, arcs, opts) {
+  function applyCalcExpression(lyr, arcs, opts) {
     var msg = opts.expression,
-        result, compiled, defs;
+        result, compiled, defs, d;
     if (opts.where) {
       // TODO: implement no_replace option for filter() instead of this
       lyr = getLayerSelection(lyr, arcs, opts);
@@ -14600,9 +14606,17 @@
     defs = getStashedVar('defs');
     compiled = compileCalcExpression(lyr, arcs, opts.expression);
     result = compiled(null, defs);
-    message(msg + ":  " + result);
-    return result;
-  };
+    if (!opts.to_layer) {
+      message(msg + ":  " + result);
+    }
+    d = {
+      expression: opts.expression,
+      value: result
+    };
+    if (opts.where) d.where = opts.where;
+    if (lyr.name) d.layer_name = lyr.name;
+    return d;
+  }
 
   function evalCalcExpression(lyr, arcs, exp) {
     return compileCalcExpression(lyr, arcs, exp)();
@@ -14812,6 +14826,7 @@
 
   var Calc = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    applyCalcExpression: applyCalcExpression,
     evalCalcExpression: evalCalcExpression,
     compileCalcExpression: compileCalcExpression
   });
@@ -23385,9 +23400,17 @@ ${svg}
           alias: '+',
           type: 'flag',
           label: '+, no-replace', // show alias as primary option
-          // describe: 'retain the original layer(s) instead of replacing'
           describe: 'retain both input and output layer(s)'
         },
+        nameOpt2 = { // for -calc and -info
+          describe: 'name the output layer'
+        },
+        noReplaceOpt2 = { // for -calc and -info
+          alias: '+',
+          type: 'flag',
+          label: '+',
+          describe: 'save output to a new layer'
+        },
         noSnapOpt = {
           // describe: 'don't snap points before applying command'
           type: 'flag'
@@ -24366,12 +24389,12 @@ ${svg}
         describe: 'side length (e.g. 500m, 12km)',
         type: 'distance'
       })
-      // .option('cols', {
-      //   type: 'integer'
-      // })
-      // .option('rows', {
-      //   type: 'integer'
-      // })
+      .option('cols', {
+        type: 'integer'
+      })
+      .option('rows', {
+        type: 'integer'
+      })
       // .option('bbox', {
       //   type: 'bbox',
       //   describe: 'xmin,ymin,xmax,ymax (default is bbox of data)'
@@ -25282,8 +25305,8 @@ ${svg}
         type: 'flag'
       })
       .option('calc', calcOpt)
-      .option('name', nameOpt)
       .option('target', targetOpt)
+      .option('name', nameOpt)
       .option('no-replace', noReplaceOpt);
 
     parser.command('require')
@@ -25443,7 +25466,9 @@ ${svg}
         describe: 'functions: sum() average() median() max() min() count()'
       })
       .option('where', whereOpt)
-      .option('target', targetOpt);
+      .option('target', targetOpt)
+      .option('to-layer', noReplaceOpt2)
+      .option('name', nameOpt2);
 
     parser.command('colors')
       .describe('print list of color scheme names');
@@ -25473,7 +25498,9 @@ ${svg}
       .option('save-to', {
         describe: 'name of file to save info in JSON format'
       })
-      .option('target', targetOpt);
+      .option('target', targetOpt)
+      .option('to-layer', noReplaceOpt2)
+      .option('name', nameOpt2);
 
     parser.command('inspect')
       .describe('print information about a feature')
@@ -28106,7 +28133,6 @@ ${svg}
     var files = opts.files || [];
     var dataset;
 
-    cli.checkCommandEnv('i');
     if (opts.stdin) {
       dataset = importFile('/dev/stdin', opts);
       catalog.addDataset(dataset);
@@ -28649,7 +28675,7 @@ ${svg}
   // Apply a command to an array of target layers
   function applyCommandToEachLayer(func, targetLayers) {
     var args = utils.toArray(arguments).slice(2);
-    return targetLayers.reduce(function(memo, lyr) {
+    var output = targetLayers.reduce(function(memo, lyr) {
       var result = func.apply(null, [lyr].concat(args));
       if (utils.isArray(result)) { // some commands return an array of layers
         memo = memo.concat(result);
@@ -28658,6 +28684,7 @@ ${svg}
       }
       return memo;
     }, []);
+    return output.length > 0 ? output : null;
   }
 
   function applyCommandToEachTarget(func, targets) {
@@ -35478,8 +35505,15 @@ ${svg}
   //    Returns array of matching records in src table, or null if no matches
   //
   function joinTableToLayer(destLyr, src, join, opts) {
-    var dest = destLyr.data,
-        useDuplication = !!opts.duplication,
+    var dest = destLyr.data;
+
+    if (src == dest) {
+      // self-join... duplicate source records to prevent assignment problems
+      // (in calc= expressions and possibly elsewhere)
+      src = src.clone();
+    }
+
+    var useDuplication = !!opts.duplication,
         srcRecords = src.getRecords(),
         destRecords = dest.getRecords(),
         prefix = opts.prefix || '',
@@ -35495,7 +35529,7 @@ ${svg}
         retn = {},
         srcRec, srcId, destRec, joins, count, filter, calc, i, j, n, m;
 
-    // support for duplication of destination records
+    // support for duplication of destination records for many-to-one joins
     var duplicateRecords, destShapes;
     if (useDuplication) {
       if (opts.calc) stop('duplication and calc options cannot be used together');
@@ -39150,7 +39184,7 @@ ${svg}
     var arr = layers.map(function(o) {
       return getLayerInfo(o.layer, o.dataset);
     });
-    message(formatInfo(arr));
+
     if (opts.save_to) {
       var output = [{
         filename: opts.save_to + (opts.save_to.endsWith('.json') ? '' : '.json'),
@@ -39158,6 +39192,16 @@ ${svg}
       }];
       writeFiles(output, opts);
     }
+    if (opts.to_layer) {
+      return {
+        info: {},
+        layers: [{
+          name: opts.name || 'info',
+          data: new DataTable(arr)
+        }]
+      };
+    }
+    message(formatInfo(arr));
   };
 
   cmd.printInfo = cmd.info; // old name
@@ -40658,6 +40702,19 @@ ${svg}
   // Currently the origin cell is always an "outie" (protruding); in the future
   //   "innie" origin cells may be supported
 
+  function getHexGridParams(bbox, interval, opts) {
+    opts.type != 'hex2'; // hex2 is "pointy-top" orientation
+
+    // get origin and counts for centered grid
+    // params.u0 = _getUOrigin();
+    // params.v0 = _getVOrigin();
+    // params.colCounts = _getColCounts(bbox, interval);
+    // params.rowCounts = _getRowCounts(bbox, interval);
+
+    if (opts.aligned) ;
+  }
+
+
   // interval: side length in projected coordinates
   // bbox: bounding box of area to be enclosed by grid
   //
@@ -40672,6 +40729,8 @@ ${svg}
     var _uOrigin = _getUOrigin();
     var _vOrigin = _getVOrigin();
 
+    getHexGridParams(bbox, interval, opts);
+
     function cells() {
       return _rowCounts[0] * _colCounts[0] + _rowCounts[1] * _colCounts[1];
     }
@@ -41821,7 +41880,9 @@ ${svg}
     var str = standardizeConsoleCommands(raw);
     var parsed = parseCommands(str);
     parsed.forEach(function(cmd) {
-      cli.checkCommandEnv(cmd.name);
+      if (['i', 'include', 'require', 'external'].includes(cmd.name)) {
+        stop('The ' + cmd.name + ' command cannot be run in the web console.');
+      }
     });
     return parsed;
   }
@@ -44271,7 +44332,7 @@ ${svg}
         applyCommandToEachLayer(cmd.cluster, targetLayers, arcs, opts);
 
       } else if (name == 'calc') {
-        applyCommandToEachLayer(cmd.calc, targetLayers, arcs, opts);
+        outputDataset = cmd.calc(targetLayers, arcs, opts);
 
       } else if (name == 'classify') {
         applyCommandToEachLayer(cmd.classify, targetLayers, targetDataset, opts);
@@ -44385,7 +44446,7 @@ ${svg}
         cmd.include(opts);
 
       } else if (name == 'info') {
-        cmd.info(targets, opts);
+        outputDataset = cmd.info(targets, opts);
 
       } else if (name == 'inlay') {
         outputLayers = cmd.inlay(targetLayers, source, targetDataset, opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.50",
+  "version": "0.6.52",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -76,7 +76,7 @@
   "mocha": {
     "reporter": "dot",
     "node-option": [
-      "experimental-specifier-resolution=node"
+      "experimental-loader=./test/_loader.js"
     ],
     "check-leaks": true,
     "parallel": true,

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.50";
+  var VERSION = "0.6.52";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -11259,12 +11259,6 @@
     return ss && ss.isFile() || false;
   };
 
-  cli.checkCommandEnv = function(cname) {
-    var blocked = ['i', 'include', 'require', 'external'];
-    if (runningInBrowser() && blocked.includes(cname)) {
-      stop('The -' + cname + ' command cannot be run in the browser');
-    }
-  };
 
   // cli.fileSize = function(path) {
   //   var ss = cli.statSync(path);
@@ -14580,6 +14574,18 @@
     return merged[0];
   }
 
+  cmd.calc = function(layers, arcs, opts) {
+    var arr = layers.map(lyr => applyCalcExpression(lyr, arcs, opts));
+    if (!opts.to_layer) return null;
+    return {
+      info: {},
+      layers: [{
+        name: opts.name || 'info',
+        data: new DataTable(arr)
+      }]
+    };
+  };
+
   // Calculate an expression across a group of features, print and return the result
   // Supported functions include sum(), average(), max(), min(), median(), count()
   // Functions receive an expression to be applied to each feature (like the -each command)
@@ -14587,9 +14593,9 @@
   // opts.expression  Expression to evaluate
   // opts.where  Optional filter expression (see -filter command)
   //
-  cmd.calc = function(lyr, arcs, opts) {
+  function applyCalcExpression(lyr, arcs, opts) {
     var msg = opts.expression,
-        result, compiled, defs;
+        result, compiled, defs, d;
     if (opts.where) {
       // TODO: implement no_replace option for filter() instead of this
       lyr = getLayerSelection(lyr, arcs, opts);
@@ -14600,9 +14606,17 @@
     defs = getStashedVar('defs');
     compiled = compileCalcExpression(lyr, arcs, opts.expression);
     result = compiled(null, defs);
-    message(msg + ":  " + result);
-    return result;
-  };
+    if (!opts.to_layer) {
+      message(msg + ":  " + result);
+    }
+    d = {
+      expression: opts.expression,
+      value: result
+    };
+    if (opts.where) d.where = opts.where;
+    if (lyr.name) d.layer_name = lyr.name;
+    return d;
+  }
 
   function evalCalcExpression(lyr, arcs, exp) {
     return compileCalcExpression(lyr, arcs, exp)();
@@ -14812,6 +14826,7 @@
 
   var Calc = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    applyCalcExpression: applyCalcExpression,
     evalCalcExpression: evalCalcExpression,
     compileCalcExpression: compileCalcExpression
   });
@@ -23385,9 +23400,17 @@ ${svg}
           alias: '+',
           type: 'flag',
           label: '+, no-replace', // show alias as primary option
-          // describe: 'retain the original layer(s) instead of replacing'
           describe: 'retain both input and output layer(s)'
         },
+        nameOpt2 = { // for -calc and -info
+          describe: 'name the output layer'
+        },
+        noReplaceOpt2 = { // for -calc and -info
+          alias: '+',
+          type: 'flag',
+          label: '+',
+          describe: 'save output to a new layer'
+        },
         noSnapOpt = {
           // describe: 'don't snap points before applying command'
           type: 'flag'
@@ -24366,12 +24389,12 @@ ${svg}
         describe: 'side length (e.g. 500m, 12km)',
         type: 'distance'
       })
-      // .option('cols', {
-      //   type: 'integer'
-      // })
-      // .option('rows', {
-      //   type: 'integer'
-      // })
+      .option('cols', {
+        type: 'integer'
+      })
+      .option('rows', {
+        type: 'integer'
+      })
       // .option('bbox', {
       //   type: 'bbox',
       //   describe: 'xmin,ymin,xmax,ymax (default is bbox of data)'
@@ -25282,8 +25305,8 @@ ${svg}
         type: 'flag'
       })
       .option('calc', calcOpt)
-      .option('name', nameOpt)
       .option('target', targetOpt)
+      .option('name', nameOpt)
       .option('no-replace', noReplaceOpt);
 
     parser.command('require')
@@ -25443,7 +25466,9 @@ ${svg}
         describe: 'functions: sum() average() median() max() min() count()'
       })
       .option('where', whereOpt)
-      .option('target', targetOpt);
+      .option('target', targetOpt)
+      .option('to-layer', noReplaceOpt2)
+      .option('name', nameOpt2);
 
     parser.command('colors')
       .describe('print list of color scheme names');
@@ -25473,7 +25498,9 @@ ${svg}
       .option('save-to', {
         describe: 'name of file to save info in JSON format'
       })
-      .option('target', targetOpt);
+      .option('target', targetOpt)
+      .option('to-layer', noReplaceOpt2)
+      .option('name', nameOpt2);
 
     parser.command('inspect')
       .describe('print information about a feature')
@@ -28106,7 +28133,6 @@ ${svg}
     var files = opts.files || [];
     var dataset;
 
-    cli.checkCommandEnv('i');
     if (opts.stdin) {
       dataset = importFile('/dev/stdin', opts);
       catalog.addDataset(dataset);
@@ -28649,7 +28675,7 @@ ${svg}
   // Apply a command to an array of target layers
   function applyCommandToEachLayer(func, targetLayers) {
     var args = utils.toArray(arguments).slice(2);
-    return targetLayers.reduce(function(memo, lyr) {
+    var output = targetLayers.reduce(function(memo, lyr) {
       var result = func.apply(null, [lyr].concat(args));
       if (utils.isArray(result)) { // some commands return an array of layers
         memo = memo.concat(result);
@@ -28658,6 +28684,7 @@ ${svg}
       }
       return memo;
     }, []);
+    return output.length > 0 ? output : null;
   }
 
   function applyCommandToEachTarget(func, targets) {
@@ -35478,8 +35505,15 @@ ${svg}
   //    Returns array of matching records in src table, or null if no matches
   //
   function joinTableToLayer(destLyr, src, join, opts) {
-    var dest = destLyr.data,
-        useDuplication = !!opts.duplication,
+    var dest = destLyr.data;
+
+    if (src == dest) {
+      // self-join... duplicate source records to prevent assignment problems
+      // (in calc= expressions and possibly elsewhere)
+      src = src.clone();
+    }
+
+    var useDuplication = !!opts.duplication,
         srcRecords = src.getRecords(),
         destRecords = dest.getRecords(),
         prefix = opts.prefix || '',
@@ -35495,7 +35529,7 @@ ${svg}
         retn = {},
         srcRec, srcId, destRec, joins, count, filter, calc, i, j, n, m;
 
-    // support for duplication of destination records
+    // support for duplication of destination records for many-to-one joins
     var duplicateRecords, destShapes;
     if (useDuplication) {
       if (opts.calc) stop('duplication and calc options cannot be used together');
@@ -39150,7 +39184,7 @@ ${svg}
     var arr = layers.map(function(o) {
       return getLayerInfo(o.layer, o.dataset);
     });
-    message(formatInfo(arr));
+
     if (opts.save_to) {
       var output = [{
         filename: opts.save_to + (opts.save_to.endsWith('.json') ? '' : '.json'),
@@ -39158,6 +39192,16 @@ ${svg}
       }];
       writeFiles(output, opts);
     }
+    if (opts.to_layer) {
+      return {
+        info: {},
+        layers: [{
+          name: opts.name || 'info',
+          data: new DataTable(arr)
+        }]
+      };
+    }
+    message(formatInfo(arr));
   };
 
   cmd.printInfo = cmd.info; // old name
@@ -40658,6 +40702,19 @@ ${svg}
   // Currently the origin cell is always an "outie" (protruding); in the future
   //   "innie" origin cells may be supported
 
+  function getHexGridParams(bbox, interval, opts) {
+    opts.type != 'hex2'; // hex2 is "pointy-top" orientation
+
+    // get origin and counts for centered grid
+    // params.u0 = _getUOrigin();
+    // params.v0 = _getVOrigin();
+    // params.colCounts = _getColCounts(bbox, interval);
+    // params.rowCounts = _getRowCounts(bbox, interval);
+
+    if (opts.aligned) ;
+  }
+
+
   // interval: side length in projected coordinates
   // bbox: bounding box of area to be enclosed by grid
   //
@@ -40672,6 +40729,8 @@ ${svg}
     var _uOrigin = _getUOrigin();
     var _vOrigin = _getVOrigin();
 
+    getHexGridParams(bbox, interval, opts);
+
     function cells() {
       return _rowCounts[0] * _colCounts[0] + _rowCounts[1] * _colCounts[1];
     }
@@ -41821,7 +41880,9 @@ ${svg}
     var str = standardizeConsoleCommands(raw);
     var parsed = parseCommands(str);
     parsed.forEach(function(cmd) {
-      cli.checkCommandEnv(cmd.name);
+      if (['i', 'include', 'require', 'external'].includes(cmd.name)) {
+        stop('The ' + cmd.name + ' command cannot be run in the web console.');
+      }
     });
     return parsed;
   }
@@ -44271,7 +44332,7 @@ ${svg}
         applyCommandToEachLayer(cmd.cluster, targetLayers, arcs, opts);
 
       } else if (name == 'calc') {
-        applyCommandToEachLayer(cmd.calc, targetLayers, arcs, opts);
+        outputDataset = cmd.calc(targetLayers, arcs, opts);
 
       } else if (name == 'classify') {
         applyCommandToEachLayer(cmd.classify, targetLayers, targetDataset, opts);
@@ -44385,7 +44446,7 @@ ${svg}
         cmd.include(opts);
 
       } else if (name == 'info') {
-        cmd.info(targets, opts);
+        outputDataset = cmd.info(targets, opts);
 
       } else if (name == 'inlay') {
         outputLayers = cmd.inlay(targetLayers, source, targetDataset, opts);