mapshaper 0.6.7 → 0.6.9

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.7";
+  var VERSION = "0.6.9";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -9809,6 +9809,30 @@
     }
 
     if (hasPaths) {
+
+      ctx.bboxContainsPoint = function(x, y) {
+        var bounds = arcs.getMultiShapeBounds(_ids);
+        return bounds.containsPoint(x, y);
+      };
+
+      ctx.bboxIntersectsRectangle = function(a, b, c, d) {
+        var bbox = arcs.getMultiShapeBounds(_ids);
+        var rect = Bounds.from(a, b, c, d);
+        return rect.intersects(bbox);
+      };
+
+      ctx.bboxContainsRectangle = function(a, b, c, d) {
+        var bbox = arcs.getMultiShapeBounds(_ids);
+        var rect = Bounds.from(a, b, c, d);
+        return bbox.contains(rect);
+      };
+
+      ctx.bboxContainedByRectangle = function(a, b, c, d) {
+        var bbox = arcs.getMultiShapeBounds(_ids);
+        var rect = Bounds.from(a, b, c, d);
+        return rect.contains(bbox);
+      };
+
       addGetters(ctx, {
         // TODO: count hole/s + containing ring as one part
         partCount: function() {
@@ -14850,6 +14874,7 @@
         href: d.href || ''
       }
     };
+    if (d.fill) o.properties.fill = d.fill;
     return o;
   }
 
@@ -19564,6 +19589,10 @@ ${svg}
         describe: 'a pair of values (0-100) for limiting a color ramp',
         type: 'numbers'
       })
+      .option('range', {
+        // describe: 'a pair of numbers defining the effective data range',
+        type: 'numbers'
+      })
       .option('null-value', {
         describe: 'value (or color) to use for invalid or missing data'
       })
@@ -29917,10 +29946,25 @@ ${svg}
     }
 
     var ascending = getAscendingNumbers(dataValues);
+    if (opts.range) {
+      ascending = applyDataRange(ascending, opts.range);
+    }
     var nullCount = dataValues.length - ascending.length;
     var minVal = ascending[0];
     var maxVal = ascending[ascending.length - 1];
 
+    // kludge
+    var clamp = opts.range ? function(val) {
+      if (val < opts.range[0]) val = opts.range[0];
+      if (val > opts.range[1]) val = opts.range[1];
+      return val;
+    } : null;
+
+    if (opts.range) {
+      minVal = opts.range[0];
+      maxVal = opts.range[1];
+    }
+
     if (numBreaks === 0) {
       breaks = [];
     } else if (opts.breaks) {
@@ -29948,6 +29992,7 @@ ${svg}
     }
     classToValue = getOutputFunction(classValues, nullValue, opts);
     classifier = function(val) {
+      if (clamp) val = clamp(val);
       return classToValue(dataToClass(val));
     };
 
@@ -30132,6 +30177,26 @@ ${svg}
     return arr;
   }
 
