mapshaper 0.6.69 → 0.6.71

package/www/mapshaper.js

@@ -1819,6 +1819,21 @@
     return [xmin, ymin, xmax, ymax];
   }
 
+  function getUnfilteredArcLength(arcId, arcs) {
+    var data = arcs.getVertexData();
+    return data.nn[arcId];
+  }
+
+  function getUnfilteredArcCoords(arcId, arcs) {
+    var data = arcs.getVertexData();
+    var coords = [];
+    var start = data.ii[arcId];
+    var n = data.nn[arcId];
+    for (var i=0; i<n; i++) {
+      coords.push([data.xx[start + i], data.yy[start + i]]);
+    }
+    return coords;
+  }
 
   function findArcIdFromVertexId(i, ii) {
     // binary search
@@ -1836,6 +1851,22 @@
     return lower; // assumes dataset is not empty
   }
 
+  function deleteLastArc(arcs) {
+    var data = arcs.getVertexData();
+    var arcId = arcs.size() - 1;
+    var arcLen = data.nn[arcId];
+    var n = data.xx.length;
+    var z = arcs.getRetainedInterval();
+    var xx2 = new Float64Array(data.xx.buffer, 0, n-arcLen);
+    var yy2 = new Float64Array(data.yy.buffer, 0, n-arcLen);
+    var nn2 = new Int32Array(data.nn.buffer, 0, arcs.size() - 1);
+    var zz2 = arcs.isFlat() ?
+      null :
+      new Float64Array(data.zz.buffer, 0, n-arcLen);
+    arcs.updateVertexData(nn2, xx2, yy2, zz2);
+    arcs.setRetainedInterval(z);
+  }
+
   function deleteVertex(arcs, i) {
     var data = arcs.getVertexData();
     var nn = data.nn;
@@ -1866,12 +1897,25 @@
     arcs.setRetainedInterval(z);
   }
 
