mapshaper 0.6.75 → 0.6.77

package/mapshaper.js

@@ -1537,7 +1537,6 @@
     this.xmax = c;
     this.ymax = d;
     if (a > c || b > d) this.update();
-    // error("Bounds#setBounds() min/max reversed:", a, b, c, d);
     return this;
   };
 
@@ -5123,10 +5122,12 @@
     if (!P && info.prj) {
       P = parseCrsString(translatePrj(info.prj));
     }
-    if (!P && probablyDecimalDegreeBounds(getDatasetBounds(dataset))) {
-      // use wgs84 for probable latlong datasets with unknown datums
-      str = 'wgs84';
-      P = parseCrsString(str);
+    if (!P) {
+      if (probablyDecimalDegreeBounds(getDatasetBounds(dataset))) {
+        // use wgs84 for probable latlong datasets with unknown datums
+        str = 'wgs84';
+        P = parseCrsString(str);
+      }
     }
     return {
       crs: P || null,
@@ -7202,6 +7203,12 @@
     return bounds;
   }
 
+  function datasetIsEmpty(dataset) {
+    return dataset.layers.every(function(lyr) {
+      return layerIsEmpty(lyr);
+    });
+  }
+
   function datasetHasGeometry(dataset) {
     return utils.some(dataset.layers, function(lyr) {
       return layerHasGeometry(lyr);
@@ -7315,6 +7322,7 @@
     copyDatasetForExport: copyDatasetForExport,
     copyDatasetForRenaming: copyDatasetForRenaming,
     getDatasetBounds: getDatasetBounds,
+    datasetIsEmpty: datasetIsEmpty,
     datasetHasGeometry: datasetHasGeometry,
     datasetHasPaths: datasetHasPaths,
     cleanupArcs: cleanupArcs,
@@ -13189,14 +13197,11 @@
     return findVertexIds(p2.x, p2.y, arcs);
   }
 
-  function snapVerticesToPoint(ids, p, arcs, final) {
+  function snapVerticesToPoint(ids, p, arcs) {
     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);
+      arcs.updateArcBounds(findArcIdFromVertexId(idx, data.ii));
     });
   }
 
@@ -13452,7 +13457,7 @@
         // range = Math.min(w, h) + 1e-8,
         range = Math.max(w, h) + 1e-8,
         digits = 0;
-    while (range < 2000) {
+    while (range < 2000 && digits < 1) {
       range *= 10;
       digits++;
     }
@@ -19959,8 +19964,8 @@
   }
 
   function parseScalebarUnits(str) {
-    var isMiles = /miles?$/.test(str.toLowerCase());
-    var isKm = /(k\.m\.|km|kilometers?|kilometres?)$/.test(str.toLowerCase());
+    var isMiles = /(miles?|mi[.]?|英里)$/.test(str.toLowerCase());
+    var isKm = /(k\.m\.|km|kilometers?|kilom.tres?|公里)$/.test(str.toLowerCase());
     var units = isMiles && 'mile' || isKm && 'km' || '';
     return units;
   }
@@ -29355,7 +29360,7 @@ ${svg}
       // * 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];
+      var lyr = targ?.layers[targ.layers.length - 1];
       return targ ? {layer: lyr, dataset: targ.dataset} : null;
     };
 
@@ -45139,7 +45144,7 @@ ${svg}
               opts.target, getFormattedLayerList(job.catalog)));
         }
         if (!commandAcceptsEmptyTarget(name)) {
-          throw new UserError("No data is available");
+          stop("No data is available");
         }
       }
 
@@ -45525,7 +45530,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.75";
+  var version = "0.6.77";
 
   // 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.75",
+  "version": "0.6.77",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/index.html

