mapshaper 0.5.92 → 0.5.93

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.91";
+  var VERSION = "0.5.92";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -994,15 +994,23 @@
   }
 
   function copyElements(src, i, dest, j, n, rev) {
-    if (src === dest && j > i) error ("copy error");
+    var same = src == dest || src.buffer && src.buffer == dest.buffer;
     var inc = 1,
-        offs = 0;
+        offs = 0,
+        k;
     if (rev) {
+      if (same) error('copy error');
       inc = -1;
       offs = n - 1;
     }
-    for (var k=0; k<n; k++, offs += inc) {
-      dest[k + j] = src[i + offs];
+    if (same && j > i) {
+      for (k=n-1; k>=0; k--) {
+        dest[j + k] = src[i + k];
+      }
+    } else {
+      for (k=0; k<n; k++, offs += inc) {
+        dest[k + j] = src[i + offs];
+      }
     }
   }
 
@@ -1756,6 +1764,69 @@
     return [xmin, ymin, xmax, ymax];
   }
 
+  function deleteVertex(arcs, i) {
+    var data = arcs.getVertexData();
+    var nn = data.nn;
+    var n = data.xx.length;
+    // avoid re-allocating memory
+    var xx2 = new Float64Array(data.xx.buffer, 0, n-1);
+    var yy2 = new Float64Array(data.yy.buffer, 0, n-1);
+    var count = 0;
+    var found = false;
+    for (var j=0; j<nn.length; j++) {
+      count += nn[j];
+      if (count >= i && !found) { // TODO: confirm this
+        nn[j] = nn[j] - 1;
+        found = true;
+      }
+    }
+    utils.copyElements(data.xx, 0, xx2, 0, i);
+    utils.copyElements(data.yy, 0, yy2, 0, i);
+    utils.copyElements(data.xx, i+1, xx2, i, n-i-1);
+    utils.copyElements(data.yy, i+1, yy2, i, n-i-1);
+    arcs.updateVertexData(nn, xx2, yy2, null);
+  }
+
+  function insertVertex(arcs, i, p) {
+    // TODO: add extra bytes to the buffers, to reduce new memory allocation
+    var data = arcs.getVertexData();
+    var nn = data.nn;
+    var n = data.xx.length;
+    var count = 0;
+    var found = false;
+    var xx2, yy2;
+    // avoid re-allocating memory on each insertion
+    if (data.xx.buffer.byteLength >= data.xx.length * 8 + 8) {
+      xx2 = new Float64Array(data.xx.buffer, 0, n+1);
+      yy2 = new Float64Array(data.yy.buffer, 0, n+1);
+    } else {
+      xx2 = new Float64Array(new ArrayBuffer((n + 20) * 8), 0, n+1);
+      yy2 = new Float64Array(new ArrayBuffer((n + 20) * 8), 0, n+1);
+    }
+    for (var j=0; j<nn.length; j++) {
+      count += nn[j];
+      if (count >= i && !found) { // TODO: confirm this
+        nn[j] = nn[j] + 1;
+        found = true;
+      }
+    }
+    utils.copyElements(data.xx, 0, xx2, 0, i);
+    utils.copyElements(data.yy, 0, yy2, 0, i);
+    utils.copyElements(data.xx, i, xx2, i+1, n-i);
+    utils.copyElements(data.yy, i, yy2, i+1, n-i);
+    xx2[i] = p[0];
+    yy2[i] = p[1];
+    arcs.updateVertexData(nn, xx2, yy2, null);
+  }
+
+  var ArcUtils = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    absArcId: absArcId,
+    calcArcBounds: calcArcBounds,
+    deleteVertex: deleteVertex,
+    insertVertex: insertVertex
+  });
+
   var WGS84 = {
     // https://en.wikipedia.org/wiki/Earth_radius
     SEMIMAJOR_AXIS: 6378137,
@@ -4922,6 +4993,7 @@
     this._n = 0;
     this.x = 0;
     this.y = 0;
+    this.i = -1;
   }
 
   ShapeIter.prototype.hasNext = function() {
@@ -4932,6 +5004,7 @@
     if (arc.hasNext()) {
       this.x = arc.x;
       this.y = arc.y;
+      this.i = arc.i;
       return true;
     }
     this.nextArc();
@@ -5498,6 +5571,8 @@
       }
     };
 
+    this.isFlat = function() { return !_zz; };
+
     this.getRetainedInterval = function() {
       return _zlimit;
     };
