mapshaper 0.6.84 → 0.6.86

package/mapshaper.js

@@ -25429,8 +25429,11 @@ ${svg}
       .option('no-replace', noReplaceOpt);
 
     parser.command('rectangles')
-      .describe('create a rectangle around each feature in a layer')
+      .describe('create a rectangle for each feature in a layer')
       .option('offset', offsetOpt)
+      .option('bbox', {
+        describe: 'Use an expression to generate a rectangle for each feature'
+      })
       .option('aspect-ratio', aspectRatioOpt)
       .option('name', nameOpt)
       .option('target', targetOpt)
@@ -38806,18 +38809,20 @@ ${svg}
 
   // Create rectangles around each feature in a layer
   cmd.rectangles = function(targetLyr, targetDataset, opts) {
-    if (!layerHasGeometry(targetLyr)) {
-      stop("Layer is missing geometric shapes");
-    }
     var crsInfo = getDatasetCrsInfo(targetDataset);
     var records = targetLyr.data ? targetLyr.data.getRecords() : null;
-    var geometries = targetLyr.shapes.map(function(shp) {
-      var bounds = targetLyr.geometry_type == 'point' ?
-        getPointFeatureBounds(shp) : targetDataset.arcs.getMultiShapeBounds(shp);
-      bounds = applyRectangleOptions(bounds, crsInfo.crs, opts);
-      if (!bounds) return null;
-      return bboxToPolygon(bounds.toArray(), opts);
-    });
+    var geometries;
+
+    if (opts.bbox) {
+      geometries = bboxExpressionToGeometries(opts.bbox, targetLyr, targetDataset);
+
+    } else {
+      if (!layerHasGeometry(targetLyr)) {
+        stop("Layer is missing geometric shapes");
+      }
+      geometries = shapesToBoxGeometries(targetLyr, targetDataset, opts);
+    }
+
     var geojson = {
       type: 'FeatureCollection',
       features: geometries.map(function(geom, i) {
@@ -38839,6 +38844,39 @@ ${svg}
     return outputLayers;
   };
 
+  function shapesToBoxGeometries(lyr, dataset, opts) {
+    var crsInfo = getDatasetCrsInfo(dataset);
+    return lyr.shapes.map(function(shp) {
+      var bounds = lyr.geometry_type == 'point' ?
+        getPointFeatureBounds(shp) : dataset.arcs.getMultiShapeBounds(shp);
+      bounds = applyRectangleOptions(bounds, crsInfo.crs, opts);
+      if (!bounds) return null;
+      return bboxToPolygon(bounds.toArray(), opts);
+    });
+  }
+
+  function bboxExpressionToGeometries(exp, lyr, dataset, opts) {
+    var compiled = compileFeatureExpression(exp, lyr, dataset.arcs, {});
+    var n = getFeatureCount(lyr);
+    var result;
+    var geometries = [];
+    for (var i=0; i<n; i++) {
+      result = compiled(i);
+      if (!looksLikeBbox(result)) {
+        stop('Invalid bbox value (expected a GeoJSON-type bbox):', result);
+      }
+      geometries.push(bboxToPolygon(result));
+    }
+    return geometries;
+  }
+
+  function looksLikeBbox(o) {
+    if (!o || o.length != 4) return false;
+    if (o.some(isNaN)) return false;
+    if (o[0] <= o[2] == false || o[1] <= o[3] == false) return false;
+    return true;
+  }
+
   // Create rectangles around one or more target layers
   //
   cmd.rectangle2 = function(target, opts) {
@@ -45536,7 +45574,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.84";
+  var version = "0.6.86";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.

package/package.json

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

package/www/mapshaper-gui.js

@@ -2428,7 +2428,7 @@
     function error() {
       var msg = GUI.formatMessageArgs(arguments);
       console.error(msg);
-      gui.alert('An unkown error occured');
+      gui.alert('An unknown error occured');
       throw new Error(msg);
     }
 
@@ -8817,7 +8817,9 @@
       }
     });
     element.addEventListener('contextmenu', function(e) {
-      _self.dispatchEvent('contextmenu', procMouseEvent(e));
+      if (!e.ctrlKey) {
+        _self.dispatchEvent('contextmenu', procMouseEvent(e));
+      }
     });
 
     this.enable = function() {
@@ -10404,12 +10406,12 @@
       } else {
         deleteLastVertex(target);
       }
-      if (getLastArcLength(target) < 2) {
-        gui.undo.undo(); // remove the path
-      }
       if (e.shapes) {
         replaceDrawnShapes(e.shapes);
       }
+      if (getLastArcLength(target) < 2) {
+        gui.undo.undo(); // remove the path
+      }
     });
 
     function turnOn() {

package/www/mapshaper.js

@@ -25429,8 +25429,11 @@ ${svg}
       .option('no-replace', noReplaceOpt);
 
     parser.command('rectangles')
-      .describe('create a rectangle around each feature in a layer')
+      .describe('create a rectangle for each feature in a layer')
       .option('offset', offsetOpt)
+      .option('bbox', {
+        describe: 'Use an expression to generate a rectangle for each feature'
+      })
       .option('aspect-ratio', aspectRatioOpt)
       .option('name', nameOpt)
       .option('target', targetOpt)
@@ -38806,18 +38809,20 @@ ${svg}
 
   // Create rectangles around each feature in a layer
   cmd.rectangles = function(targetLyr, targetDataset, opts) {
-    if (!layerHasGeometry(targetLyr)) {
-      stop("Layer is missing geometric shapes");
-    }
     var crsInfo = getDatasetCrsInfo(targetDataset);
     var records = targetLyr.data ? targetLyr.data.getRecords() : null;
-    var geometries = targetLyr.shapes.map(function(shp) {
-      var bounds = targetLyr.geometry_type == 'point' ?
-        getPointFeatureBounds(shp) : targetDataset.arcs.getMultiShapeBounds(shp);
-      bounds = applyRectangleOptions(bounds, crsInfo.crs, opts);
-      if (!bounds) return null;
-      return bboxToPolygon(bounds.toArray(), opts);
-    });
+    var geometries;
+
+    if (opts.bbox) {
+      geometries = bboxExpressionToGeometries(opts.bbox, targetLyr, targetDataset);
+
+    } else {
+      if (!layerHasGeometry(targetLyr)) {
+        stop("Layer is missing geometric shapes");
+      }
+      geometries = shapesToBoxGeometries(targetLyr, targetDataset, opts);
+    }
+
     var geojson = {
       type: 'FeatureCollection',
       features: geometries.map(function(geom, i) {
@@ -38839,6 +38844,39 @@ ${svg}
     return outputLayers;
   };
 
+  function shapesToBoxGeometries(lyr, dataset, opts) {
+    var crsInfo = getDatasetCrsInfo(dataset);
+    return lyr.shapes.map(function(shp) {
+      var bounds = lyr.geometry_type == 'point' ?
+        getPointFeatureBounds(shp) : dataset.arcs.getMultiShapeBounds(shp);
+      bounds = applyRectangleOptions(bounds, crsInfo.crs, opts);
+      if (!bounds) return null;
+      return bboxToPolygon(bounds.toArray(), opts);
+    });
+  }
+
+  function bboxExpressionToGeometries(exp, lyr, dataset, opts) {
+    var compiled = compileFeatureExpression(exp, lyr, dataset.arcs, {});
+    var n = getFeatureCount(lyr);
+    var result;
+    var geometries = [];
+    for (var i=0; i<n; i++) {
+      result = compiled(i);
+      if (!looksLikeBbox(result)) {
+        stop('Invalid bbox value (expected a GeoJSON-type bbox):', result);
+      }
+      geometries.push(bboxToPolygon(result));
+    }
+    return geometries;
+  }
+
+  function looksLikeBbox(o) {
+    if (!o || o.length != 4) return false;
+    if (o.some(isNaN)) return false;
+    if (o[0] <= o[2] == false || o[1] <= o[3] == false) return false;
+    return true;
+  }
+
   // Create rectangles around one or more target layers
   //
   cmd.rectangle2 = function(target, opts) {
@@ -45536,7 +45574,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.84";
+  var version = "0.6.86";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.

package/www/page.css

@@ -1193,8 +1193,8 @@ div.basemap-style-btn.active {
 }
 
 .basemap-style-btn.basemap-overlay-btn {
-	width: 35px;
-	height: 35px;
+	width: 40px;
+	height: 40px;
 	margin: 3px;
 	overflow: hidden;
 	display: inline-block;