@@ -39,7 +39,7 @@
 	<svg id="pointer-icon" version="1.1" xmlns="http://www.w3.org/2000/svg" width="15" height="22" viewBox="0 0 15 20"><rect x="7.4126" y="11.0354" width="3.9102" height="7.9841" transform="translate(-5.8889 6.0377) rotate(-27.5536)" fill="#30d4ef"/><polygon points="2.57 2.086 2.718 16.056 13.944 10.198 2.57 2.086" fill="#30d4ef"/></svg>
 
 	<!-- adjusted height -->
-	<svg id="ribbon-icon" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="15" height="26" viewBox="0 0 15 20">
+	<svg id="ribbon-icon" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="15" height="25" viewBox="0 1 15 20">
 	  <polygon points="8 14.5 13 19 13 4 3 4 3 19 8 14.5" fill="#30d4ef"/>
 	</svg>
  
@@ -76,7 +76,7 @@
 		<input type="text" value="label" class="clicktext" />
 	</div></div>
 	<div id="mode-buttons" class="page-header-buttons">
-		<span class="basemap-btn header-btn btn">Basemap</span><span class="separator"></span><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>
+		<span class="console-btn header-btn btn">Console</span><span class="basemap-btn header-btn btn">Basemap</span><span class="separator"></span><span class="separator"></span><span class="simplify-btn header-btn btn">Simplify</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>
@@ -98,11 +98,14 @@
 			<div class="pin-all pinnable">
 				<img class="eye-btn black-eye" src="images/eye.png">
 				<img class="eye-btn green-eye" src="images/eye2.png">
-	</div>
+			</div>
 			<div class="layer-list"></div>
 			<!-- <h4>Sources</h4> -->
-			<h4>Source files</h4>
-			<div class="file-list"></div>
+			<div class="no-layer-note">No data has been added</div>
+			<div class="source-file-section">
+				<h4>Source files</h4>
+				<div class="file-list"></div>
+			</div>
 			<div>
 				<div id="add-file-btn" class="dialog-btn btn">Add files</div>
 				<div id="add-empty-btn" class="dialog-btn btn">Add empty layer</div>
@@ -112,34 +115,30 @@
 	</div>
 </div>
 
-<div class="box-tool-options main-area popup-dialog">
-	<div class="info-box controls">
-		<div>
-			<div class="select-btn btn dialog-btn">Select</div>
-			<div class="clip-btn btn dialog-btn">Clip</div>
-			<div class="erase-btn btn dialog-btn">Erase</div>
-			<div class="rect-btn btn dialog-btn">Rectangle</div>
-			<div class="frame-btn btn dialog-btn">Frame</div>
-			<div class="info-btn btn dialog-btn">Coords</div>
-			<!-- <div class="zoom-btn btn dialog-btn">Zoom In</div> -->
-			<div class="cancel-btn btn dialog-btn">Cancel</div>
-		</div>
+
+<div class="box-tool-options sidebar-buttons">
+	<div>
+		<div class="select-btn btn sidebar-btn">Select</div>
+		<div class="clip-btn btn sidebar-btn">Clip</div>
+		<div class="erase-btn btn sidebar-btn">Erase</div>
+		<div class="rect-btn btn sidebar-btn">Rectangle</div>
+		<div class="frame-btn btn sidebar-btn">Frame</div>
+		<div class="info-btn btn sidebar-btn">Coords</div>
 		<div class="box-coords selectable"></div>
+		<div class="cancel-btn btn sidebar-btn">Cancel</div>
 	</div>
 </div>
 
-<div class="selection-tool-options main-area popup-dialog">
-	<div class="info-box">
-		<div>
-			<div class="delete-btn btn dialog-btn">Delete</div>
-			<div class="filter-btn btn dialog-btn">Keep</div>
-			<div class="duplicate-btn btn dialog-btn">Duplicate</div>
-			<div class="split-btn btn dialog-btn">Split</div>
-			<div class="coords-btn btn dialog-btn toggle-btn">Coords</div>
-			<div class="data-btn btn dialog-btn toggle-btn">Edit data</div>
-			<div class="cancel-btn btn dialog-btn">Clear</div>
-		</div>
+<div class="selection-tool-options sidebar-buttons">
+	<div>
+		<div class="delete-btn btn sidebar-btn">Delete</div>
+		<div class="filter-btn btn sidebar-btn">Keep</div>
+		<div class="duplicate-btn btn sidebar-btn">Duplicate</div>
+		<div class="split-btn btn sidebar-btn">Split</div>
+		<div class="coords-btn btn sidebar-btn toggle-btn">Coords</div>
 		<div class="box-coords selectable"></div>
