mapshaper 0.6.75 → 0.6.76

package/mapshaper.js

@@ -13189,14 +13189,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));
     });
   }
 
@@ -19959,8 +19956,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;
   }
@@ -45525,7 +45522,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.75";
+  var version = "0.6.76";
 
   // 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.76",
   "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>
  
@@ -112,34 +112,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>
 
@@ -304,9 +300,9 @@ encoding=big5</span>. Click to see all options.</div></div></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>