mapshaper 0.6.7 → 0.6.10

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.7";
+  var VERSION = "0.6.10";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -8470,7 +8470,9 @@
   function getBoundsPrecisionForDisplay(bbox) {
     var w = Math.abs(bbox[2] - bbox[0]),
         h = Math.abs(bbox[3] - bbox[1]),
-        range = Math.min(w, h) + 1e-8,
+        // switched to max bound, based on experience with shift-drag box info
+        // range = Math.min(w, h) + 1e-8,
+        range = Math.max(w, h) + 1e-8,
         digits = 0;
     while (range < 2000) {
       range *= 10;
@@ -9809,6 +9811,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 +14876,7 @@
         href: d.href || ''
       }
     };
+    if (d.fill) o.properties.fill = d.fill;
     return o;
   }
 
@@ -19564,6 +19591,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 +29948,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 +29994,7 @@ ${svg}
     }
     classToValue = getOutputFunction(classValues, nullValue, opts);
     classifier = function(val) {
+      if (clamp) val = clamp(val);
       return classToValue(dataToClass(val));
     };
 
@@ -30132,6 +30179,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/www/page.css

@@ -184,6 +184,7 @@ body {
 
 .selection-tool-options .info-box {
 	pointer-events: initial;
+	text-align: center;
 }
 
 /* --- Box tool dialog --------- */
@@ -200,6 +201,7 @@ body {
 }
 
 .box-tool-options .box-coords {
+	margin-top: 7px;
 	pointer-events: initial;
 }
 
@@ -1241,8 +1243,14 @@ div.basemap-style-btn.active img {
 	pointer-events: none;
 }
 
-.zoom-box.zooming {
-	border-color: #1385B7;
+.zoom-box .handle {
+	position: absolute;
+	z-index: 16;
+	/* cursor: pointer; */
+	background: #cc6acc;
+	pointer-events: all;
+	width: 6px;
+	height: 6px;
 }
 
 /* Simplification control ------------ */