+		<div class="data-btn btn sidebar-btn toggle-btn">Edit data</div>
+		<div class="cancel-btn btn sidebar-btn">Clear</div>
 	</div>
 </div>
 
@@ -147,14 +146,13 @@
 	<div class="info-box">
 		<div class="close2-btn"></div>
 		<h3>Export options</h3>
-		<div style="height:3px"></div>
 		<div class=export-layers>
 			<h4 class="menu-title">Layers</h4>
 			<div class="export-layer-list option-menu"></div>
 		</div>
 		<div class="export-zip-option option-menu">
 
-		<div style="height:10px"></div>
+		<div style="height:6px"></div>
 
 		</div>
 		<h4>File format</h4>
@@ -170,7 +168,6 @@
 the -o command. Examples: bbox no-quantization
 precision=0.001. Click to see all options.</div></div></div></a>
 
-
 	<!-- 	<div class="option-menu">
 	<input id="ofile-name" class="text-input" type="text" placeholder="output file name" />
 	</div> -->
@@ -250,63 +247,49 @@ a smoother appearance.</div></div></div></div>
 	</div> <!-- .info-box -->
 </div> <!-- simplify-options -->
 
-<div id="splash-screen" class="main-area">
-	<div>
-		<h3 id="splash-screen-blurb">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 or paste 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, KML and CSV files are supported</div>
-			<div class="subtitle">Files can be gzipped 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 or paste files here to import with default settings</div>
-		</div>
-	</div>
-</div>
-
 <div id="import-options" class="main-area popup-dialog">
 	<div class="info-box">
-		<h3 class="list-header">Files</h3>
-
-		<div class="dropped-file-list"></div>
-		
-		<div class="option-menu">
-
-		<div id="path-import-options">
-			<h4>Options</h4>
+		<div class="cancel-btn close2-btn"></div>
+		<h3 class="list-header">Import files</h3>
+		<div class="import-instructions">
+			<span><input type="checkbox" class="advanced-import-options" />with advanced options</span>
+			<div class="mini-drop-area">
+				<div class="subtitle">Drop, paste or <span class="add-btn inline-btn btn"><span class="label-text">select</span></span> files to import.</div>
+				<div class="subtitle">Shapefile, GeoJSON, TopoJSON, KML and CSV formats are supported. Files can be zipped or gzipped.</div>
+			</div>
 		</div>
+		<div class="queued-file-section">
+			<!-- <h4>Files</h4> -->
+			<div class="dropped-file-list"></div>
+			
+			<div class="option-menu">
 
-		<div><input type="text" class="text-input advanced-options" placeholder="command line import options" />
-			<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-i-input" target="_mapshaper_import_docs">
-			<div class="tip-button">?<div class="tip-anchor">
-<div class="tip">Enter options from the command line
+			<div id="path-import-options">
+				<!-- <h4>Options</h4> -->
+			</div>
+
+			<div style="margin-top: 10px"><input type="text" class="text-input advanced-options" placeholder="import options" />
+				<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-i-input" target="_mapshaper_import_docs">
+				<div class="tip-button">?<div class="tip-anchor">
+	<div class="tip">Enter options from the command line
 interface. Examples: <span id="import-option-examples">snap no-topology
 encoding=big5</span>. Click to see all options.</div></div></div></div>
-		</a>
+			</a>
 
-		</div>
+			</div>
+
+	<!-- 			<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 disabled">Submit</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>