mapshaper 0.6.73 → 0.6.74

package/mapshaper.js

@@ -5553,43 +5553,35 @@
     }
 
     function initBounds() {
-      var data = calcArcBounds2(_xx, _yy, _nn);
-      _bb = data.bb;
-      _allBounds = data.bounds;
-    }
-
-    function calcArcBounds2(xx, yy, nn) {
-      var numArcs = nn.length,
-          bb = new Float64Array(numArcs * 4),
-          bounds = new Bounds(),
-          arcOffs = 0,
-          arcLen,
-          j, b;
+      var numArcs = _nn.length;
+      _bb = new Float64Array(numArcs * 4);
+      _allBounds = new Bounds();
       for (var i=0; i<numArcs; i++) {
-        arcLen = nn[i];
-        if (arcLen > 0) {
-          j = i * 4;
-          b = calcArcBounds(xx, yy, arcOffs, arcLen);
-          bb[j++] = b[0];
-          bb[j++] = b[1];
-          bb[j++] = b[2];
-          bb[j] = b[3];
-          arcOffs += arcLen;
-          bounds.mergeBounds(b);
-        }
+        initArcBounds(i);
       }
-      return {
-        bb: bb,
-        bounds: bounds
-      };
     }
 
+    function initArcBounds(i) {
+      var arcLen = _nn[i];
+      var arcOffs = _ii[i];
+      var j = i * 4;
+      var b = calcArcBounds(_xx, _yy, arcOffs, arcLen);
+      _bb[j++] = b[0];
+      _bb[j++] = b[1];
+      _bb[j++] = b[2];
+      _bb[j] = b[3];
+      _allBounds.mergeBounds(b);
+    }
+
+    this.updateArcBounds = function(arcId) {
+      initArcBounds(arcId);
+    };
+
     this.updateVertexData = function(nn, xx, yy, zz) {
       initXYData(nn, xx, yy);
       initZData(zz || null);
     };
 
-
     this.getCopy = function() {
       var copy = new ArcCollection(new Int32Array(_nn), new Float64Array(_xx),
           new Float64Array(_yy));
@@ -13194,13 +13186,14 @@
 
 
   function snapVerticesToPoint(ids, p, arcs, final) {
+    var data = arcs.getVertexData();
     ids.forEach(function(idx) {
+      if (final) {
+        // recalculate bounding box for arc
+        arcs.updateArcBounds(findArcIdFromVertexId(idx, data.ii));
+      }
       setVertexCoords(p[0], p[1], idx, arcs);
     });
-    if (final) {
-      // kludge to get dataset to recalculate internal bounding boxes
-      arcs.transformPoints(function() {});
-    }
   }
 
 
@@ -45492,7 +45485,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.73";
+  var version = "0.6.74";
 
   // 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.73",
+  "version": "0.6.74",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/mapshaper-gui.js

@@ -9262,6 +9262,7 @@
       } else {
         rec = getMultiRecord(recIds, table);
       }
