mapshaper 0.5.92 → 0.5.95

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.91";
+  var VERSION = "0.5.94";
 
 
   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;
     };
@@ -9386,6 +9461,9 @@
         return rec && (rec[name] === val);
       });
     };
+    obj.file_exists = function(name) {
+      return cli.isFile(name);
+    };
     return obj;
   }
 
@@ -23447,7 +23525,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 +35055,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 +35136,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 +35145,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 +35177,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 +40363,7 @@ ${svg}
     AnchorPoints,
     ArcClassifier,
     ArcDissolve,
+    ArcUtils,
     Bbox2Clipping,
     BinArray$1,
     BufferCommon,

package/www/nacis/Makefile

@@ -1,22 +0,0 @@
-
-map:
-	mapshaper countyp010.shp name=counties \
-		-filter 'STATE_FIPS < 72' \
-		-filter 'COUNTY != ""' \
-		-dissolve FIPS copy-fields=STATE \
-		-simplify 2% \
-		-proj albersusa \
-		-points inner + name=points \
-		-i 2012-president-general-counties.csv string-fields=fips name=data \
-		-filter-fields fips,votes,obama,romney \
-		-each 'margin = obama - romney' \
-		-each 'absmargin = Math.abs(margin)' \
-		-join target=points data keys=FIPS,fips \
-		-sort absmargin descending \
-		-svg-style r='Math.sqrt(absmargin) * 0.02' \
-		-svg-style opacity=0.5 fill='margin > 0 ? "#0061aa" : "#cc0000"' \
-		-lines STATE target=counties \
-		-svg-style stroke="#ddd" where='TYPE == "inner"' \
-		-svg-style stroke="#777" where='TYPE == "outer"' \
-		-svg-style stroke="#999" where='TYPE == "STATE"' \
-		-o map.svg target=counties,points

package/www/nacis/Makefile.txt

@@ -1,22 +0,0 @@
-
-map:
-	mapshaper countyp010.shp name=counties \
-		-filter 'STATE_FIPS < 72' \
-		-filter 'COUNTY != ""' \
-		-dissolve FIPS copy-fields=STATE \
-		-simplify 2% \
-		-proj albersusa \
-		-points inner + name=points \
-		-i 2012-president-general-counties.csv string-fields=fips name=data \
-		-filter-fields fips,votes,obama,romney \
-		-each 'margin = obama - romney' \
-		-each 'absmargin = Math.abs(margin)' \
-		-join target=points data keys=FIPS,fips \
-		-sort absmargin descending \
-		-svg-style r='Math.sqrt(absmargin) * 0.02' \
-		-svg-style opacity=0.5 fill='margin > 0 ? "#0061aa" : "#cc0000"' \
-		-lines STATE target=counties \
-		-svg-style stroke="#ddd" where='TYPE == "inner"' \
-		-svg-style stroke="#777" where='TYPE == "outer"' \
-		-svg-style stroke="#999" where='TYPE == "STATE"' \
-		-o map.svg target=counties,points

package/www/nacis/index.html

