mapshaper 0.6.2 → 0.6.3

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.2";
+  var VERSION = "0.6.3";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -81,6 +81,7 @@
     get findValueByPct () { return findValueByPct; },
     get findValueByRank () { return findValueByRank; },
     get findMedian () { return findMedian; },
+    get findQuantile () { return findQuantile; },
     get mean () { return mean; },
     get format () { return format; },
     get formatter () { return formatter; },
@@ -832,18 +833,24 @@
     return arr[k];
   }
 
-  //
-  //
   function findMedian(arr) {
-    var n = arr.length,
-        rank = Math.floor(n / 2) + 1,
-        median = findValueByRank(arr, rank);
-    if ((n & 1) == 0) {
-      median = (median + findValueByRank(arr, rank - 1)) / 2;
-    }
-    return median;
+    return findQuantile(arr, 0.5);
   }
 
+  function findQuantile(arr, k) {
+    var n = arr.length,
+        i1 = Math.floor((n - 1) * k),
+        i2 = Math.ceil((n - 1) * k);
+    if (i1 < 0 || i2 >= n) return NaN;
+    var v1 = findValueByRank(arr, i1 + 1);
+    if (i1 == i2) return v1;
+    var v2 = findValueByRank(arr, i2 + 1);
+    // use linear interpolation
+    var w1 = i2 / (n - 1) - k;
+    var w2 = k - i1 / (n - 1);
+    var v = (v1 * w1 + v2 * w2) * (n - 1);
+    return v;
+  }
 
   function mean(arr) {
     var count = 0,
@@ -10343,6 +10350,7 @@
           sums: capture,
           average: captureNum,
           median: captureNum,
+          quantile: captureNum,
           min: captureNum,
           max: captureNum,
           mode: capture,
@@ -10357,6 +10365,7 @@
           sum: wrap(utils.sum, 0),
           sums: wrap(sums),
           median: wrap(utils.findMedian),
+          quantile: wrap2(utils.findQuantile),
           min: wrap(min),
           max: wrap(max),
           average: wrap(utils.mean),
@@ -10429,6 +10438,13 @@
       };
     }
 
+    function wrap2(proc) {
+      return function(arg1, arg2) {
+        var c = colNo++;
+        return rowNo > 0 ? proc(cols[c], arg2) : null;
+      };
+    }
+
     function procAll() {
       for (var i=0; i<len; i++) {
         procRecord(i);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.6.2",
+	"version": "0.6.3",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -36,7 +36,7 @@
 		"/bin/**",
 		"/www/**",
 		"!/www/basemap.js",
-		"!/www/nacis/",
+		"!/www/nacis/**",
 		"/mapshaper.js",
 		"!.DS_Store"
 	],

package/www/mapshaper-gui.js

@@ -78,6 +78,7 @@
     get findValueByPct () { return findValueByPct; },
     get findValueByRank () { return findValueByRank; },
     get findMedian () { return findMedian; },
+    get findQuantile () { return findQuantile; },
     get mean () { return mean; },
     get format () { return format; },
     get formatter () { return formatter; },
@@ -5312,18 +5313,24 @@
     return arr[k];
   }
 
-  //
-  //
   function findMedian(arr) {
-    var n = arr.length,
-        rank = Math.floor(n / 2) + 1,
-        median = findValueByRank(arr, rank);
-    if ((n & 1) == 0) {
-      median = (median + findValueByRank(arr, rank - 1)) / 2;
-    }
-    return median;
+    return findQuantile(arr, 0.5);
   }
 
