mapshaper 0.6.75 → 0.6.76

package/www/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/www/page.css

@@ -65,12 +65,14 @@ body {
 /* --- Themed elements -------------- */
 
 .page-header,
-.dialog-btn {
+.dialog-btn,
+.sidebar-btn {
 	background-color: #1385B7;
 }
 
 .colored-text,
 .save-menu-link,
+.context-menu-item,
 .save-menu-btn,
 .add-field-btn,
 .nav-menu-item,
@@ -112,6 +114,7 @@ body {
 }
 
 .dialog-btn:hover:not(.disabled),
+.sidebar-btn:hover,
 .btn.header-btn:hover,
 .dialog-btn.default-btn,
 .dialog-btn.selected-btn {
@@ -228,17 +231,18 @@ body {
 	pointer-events: none;
 }
 
-.box-tool-options .btn {
+.box-tool-options .btn,
+.selection-tool-options .btn {
 	pointer-events: initial;
 }
 
-.box-tool-options .info-box {
-	text-align: center;
-}
-
 .box-coords {
-	margin-top: 7px;
+	margin-top: -23px;
 	pointer-events: initial;
+	position: absolute;
+	z-index: -1;
+	padding: 1px 25px;
+	right: 55px;
 }
 
 /* --- Export dialog --------- */
@@ -542,13 +546,19 @@ body.dragover #import-options-drop-area .drop-area {
 	text-align: center;
 }
 
-.info-box,.popup {
+.info-box,.popup,.contextmenu {
 	border-radius: 9px;
-	/* border: 1px solid #ddd; */
+	border: 1px solid #ddd;
 	box-shadow: 0 3px 6px rgba(0,0,0,0.35);
+	box-shadow: 0 1px 7px rgba(0,0,0,0.15);
 	background-color: #fff;
 }
 
+.contextmenu-item {
+	padding: 6px;
+}
+
+
 .info-box {
 	min-width: 230px;
 	word-wrap: break-word;
@@ -561,6 +571,25 @@ body.dragover #import-options-drop-area .drop-area {
 	/* border: 1px solid #aaa; */
 }
 
+.sidebar-buttons {
+	display: none;
+	position: absolute;
+	background-color: white;
+	padding: 1px 3px;
+	top: 207px;
+	right: 0;
+	z-index: 19;
+}
+
+.btn.sidebar-btn {
+	display: block;
+	margin-bottom: 2px;
+	margin-top: 2px;
+	font-size: 13px;
+	color: white;
+	min-width: 28px;
+}
+
 .info-box h3 {
 	font-size: 19px;
 	line-height: 1.1;
@@ -787,7 +816,7 @@ body.simplify .layer-control-btn {
 	max-height: 500px;
 	overflow: hidden;
 	overflow-y: auto;
-	padding: 9px 14px 6px 14px;
+	padding: 8px 14px 9px 14px;
 	pointer-events: auto;
 	border-radius: 9px;
 }
@@ -1014,6 +1043,14 @@ img.close-btn:hover,
 	visibility: hidden;
 }*/
 
+
+.contextmenu {
+	font-size: 13px;
+	position: absolute;
+	z-index: 40;
+	padding: 5px 0;
+}
+
 /* --- Popup -------------------- */
 
 .popup {
@@ -1220,6 +1257,10 @@ div.basemap-style-btn.active img {
 	cursor: crosshair;
 }
 
+.map-layers.drawing.dragging {
+	cursor: default;
+}
+
 .map-layers canvas {
 	pointer-events: none;
 	position: absolute;
@@ -1249,11 +1290,19 @@ div.basemap-style-btn.active img {
 	cursor: pointer;
 }
 
+.map-layers > svg text.active-label {
+	stroke: #fac0ff; /* #efacf4; */
+	paint-order: stroke fill;
+	stroke-width: 4px;
+	stroke-linecap: round;
+	stroke-linejoin: round;
+}
+
 /* ---  MAP BUTTONS --- */
 
-.pointer-btn {
+/*.pointer-btn {
 	z-index: 2;
-}
+}*/
 
 .nav-buttons {
 	z-index: 20;
@@ -1283,9 +1332,6 @@ div.basemap-style-btn.active img {
 	fill: black !important;
 }
 
-.save-btn .save-menu {
-	top: 23px;
-}
 
 .inline-checkbox {
 	margin-left: 5px;
@@ -1297,13 +1343,23 @@ div.basemap-style-btn.active img {
 
 .nav-sub-menu {
 	position: absolute;
-	z-index: -1; 
+	z-index: -1;
 	display: none;
 	pointer-events: none;
-	padding-top: 4px;
-	top: 27px;
-	right: -3px;
+	padding: 5px 0px;
+	background-color: white;
+	top: 0px;
+	right: 24px;
+	text-align: right;
 	white-space: nowrap;
+	border-radius: 6px;
+	border: 1px solid #ddd;
+	box-shadow: 0 2px 5px rgba(0,0,0,0.35);
+	box-shadow: 0 1px 7px rgba(0,0,0,0.12);
+}
+
+.pointer-btn .nav-sub-menu {
+	top: -3px;
 }
 
 .nav-btn.open .nav-sub-menu {
@@ -1311,33 +1367,6 @@ div.basemap-style-btn.active img {
 	pointer-events: inherit;
 }
 
-.nav-menu-item {
-	background-color: #fff;
-	float: right;
-	clear: right;
-	white-space: nowrap;
-	display: inline-block;
-	padding: 5px 7px 5px 7px;
-	line-height: 11px;
-	cursor: pointer;
-}
-
-
-.nav-menu-item:hover,
-.nav-btn:hover .nav-sub-menu:not(.active):not(:hover) .nav-menu-item[data-name=info] {
-	font-weight: bold;
-	background: #e6f7ff;
-}
-
-.nav-menu-item.selected {
-	color: black;
-	font-weight: bold;
-}
-
-/* bullets https://www.w3schools.com/charsets/ref_utf_geometric.asp */
-.nav-sub-menu.active .nav-menu-item.selected:before {
-	content: "\25B8  "
-}
 
 .nav-btn {
 	position: relative;
@@ -1353,7 +1382,6 @@ div.basemap-style-btn.active img {
 
 .nav-btn.selected {
 	background-color: black;
-	/* border-radius: 3px; */
 }
 
 .nav-btn:hover:not(.disabled) svg *,
@@ -1365,16 +1393,43 @@ div.basemap-style-btn.active img {
 	fill: white;
 }
 
+.nav-menu-item,
+.contextmenu-item {
+	background-color: #fff;
+	white-space: nowrap;
+	padding: 6px 11px 7px 11px;
+	line-height: 11px;
+	cursor: pointer;
+}
+
+.nav-menu-item:hover,
+.contextmenu-item:hover,
+.nav-btn:hover .nav-sub-menu:not(.active):not(:hover) .nav-menu-item[data-name=info] {
+	color: black;
+	background: #e6f7ff;
+}
+
+.nav-menu-item.selected {
+	color: black;
+}
+
+/* bullets https://www.w3schools.com/charsets/ref_utf_geometric.asp */
+.nav-sub-menu.active .nav-menu-item.selected:before {
+	content: "\25B8";
+	position: relative;
+	margin-left: -7px;
+	left: -2px;
+	top: 1px;
+}
+
 .save-menu {
 	text-align: right;
 	padding-bottom: 5px;
 }
 
 .save-menu-entry {
-	/* padding: 4px 7px 5px 7px; */
 	line-height: 11px;
 	padding: 4px 7px 5px 7px;
-	display: inline-block;
 	background: white;
 }
 
@@ -1410,8 +1465,7 @@ div.basemap-style-btn.active img {
 
 
 .save-menu-link:hover {
-	/* background: #e6f7ff; */
-	font-weight: bold;	
+	color: black;
 }
 
 .save-item-label {