+  function appendEmptyArc(arcs) {
+    var data = arcs.getVertexData();
+    var nn = utils.extendBuffer(data.nn, data.nn.length + 1, data.nn.length);
+    arcs.updateVertexData(nn, data.xx, data.yy, data.zz);
+  }
+
+  // adds vertex to last arc
+  // (used when adding lines in the GUI)
+  // p: [x, y] point in display coordinates
+  function appendVertex(arcs, p) {
+    var i = arcs.getPointCount(); // one past the last idx
+    insertVertex(arcs, i, p);
+  }
+
   function insertVertex(arcs, i, p) {
     var data = arcs.getVertexData();
     var nn = data.nn;
     var n = data.xx.length;
     var count = 0;
-    var found = false;
     var xx2, yy2, zz2;
     // avoid re-allocating memory on each insertion
     if (data.xx.buffer.byteLength >= data.xx.length * 8 + 8) {
@@ -1884,13 +1928,21 @@
     if (!arcs.isFlat()) {
       zz2 = new Float64Array(new ArrayBuffer((n + 1) * 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;
+    if (i < 0 || i > n) {
+      error('Out-of-range vertex insertion index:', i);
+    } else if (i == n) {
+      // appending vertex to last arc
+      nn[nn.length - 1]++;
+    } else {
+      for (var j=0; j<nn.length; j++) {
+        count += nn[j];
+        if (count >= i) { // TODO: confirm this
+          nn[j] = nn[j] + 1;
+          break;
+        }
       }
     }
+
     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);
@@ -1962,8 +2014,13 @@
     __proto__: null,
     absArcId: absArcId,
     calcArcBounds: calcArcBounds,
+    getUnfilteredArcLength: getUnfilteredArcLength,
+    getUnfilteredArcCoords: getUnfilteredArcCoords,
     findArcIdFromVertexId: findArcIdFromVertexId,
+    deleteLastArc: deleteLastArc,
     deleteVertex: deleteVertex,
+    appendEmptyArc: appendEmptyArc,
+    appendVertex: appendVertex,
     insertVertex: insertVertex,
     countFilteredVertices: countFilteredVertices,
     filterVertexData: filterVertexData
@@ -6661,11 +6718,16 @@
         nn = arcData.nn,
         xx = arcData.xx,
         yy = arcData.yy,
-        nodeData;
+        nodeData,
+        globalFilter;
 
     // Accessor function for arcs
     Object.defineProperty(this, 'arcs', {value: arcs});
 
+    this.setArcFilter = function(f) {
+      globalFilter = f;
+    };
+
     this.toArray = function() {
       var chains = getNodeChains(),
           flags = new Uint8Array(chains.length),
@@ -6744,15 +6806,19 @@
     //    Returned ids lead into the node (as opposed to outwards from it)
     // An optional filter function receives the directed id (positive or negative)
     //    of each connected arc and excludes arcs for which the filter returns false.
-    //    The filter is also applied to the initial arc; if false, no arcs are returned.
+    //    // removed: The filter is also applied to the initial arc; if false, no arcs are returned.
     //
-    this.getConnectedArcs = function(arcId, filter) {
+    this.getConnectedArcs = function(arcId, localFilter) {
       var ids = [];
-      var filtered = !!filter;
       var nextId = nextConnectedArc(arcId);
-      if (filtered && !filter(arcId)) ;
+      // kludge: return empty result if arc fails global test
+      // ... applying the local filter causes tests to fail
+      if (globalFilter && !globalFilter(arcId)) {
+        return [];
+      }
       while (nextId != arcId) {
-        if (!filtered || filter(nextId)) {
+        // if (!filtered || filter && filter(nextId) ) {
+        if ((!localFilter || localFilter(nextId)) && (!globalFilter || globalFilter(nextId))) {
           ids.push(nextId);
         }
         nextId = nextConnectedArc(nextId);
@@ -13511,12 +13577,19 @@
   function parseSizeParam(p) {
     var str = String(p),
         num = parseFloat(str),
-        units = /px|pix/.test(str) && 'px' || /pt|point/.test(str) && 'pt' ||
-          /in/.test(str) && 'in' || !isNaN(+str) && 'px' || null;
-    if (isNaN(num) || !units) {
+        units = /px|pix/.test(str) && 'px' ||
+        /pt|point/.test(str) && 'pt' ||
+        /in/.test(str) && 'in' ||
+        /cm/.test(str) && 'cm' ||
+        !isNaN(+str) && 'px' || // px is the default
+        null;
+    var px = units == 'in' && num * 72 ||
+        units == 'cm' && Math.round(num * 28.3465) ||
+        num;
+    if (px > 0 === false || !units) {
       stop('Invalid size:', str);
     }
-    return units == 'in' && num * 72 || num;
+    return px;
   }
 
   // Return coeff. for converting a distance measure to dataset coordinates
@@ -41315,6 +41388,8 @@ ${svg}
     }
     requirePolygonLayer(lyr);
     var nodes = addIntersectionCuts(dataset, opts);
+    // ignore arcs that don't belong to this layer
+    nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var mosaicIndex = new MosaicIndex(lyr, nodes, {flat: false});
     var mosaicShapes = mosaicIndex.mosaic;
     var records2;
@@ -42425,6 +42500,8 @@ ${svg}
 
   function createPolygonLayer(lyr, dataset, opts) {
     var nodes = closeUndershoots(lyr, dataset, opts);
+    // ignore arcs that don't belong to this layer
+    nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var data = buildPolygonMosaic(nodes);
     return {
       geometry_type: 'polygon',
@@ -45415,7 +45492,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.69";
+  var version = "0.6.71";
 
   // 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

@@ -59,7 +59,8 @@ body {
 .save-menu-link,
 .save-menu-btn,
 .add-field-btn,
-.nav-menu-item {
+.nav-menu-item,
+.edit-data-btn {
 	color: #10699b;
 }
 
@@ -560,7 +561,7 @@ body.dragover #import-options-drop-area .drop-area {
 	white-space: pre-line;
 	margin: 0 0 7px 0;
 	line-height: 1.2;
-	font-size: 90%;
+	/* font-size: 90%; */
 }
 
 
@@ -816,7 +817,7 @@ img.close-btn {
 
 .close2-btn {
 	display: inline-block;
-	background-color: #f1f1f1;
+	background-color: #eee;
 	background-image: url("images/close2.png");
 	background-size: cover;
 	float: right;
@@ -829,7 +830,7 @@ img.close-btn {
 }
 
 .close2-btn:hover {
-	background-color: #ddd;
+	background-color: #d5d5d5;
 }
 
 .pin-all img {
@@ -1193,7 +1194,7 @@ div.basemap-style-btn.active img {
 }
 
 .map-layers.add-points,
-.map-layers.draw-lines {
+.map-layers.edit-lines {
 	cursor: crosshair;
 }
 
@@ -1364,20 +1365,23 @@ div.basemap-style-btn.active img {
 	padding: 1px 2px 3px 2px;
 }
 
-.add-field-btn {
+.add-field-btn,
+.edit-data-btn {
 	display: inline-block;
 	font-size: 12px;
-	margin-top: 2px;
+	margin-top: 3px;
 }
 
 .save-menu-btn:hover,
-.add-field-btn:hover {
+.add-field-btn:hover,
+.edit-data-btn:hover {
 	color: black;
 }
 
 .save-menu-link,
 .save-menu-btn,
-.add-field-btn {
+.add-field-btn,
+.edit-data-btn {
 	cursor: pointer;
 }