@@ -1,262 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>mapshaper</title>
-	<meta name="Description" content="A tool for topologically aware shape simplification. Reads and writes Shapefile, GeoJSON and TopoJSON formats.">
-	<meta charset="UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<link rel="stylesheet" href="../page.css">
-	<link rel="stylesheet" href="../elements.css">
-	<link rel="icon"
-      type="image/png"
-      href="../images/icon.png">
-</head>
-<body>
-<div class="hidden">
-	<svg version="1.1" id="home-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-		 y="0px" width="14px" height="19px" viewBox="0 0 14 16">
-	<g>
-		<polygon points="13,7 13,6 12,6 12,5 11,5 11,4 10,4 10,3 9,3 9,2 8,2 8,1 6,1 6,2 5,2 5,3 4,3 4,4 3,4 3,5 2,5 
-			2,6 1,6 1,7 0,7 0,9 2,9 2,14 6,14 6,10 8,10 8,14 12,14 12,9 14,9 14,7"/>
-	</g>
-	</svg>
-	<svg version="1.1" id="zoom-in-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-		 y="0px" width="14px" height="21px" viewBox="0 0 14 14">
-	<g>
-		<polygon points="13,5 9,5 9,1 5,1 5,5 1,5 1,9 5,9 5,13 9,13 9,9 13,9"/>
-	</g>
-	</svg>
-	<svg version="1.1" id="zoom-out-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-		 y="0px" width="14px" height="16px" viewBox="0 -1 14 10">
-	<g>
-		<polygon points="1,1 13,1 13,5 1,5 1,1" />
-	</g>
-	</svg>
-<svg version="1.1" id="info-icon2"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="13px" height="18px"
-	 viewBox="-510 390 13 18" xml:space="preserve">
-<circle fill="#30D4EF" cx="-503.4" cy="392.8" r="2.7"/>
-<rect x="-508" y="405" fill="#30D4EF" width="10" height="3"/>
-<rect x="-507" y="398" fill="#30D4EF" width="6" height="3"/>
-<rect x="-505" y="400" fill="#30D4EF" width="4" height="6"/>
-</svg>
-
-</div>
-
-<div class="page-header">
-	<div class="mapshaper-logo">map<span class="logo-highlight">shaper</span></div>
-
-	<div class="layer-control-btn"><span class="btn header-btn layer-name"></span></div>
-
-	<div class="simplify-control-wrapper"><div class="simplify-control"><div class="header-btn btn simplify-settings-btn">Settings</div>
-		<div class="slider">
-			<div class="handle"><img src="../images/slider_handle_v1.png" alt=""/></div>
-			<div class="track"></div>
-		</div>
-		<input type="text" value="label" class="clicktext" />
-	</div></div>
-	<div id="mode-buttons" class="page-header-buttons">
-		<span class="simplify-btn header-btn btn">Simplify</span><span class="separator"></span><span class="console-btn header-btn btn">Console</span><span class="separator"></span><span class="export-btn header-btn btn">Export</span>
-	</div>
-	<div id="splash-buttons" class="page-header-buttons">
-		<a href="https://github.com/mbloch/mapshaper/wiki"><span id="wiki-btn" class="header-btn btn">Wiki</span></a><span class="separator"></span><a href="https://github.com/mbloch/mapshaper"><span id="github-btn" class="header-btn btn">GitHub</span></a>
-	</div>
-</div>
-
-<div id="mshp-not-supported" class="main-area">
-	<div class="info-box">
-	<h3>Unfortunately, mapshaper can't run in <span class="unsupported-browser">this web browser</span></h3>
-	<div>For best results, try <a href="https://www.google.com/chrome/browser/desktop/">Google Chrome</a> or <a href="http://www.mozilla.org/en-US/firefox/new/">Mozilla Firefox</a>.</div>
-	</div>
-</div>
-
-<div class="layer-control main-area popup-dialog">
-	<div class="info-box">
-		<div class="info-box-scrolled">
-		<div class="layer-menu">
-			<h3>Layers</h3>
-			<div class="pin-all pinnable">
-				<img class="pin-btn unpinned" src="images/eye.png">
-      	<img class="pin-btn pinned" src="images/eye2.png">
-      </div>
-			<div class="layer-list"></div>
-			<div><div id="add-file-btn" class="dialog-btn btn">Add a file</div></div>
-		</div>
-		</div>
-	</div>
-</div>
-
-<div class="export-options main-area popup-dialog">
-	<div class="info-box">
-		<h3>Export menu</h3>
-		<div style="height:3px"></div>
-		<div class=export-layers>
-			<h4>Layers</h4>
-			<div class="export-layer-list option-menu"></div>
-		</div>
-		<h4>File format</h4>
-		<div class="export-formats option-menu">
-		</div>
-
-		<div class="option-menu"><input type="text" class="advanced-options" placeholder="command line options" /><div class="tip-button">?<div class="tip-anchor">
-		<div class="tip">Enter options from the command line
-interface. Examples: "bbox" "no-quantization"
-"precision=0.001"</div></div></div></div>
-		<div class="cancel-btn btn dialog-btn">Cancel</div>
-		<div class="save-btn btn dialog-btn">Export</div>
-	</div>
-</div>
-
-<div class="simplify-options main-area popup-dialog">
-	<div class="info-box">
-		<h3>Simplification menu</h3>
-		<div class="option-menu">
-			<div><label for="import-retain-opt"><input type="checkbox" class="checkbox import-retain-opt"/>prevent shape removal</label>
-							<div class="tip-button">?<div class="tip-anchor">
-			<div class="tip">Prevent small polygon features from
-disappearing at high simplification. Keeps
-the largest ring of multi-ring features.
-</div></div></div></div>
-			<div class="planar-opt-wrapper"><label for="planar-opt"><input type="checkbox" class="checkbox planar-opt"/>use planar geometry</label>
-							<div class="tip-button">?<div class="tip-anchor">
-			<div class="tip">Interpret x, y values as Cartesian coordinates
-on a plane, rather than longitude, latitude
-coordinates on a sphere.
-</div></div></div></div>
-		</div>
-
-			<h4>Method</h4>
-			<div class="option-menu">
-
-			<div><label><input type="radio" name="method" value="dp" class="radio">Douglas-Peucker</label><div class="tip-button">?<div class="tip-anchor">
-<div class="tip">Simplified lines remain within a set
-distance of original lines. Good for
-thinning dense points, but spikes
-tend to form at high simplification.</div></div></div>
-			</div>			
-
-			<div><label><input type="radio" name="method" value="visvalingam" class="radio">Visvalingam / effective area</label><div class="tip-button">?<div class="tip-anchor">
-<div class="tip">Lines are simplified by iteratively
-removing the point that forms
-the least-area triangle with two
-adjacent points.</div></div></div>
-			</div>
-
-			<div><label><input type="radio" name="method" value="weighted_visvalingam" class="radio">Visvalingam / weighted area</label><div class="tip-button">?<div class="tip-anchor">
-<div class="tip">Points located at the vertex
-of more acute angles are
-preferentially removed, for
-a smoother appearance.</div></div></div></div>
-
-
-		</div> <!-- option menu -->
-
-		<div>
-			<div class="cancel-btn btn dialog-btn">Cancel</div>
-			<div class="submit-btn btn dialog-btn">Apply</div>
-		</div>
-	</div> <!-- .info-box -->
-</div> <!-- simplify-options -->
-
-<div id="splash-screen" class="main-area">
-	<div>
-		<h3>Mapshaper is an editor for map data</h3>
-	</div>
-	<div id="drop-areas" class="drop-area-wrapper main-area">
-
-		<div class="file-catalog catalog-area">
-		</div>
-		<div class="file-catalog-spacer spacer"></div>
-
-		<div id="import-drop" class="drop-area">
-			<h4>Drop files here or <span class="inline-btn btn" id="file-selection-btn"><span class="label-text">select</span></span> from a folder</h4>
-			<div class="subtitle">Shapefile, GeoJSON, TopoJSON, DBF and CSV files are supported</div>
-			<div class="subtitle">Files can be loose or in a zip archive</div>
-
-		</div>
-		<div class="spacer"></div>
-		<div id="import-quick-drop" class="drop-area">
-			<h4>Quick import</h4>
-			<div class="subtitle">Drop files here to import with default settings</div>
-		</div>
-	</div>
-</div>
-
-<div id="import-options" class="main-area popup-dialog">
-	<div class="info-box">
-		<!-- <h4>Queued files</h4> -->
-
-		<div class="dropped-file-list"></div>
-		
-		<div class="option-menu">
-
-			<div id="path-import-options">
-				<h4>Options</h4>
-
-				<div><label for="repair-intersections-opt"><input type="checkbox" checked class="checkbox" id="repair-intersections-opt"/>detect line intersections</label>
-				<div class="tip-button">?<div class="tip-anchor">
-
-<div class="tip">Detect line intersections, including
-self-intersections, to help identify
-topological errors in a dataset.</div></div></div></div>
-
-				<div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
-				<div class="tip-button">?<div class="tip-anchor">
-<div class="tip">Fix topology errors by snapping
-together points with nearly identical
-coordinates. This option does not
-apply to TopoJSON files.</div></div></div></div>
-<div style="height:5px"></div>
-
-		</div>
-
-		<div><input type="text" class="advanced-options" placeholder="command line options" /><div class="tip-button">?<div class="tip-anchor">
-<div class="tip">Enter options from the command line
-interface. Examples: "no-topology"
-"encoding=big5"</div></div></div></div>
-
-		</div>
-
-		<div id="import-buttons">
-			<div class="cancel-btn btn dialog-btn">Cancel</div>
-			<div class="add-btn btn dialog-btn">Select</div>
-			<div class="submit-btn btn dialog-btn default-btn">Import</div>
-		</div>
-
-	</div> <!-- .info-box -->
-</div> <!-- import-options -->
-
-
-<!-- TODO: remove #mshp-main-page without causing the map to jitter when resized -->
-<div id="mshp-main-page">
-	<div class="console main-area console-area">
-		<div class="console-window"><div class="console-buffer selectable"></div></div>
-	</div>
-	<div class="mshp-main-map main-area map-area">
-		<div class="coordinate-info colored-text selectable"></div>
-		<div class="intersection-display">
-			<div class="intersection-count">0 line intersections</div>
-			<div class="repair-btn text-btn colored-text">Repair</div>
-		</div>
-		<div class="map-layers"></div>
-	</div>
-</div>
-
-<div id="import-options-drop-area" class="main-area drop-area-wrapper hidden"> 
-<div class="drop-area"></div>
-</div>
-
-<script src="../zip.js" type="text/javascript"></script>
-<script src="../modules.js" type="text/javascript"></script>
-<script src="../mapshaper.js" type="text/javascript"></script>
-<script src="manifest.js" type="text/javascript"></script>
-<script src="../mapshaper-gui.js" type="text/javascript"></script>
-<script type="text/javascript">
-zip.workerScripts = {
-  deflater: ['../z-worker.js', '../pako.deflate.js', '../codecs.js'],
-  inflater: ['../z-worker.js', '../pako.inflate.js', '../codecs.js']
-};
-</script>
-</body>
-</html>

package/www/nacis/manifest.js

@@ -1,27 +0,0 @@
-mapshaper.manifest = {
-  catalog: {
-    cols: 3,
-    title: 'NACIS PCD Example Datasets',
-    items: [{
-      title: 'Sample One',
-      subtitle: 'Inspection practice',
-      files: [
-        'https://dl.dropboxusercontent.com/s/krtvbezmvgg102x/a.zip?dl=1'
-      ]
-    }, {
-      title: 'Sample Two',
-      subtitle: 'Line intersections',
-      url: '',
-      files: [
-        'https://dl.dropboxusercontent.com/s/0duqwhavungcxl3/b.zip?dl=1'
-      ]
-    }, {
-      title: 'Sample Three',
-      subtitle: 'U.S. counties',
-      url: '',
-      files: [
-        'https://dl.dropboxusercontent.com/s/4bwywe2856gmnrd/c.zip?dl=1'
-      ]
-    }]
-  }
-};