+  function applyDataRange(values, range) {
+    var minval = range[0];
+    var maxval = range[1];
+    if (maxval > minval === false) {
+      stop('Invalid data range:', range);
+    }
+    var values2 = values.map(function(val) {
+      if (val < minval) val = minval;
+      if (val > maxval) val = maxval;
+      return val;
+    });
+    if (values2[0] < minval) {
+      values2.unshift(minval);
+    }
+    if (values2[values2.length - 1] < maxval) {
+      values2.push(maxval);
+    }
+    return values2;
+  }
+
   function getAscendingNumbers(values) {
     var numbers = values.filter(utils.isFiniteNumber);
     utils.genericSort(numbers, true);

package/package.json

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

package/www/mapshaper-gui.js

@@ -1187,7 +1187,13 @@
       // FF: supports pasting JSON and CSV from the clipboard but not files.
       //     Single files of all types are pasted as a string and an image/png
       //     Multiple files are pasted as a string containing a list of file names
-      if (types == 'text/plain') {
+
+      // import text from the clipboard (could be csv, json, etc)
+      // formatted text can be available as both text/plain and text/html (e.g.
+      //   a JSON data object copied from a GitHub issue).
+      //
+      if (types.includes('text/plain')) {
+      // if (types == 'text/plain') {
         // text from clipboard (supported by Chrome, FF, Safari)
         // TODO: handle FF case of string containing multiple file names.
         files = [pastedTextToFile(e.clipboardData.getData('text/plain'))];
@@ -7698,6 +7704,7 @@
       var node2;
       o.properties.transform = getSvgSymbolTransform(xy, ext);
       o.properties['data-id'] = id;
+      o.properties.class = 'mapshaper-svg-symbol';
       // o.properties['class'] = 'selected';
       g.innerHTML = internal.svg.stringify(o);
       node2 = g.firstChild;

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.7";
+  var VERSION = "0.6.9";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -9809,6 +9809,30 @@
     }
 
     if (hasPaths) {
+
+      ctx.bboxContainsPoint = function(x, y) {
+        var bounds = arcs.getMultiShapeBounds(_ids);
+        return bounds.containsPoint(x, y);
+      };
+
+      ctx.bboxIntersectsRectangle = function(a, b, c, d) {
+        var bbox = arcs.getMultiShapeBounds(_ids);
+        var rect = Bounds.from(a, b, c, d);
+        return rect.intersects(bbox);
+      };
+
+      ctx.bboxContainsRectangle = function(a, b, c, d) {
+        var bbox = arcs.getMultiShapeBounds(_ids);
+        var rect = Bounds.from(a, b, c, d);
+        return bbox.contains(rect);
+      };
+
+      ctx.bboxContainedByRectangle = function(a, b, c, d) {
+        var bbox = arcs.getMultiShapeBounds(_ids);
+        var rect = Bounds.from(a, b, c, d);
+        return rect.contains(bbox);
+      };
+
       addGetters(ctx, {
         // TODO: count hole/s + containing ring as one part
         partCount: function() {
@@ -14850,6 +14874,7 @@
         href: d.href || ''
       }
     };
+    if (d.fill) o.properties.fill = d.fill;
     return o;
   }
 
@@ -19564,6 +19589,10 @@ ${svg}
         describe: 'a pair of values (0-100) for limiting a color ramp',
         type: 'numbers'
       })
+      .option('range', {
+        // describe: 'a pair of numbers defining the effective data range',
+        type: 'numbers'
+      })
       .option('null-value', {
         describe: 'value (or color) to use for invalid or missing data'
       })
@@ -29917,10 +29946,25 @@ ${svg}
     }
 
     var ascending = getAscendingNumbers(dataValues);
+    if (opts.range) {
+      ascending = applyDataRange(ascending, opts.range);
+    }
     var nullCount = dataValues.length - ascending.length;
     var minVal = ascending[0];
     var maxVal = ascending[ascending.length - 1];
 
+    // kludge
+    var clamp = opts.range ? function(val) {
+      if (val < opts.range[0]) val = opts.range[0];
+      if (val > opts.range[1]) val = opts.range[1];
+      return val;
+    } : null;
+
+    if (opts.range) {
+      minVal = opts.range[0];
+      maxVal = opts.range[1];
+    }
+
     if (numBreaks === 0) {
       breaks = [];
     } else if (opts.breaks) {
@@ -29948,6 +29992,7 @@ ${svg}
     }
     classToValue = getOutputFunction(classValues, nullValue, opts);
     classifier = function(val) {
+      if (clamp) val = clamp(val);
       return classToValue(dataToClass(val));
     };
 
@@ -30132,6 +30177,26 @@ ${svg}
     return arr;
   }
 
+  function applyDataRange(values, range) {
+    var minval = range[0];
+    var maxval = range[1];
+    if (maxval > minval === false) {
+      stop('Invalid data range:', range);
+    }
+    var values2 = values.map(function(val) {
+      if (val < minval) val = minval;
+      if (val > maxval) val = maxval;
+      return val;
+    });
+    if (values2[0] < minval) {
+      values2.unshift(minval);
+    }
+    if (values2[values2.length - 1] < maxval) {
+      values2.push(maxval);
+    }
+    return values2;
+  }
+
   function getAscendingNumbers(values) {
     var numbers = values.filter(utils.isFiniteNumber);
     utils.genericSort(numbers, true);