+      rec = rec || {};
       utils$1.forEachProperty(rec, function(v, k) {
         // missing GeoJSON fields are set to undefined on import; skip these
         if (v === undefined) return;
@@ -9817,18 +9818,20 @@
     function finishPolygons() {
       // step1: make a polyline layer containing just newly drawn paths
       var target = hit.getHitTarget();
-      if (target.arcs.size() <= initialArcCount) return; // no paths added
+      var newShapeCount = target.arcs.size() - initialArcCount;
+      if (newShapeCount <= 0) return; // no paths added
       var polygonLyr = target.source.layer;
       var polygonRecords = polygonLyr.data ? polygonLyr.data.getRecords() : null;
+      var initialShapeCount = polygonLyr.shapes.length - newShapeCount;
       var templateRecord;
       if (polygonRecords) {
         // use one of the newly created records as a template (they should all be the same)
         templateRecord = polygonRecords.pop();
-        polygonRecords.splice(initialArcCount); // remove new records
+        polygonRecords.splice(initialShapeCount); // remove new records
       }
       var polylineLyr = {
         geometry_type: 'polyline',
-        shapes: polygonLyr.shapes.splice(initialArcCount) // move new shapes to polyline layer
+        shapes: polygonLyr.shapes.splice(initialShapeCount) // move new shapes to polyline layer
       };
 
       // step2: convert polylines to polygons
@@ -9840,9 +9843,10 @@
 
       // step3: add new polygons to the original polygons
       outputLayers[0].shapes.forEach(function(shp) {
+        var rec = polygonRecords ? internal.copyRecord(templateRecord) : null;
         polygonLyr.shapes.push(shp);
         if (polygonRecords) {
-          polygonRecords.push(internal.copyRecord(templateRecord));
+          polygonRecords.push(rec);
         }
       });
 
@@ -11760,6 +11764,10 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     // Only generate low-detail arcs for larger datasets
     if (size > 5e5) {
+      update();
+    }
+
+    function update() {
       if (unfilteredArcs.getVertexData().zz) {
         // Use precalculated simplification data for vertex filtering, if available
         filteredArcs = initFilteredArcs(unfilteredArcs);
@@ -11783,6 +11791,14 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     // TODO: better job of detecting arc change... e.g. revision number
     unfilteredArcs.getScaledArcs = function(ext) {
+      // check for changes in the number of arcs (probably due to editing)
+      if (filteredArcs && filteredArcs.size() != unfilteredArcs.size()) {
+        // arc count has changed... probably due to editing
+        update();
+        if (filteredArcs.size() != unfilteredArcs.size()) {
+          throw Error('Internal error');
+        }
+      }
       if (filteredArcs) {
         // match simplification of unfiltered arcs
         filteredArcs.setRetainedInterval(unfilteredArcs.getRetainedInterval());
@@ -12490,7 +12506,8 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     }
 
     function getStrictBounds() {
-      if (internal.isWebMercator(map.getDisplayCRS())) {
+      // if (internal.isWebMercator(map.getDisplayCRS())) {
+      if (_dynamicCRS && internal.isWebMercator(map.getDisplayCRS())) {
         return getMapboxBounds();
       }
       return null;

package/www/mapshaper.js

@@ -5553,43 +5553,35 @@
     }
 
     function initBounds() {
-      var data = calcArcBounds2(_xx, _yy, _nn);
-      _bb = data.bb;
-      _allBounds = data.bounds;
-    }
-
-    function calcArcBounds2(xx, yy, nn) {
-      var numArcs = nn.length,
-          bb = new Float64Array(numArcs * 4),
-          bounds = new Bounds(),
-          arcOffs = 0,
-          arcLen,
-          j, b;
+      var numArcs = _nn.length;
+      _bb = new Float64Array(numArcs * 4);
+      _allBounds = new Bounds();
       for (var i=0; i<numArcs; i++) {
-        arcLen = nn[i];
-        if (arcLen > 0) {
-          j = i * 4;
-          b = calcArcBounds(xx, yy, arcOffs, arcLen);
-          bb[j++] = b[0];
-          bb[j++] = b[1];
-          bb[j++] = b[2];
-          bb[j] = b[3];
-          arcOffs += arcLen;
-          bounds.mergeBounds(b);
-        }
+        initArcBounds(i);
       }
-      return {
-        bb: bb,
-        bounds: bounds
-      };
     }
 
+    function initArcBounds(i) {
+      var arcLen = _nn[i];
+      var arcOffs = _ii[i];
+      var j = i * 4;
+      var b = calcArcBounds(_xx, _yy, arcOffs, arcLen);
+      _bb[j++] = b[0];
+      _bb[j++] = b[1];
+      _bb[j++] = b[2];
+      _bb[j] = b[3];
+      _allBounds.mergeBounds(b);
+    }
+
+    this.updateArcBounds = function(arcId) {
+      initArcBounds(arcId);
+    };
+
     this.updateVertexData = function(nn, xx, yy, zz) {
       initXYData(nn, xx, yy);
       initZData(zz || null);
     };
 
-
     this.getCopy = function() {
       var copy = new ArcCollection(new Int32Array(_nn), new Float64Array(_xx),
           new Float64Array(_yy));
@@ -13194,13 +13186,14 @@
 
 
   function snapVerticesToPoint(ids, p, arcs, final) {
+    var data = arcs.getVertexData();
     ids.forEach(function(idx) {
+      if (final) {
+        // recalculate bounding box for arc
+        arcs.updateArcBounds(findArcIdFromVertexId(idx, data.ii));
+      }
       setVertexCoords(p[0], p[1], idx, arcs);
     });
-    if (final) {
-      // kludge to get dataset to recalculate internal bounding boxes
-      arcs.transformPoints(function() {});
-    }
   }
 
 
@@ -45492,7 +45485,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.73";
+  var version = "0.6.74";
 
   // 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.