@@ -23447,7 +23522,16 @@ ${svg}
     // should be in gui-model.js, moved here for testing
     this.getActiveLayer = function() {
       var targ = (this.getDefaultTargets() || [])[0];
-      return targ ? {layer: targ.layers[0], dataset: targ.dataset} : null;
+      // var lyr = targ.layers[0];
+      // Reasons to select the last layer of a multi-layer target:
+      // * This layer was imported last
+      // * This layer is displayed on top of other layers
+      // * This layer is at the top of the layers list
+      // * In TopoJSON input, it makes sense to think of the last object/layer
+      //   as the topmost one -- it corresponds to the painter's algorithm and
+      //   the way that objects are ordered in SVG.
+      var lyr = targ.layers[targ.layers.length - 1];
+      return targ ? {layer: lyr, dataset: targ.dataset} : null;
     };
 
     function layerObject(lyr, dataset) {
@@ -34968,16 +35052,7 @@ ${svg}
     return findVertexIds(p2.x, p2.y, arcs);
   }
 
-  // Given a location @p (e.g. corresponding to the mouse pointer location),
-  // find the midpoint of two vertices on @shp suitable for inserting a new vertex,
-  // but only if:
-  //   1. point @p is closer to the midpoint than either adjacent vertex
-  //   2. the segment containing @p is longer than a minimum distance in pixels.
-  //
-  function findInsertionPoint(p, shp, arcs, pixelSize) {
-    var p2 = findNearestVertex(p[0], p[1], shp, arcs);
 
-  }
 
   function snapVerticesToPoint(ids, p, arcs, final) {
     ids.forEach(function(idx) {
@@ -35058,7 +35133,7 @@ ${svg}
   function findNearestVertex(x, y, shp, arcs, spherical) {
     var calcLen = spherical ? geom.greatCircleDistance : geom.distance2D,
         minLen = Infinity,
-        minX, minY, dist, iter;
+        minX, minY, vId, dist, iter;
     for (var i=0; i<shp.length; i++) {
       iter = arcs.getShapeIter(shp[i]);
       while (iter.hasNext()) {
@@ -35067,16 +35142,31 @@ ${svg}
           minLen = dist;
           minX = iter.x;
           minY = iter.y;
+          vId = iter.i;
         }
       }
     }
-    return minLen < Infinity ? {x: minX, y: minY} : null;
+    return minLen < Infinity ? {x: minX, y: minY, i: vId} : null;
+  }
+
+  // v: vertex in {x, y, i} format
+  function findAdjacentVertex(v, shp, arcs, offs) {
+    var p, i;
+    var arcEnd = offs == 1 && vertexIsArcEnd(v.i, arcs);
+    var arcStart = offs == -1 && vertexIsArcStart(v.i, arcs);
+    if (arcEnd || arcStart) return null;
+    i = v.i + offs;
+    p = getVertexCoords(i, arcs);
+    return {
+      i: i,
+      x: p[0],
+      y: p[1]
+    };
   }
 
   var VertexUtils = /*#__PURE__*/Object.freeze({
     __proto__: null,
     findNearestVertices: findNearestVertices,
-    findInsertionPoint: findInsertionPoint,
     snapVerticesToPoint: snapVerticesToPoint,
     snapPointToArcEndpoint: snapPointToArcEndpoint,
     findVertexIds: findVertexIds,
@@ -35084,7 +35174,8 @@ ${svg}
     vertexIsArcEnd: vertexIsArcEnd,
     vertexIsArcStart: vertexIsArcStart,
     setVertexCoords: setVertexCoords,
-    findNearestVertex: findNearestVertex
+    findNearestVertex: findNearestVertex,
+    findAdjacentVertex: findAdjacentVertex
   });
 
   // Returns x,y coordinates of the point that is at the midpoint of each polyline feature
@@ -40269,6 +40360,7 @@ ${svg}
     AnchorPoints,
     ArcClassifier,
     ArcDissolve,
+    ArcUtils,
     Bbox2Clipping,
     BinArray$1,
     BufferCommon,

package/package.json

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

package/www/manifest.js

@@ -1 +1,7 @@
-/* replaced by a file manifest by mapshaper-gui server */
+/* This file can contain files and import options; see mapshaper-gui; example:
+mapshaper.manifest = {
+  files: [],
+  quick_view: true,
+  commands: ""
+};
+*/