+  function findQuantile(arr, k) {
+    var n = arr.length,
+        i1 = Math.floor((n - 1) * k),
+        i2 = Math.ceil((n - 1) * k);
+    if (i1 < 0 || i2 >= n) return NaN;
+    var v1 = findValueByRank(arr, i1 + 1);
+    if (i1 == i2) return v1;
+    var v2 = findValueByRank(arr, i2 + 1);
+    // use linear interpolation
+    var w1 = i2 / (n - 1) - k;
+    var w2 = k - i1 / (n - 1);
+    var v = (v1 * w1 + v2 * w2) * (n - 1);
+    return v;
+  }
 
   function mean(arr) {
     var count = 0,
@@ -8264,20 +8271,25 @@
         _frame;
 
     _position.on('resize', function(e) {
-      if (_contentBounds) {
+      if (ready()) {
         onChange({resize: true});
       }
     });
 
+    function ready() { return !!_contentBounds; }
+
     this.reset = function() {
+      if (!ready()) return;
       recenter(_contentBounds.centerX(), _contentBounds.centerY(), 1, {reset: true});
     };
 
     this.home = function() {
+      if (!ready()) return;
       recenter(_contentBounds.centerX(), _contentBounds.centerY(), 1);
     };
 
     this.pan = function(xpix, ypix) {
+      if (!ready()) return;
       var t = this.getTransform();
       recenter(_cx - xpix / t.mx, _cy - ypix / t.my);
     };
@@ -8285,6 +8297,7 @@
     // Zoom to @w (width of the map viewport in coordinates)
     // @xpct, @ypct: optional focus, [0-1]...
     this.zoomToExtent = function(w, xpct, ypct) {
+      if (!ready()) return;
       if (arguments.length < 3) {
         xpct = 0.5;
         ypct = 0.5;
@@ -8304,6 +8317,7 @@
     };
 
     this.zoomByPct = function(pct, xpct, ypct) {
+      if (!ready()) return;
       this.zoomToExtent(this.getBounds().width() / pct, xpct, ypct);
     };
 

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.2";
+  var VERSION = "0.6.3";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -81,6 +81,7 @@
     get findValueByPct () { return findValueByPct; },
     get findValueByRank () { return findValueByRank; },
     get findMedian () { return findMedian; },
+    get findQuantile () { return findQuantile; },
     get mean () { return mean; },
     get format () { return format; },
     get formatter () { return formatter; },
@@ -832,18 +833,24 @@
     return arr[k];
   }
 
-  //
-  //
   function findMedian(arr) {
-    var n = arr.length,
-        rank = Math.floor(n / 2) + 1,
-        median = findValueByRank(arr, rank);
-    if ((n & 1) == 0) {
-      median = (median + findValueByRank(arr, rank - 1)) / 2;
-    }
-    return median;
+    return findQuantile(arr, 0.5);
   }
 
+  function findQuantile(arr, k) {
+    var n = arr.length,
+        i1 = Math.floor((n - 1) * k),
+        i2 = Math.ceil((n - 1) * k);
+    if (i1 < 0 || i2 >= n) return NaN;
+    var v1 = findValueByRank(arr, i1 + 1);
+    if (i1 == i2) return v1;
+    var v2 = findValueByRank(arr, i2 + 1);
+    // use linear interpolation
+    var w1 = i2 / (n - 1) - k;
+    var w2 = k - i1 / (n - 1);
+    var v = (v1 * w1 + v2 * w2) * (n - 1);
+    return v;
+  }
 
   function mean(arr) {
     var count = 0,
@@ -10343,6 +10350,7 @@
           sums: capture,
           average: captureNum,
           median: captureNum,
+          quantile: captureNum,
           min: captureNum,
           max: captureNum,
           mode: capture,
@@ -10357,6 +10365,7 @@
           sum: wrap(utils.sum, 0),
           sums: wrap(sums),
           median: wrap(utils.findMedian),
+          quantile: wrap2(utils.findQuantile),
           min: wrap(min),
           max: wrap(max),
           average: wrap(utils.mean),
@@ -10429,6 +10438,13 @@
       };
     }
 
+    function wrap2(proc) {
+      return function(arg1, arg2) {
+        var c = colNo++;
+        return rowNo > 0 ? proc(cols[c], arg2) : null;
+      };
+    }
+
     function procAll() {
       for (var i=0; i<len; i++) {
         procRecord(i);

package/www/page.css

@@ -18,7 +18,7 @@
 
 @font-face {
 	font-family: 'Iosevka';
-	src: url('assets/iosevka-light.woff2') format('woff2'), url('assets/iosevka-light.woff') format('woff');
+	src: url('assets/iosevka-light.woff2') format('woff2');
 }
 
 

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'
-      ]
-    }]
-  }
-};