mapshaper 0.6.75 → 0.6.77

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

@@ -31,7 +31,7 @@ html, body {
 
 body {
 	overflow: hidden;
-	background-color: #fff;
+	background-color: #f8fdff;
 	font: 14px/1.4 'Source Sans Pro', Arial, sans-serif;
 	color: #444;
 	user-select: none;
@@ -40,6 +40,10 @@ body {
 	cursor: default;
 }
 
+body.map-view {
+	background-color: #fff;
+}
+
 .fade-out {
   animation: fadeOut ease forwards 0.6s;
 }
@@ -65,12 +69,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 +118,7 @@ body {
 }
 
 .dialog-btn:hover:not(.disabled),
+.sidebar-btn:hover,
 .btn.header-btn:hover,
 .dialog-btn.default-btn,
 .dialog-btn.selected-btn {
@@ -175,12 +182,16 @@ body {
 	text-decoration: none;
 }
 
+#mode-buttons.page-header-buttons {
+	display: none;
+
+}
+
 .page-header-buttons {
 	z-index: 20;
 	position: absolute;
 	top: 0px;
 	right: 0px;
-	display: none;
 	margin: 0 6px 3px 0;	
 }
 
@@ -199,6 +210,7 @@ body {
 .page-header .header-btn.disabled,
 .page-header .header-btn.disabled:hover {
 	background-color: transparent;
+	opacity: 0.5;
 }
 
 .page-header .btn.header-btn.active,
@@ -228,17 +240,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 --------- */
@@ -327,105 +340,28 @@ div.alert-box {
 
 /* --- Splash screen -------------- */
 
-.splash-screen #splash-screen {
-	display: block;
-}
-
-.splash-screen #splash-buttons {
-	display: block;
-}
-
-.queued-files.splash-screen #import-options-drop-area {
-	display: block;
-	z-index: 2;
-}
-
-#import-options-drop-area .drop-area {
-	height: 100%;
+.import-instructions {
+	margin: 7px 0 0 0;
 }
 
-#splash-screen {
-	z-index: 1;
-	text-align: center;
+.mini-drop-area {
+	border: 1.5px dashed #bbb;
+	max-width: 240px;
+	border-radius: 9px;
 	font-size: 15px;
-	display: none;
-}
-
-#splash-screen, #import-options-drop-area {
-	background-color: #def1f9;
-}
-
-#splash-screen .subtitle {
-	color: #777;
-}
-
-.splash-screen #import-options .info-box {
-	margin-top: 40px;
-}
-
-.queued-files #import-options {
-	display: block;
-}
-
-#splash-screen *,
-#import-options-drop-area * {
-	box-sizing: border-box;
-}
-
-.drop-area {
-	border: 2px dashed #a2a2a2;
-	border-radius: 19px;
-	background-color: #f8fdff;
-	overflow: hidden;
-}
-
-#splash-screen .drop-area.dragover,
-body.dragover #import-options-drop-area .drop-area {
-	border-color: #333;
-}
-
-#drop-areas {
-	margin-top: 30px;
+	line-height: 1.5;
+	color: #888;
+/*	background-color: #FFFEF8;*/
+	padding: 6px 4px 7px 7px;
+	padding: 11px 14px;
+	margin: 9px -1px 3px -1px;
+	min-height: 120px;
 }
 
-.drop-area-wrapper {
-	padding: 16px 16px 15px 16px;
-}
-
-.catalog-mode #import-drop,
-.catalog-mode #import-quick-drop,
 .catalog-mode .file-catalog {
 	height: 32%;
 }
 
-#import-drop {
-	height: 61.6%;
-}
-
-#import-quick-drop {
-	height: 37%;
-}
-
-.queued-files #splash-screen {
-	display: none;
-}
-
-/* between the two drop areas */
-#splash-screen .spacer {
-	height: 1.6%;
-}
-
-#splash-screen h3 {
-	margin: 11px 0 0 0;
-	color: #333;
-	font-size: 18px;
-}
-
-#splash-screen h4 {
-	color: #333;
-	font-size: 17px;
-	margin: 11px 0 0 0;
-}
 
 #file-selection-btn.inline-btn {
 	padding: 2px 4px 3px 3px;
@@ -505,7 +441,7 @@ body.dragover #import-options-drop-area .drop-area {
 }
 
 .dropped-file-list {
-	margin-bottom: 8px;
+	margin-bottom: 4px;
 	max-height: 300px;
 	overflow-y: auto;
 }
@@ -528,6 +464,19 @@ body.dragover #import-options-drop-area .drop-area {
 	margin-right: 16px;
 }
 
+#import-options .queued-file-section {
+	display: none;
+}
+
+.queued-files #import-options .queued-file-section {
+	margin-top: 10px;
+	display: block;
+}
+
+.queued-files #import-options .import-instructions {
+	display: none;
+}
+
 
 #import-options .dropped-file-list p {
 	line-height: 1;
@@ -544,11 +493,27 @@ body.dragover #import-options-drop-area .drop-area {
 
 .info-box,.popup {
 	border-radius: 9px;
-	/* border: 1px solid #ddd; */
-	box-shadow: 0 3px 6px rgba(0,0,0,0.35);
+	border: 1px solid #d5d5d5;
+	box-shadow: 0 1px 7px rgba(0,0,0,0.18);
+	background-color: #fff;
+}
+
+.contextmenu {
+	position: absolute;
+	border-radius: 6px;
+	border: 1px solid #d5d5d5;
+	box-shadow: 0 1px 7px rgba(0,0,0,0.18);
 	background-color: #fff;
+	font-size: 13px;
+	z-index: 40;
+	padding: 4px 0;
 }
 
+.contextmenu-item {
+	padding: 6px;
+}
+
+
 .info-box {
 	min-width: 230px;
 	word-wrap: break-word;
@@ -561,6 +526,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;
@@ -576,7 +560,7 @@ body.dragover #import-options-drop-area .drop-area {
 .info-box h4 {
 	font-size: 1.085em;
 	font-weight: normal;
-	margin: 0 0 2px 0;
+	margin: 4px 0 2px 0;
 }
 
 .info-box p {
@@ -787,7 +771,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;
 }
@@ -798,6 +782,11 @@ body.simplify .layer-control-btn {
 	z-index: 90;
 }
 
+.layer-control .no-layer-note {
+	color: #777;
+	margin: 4px 0 6px 0;
+}
+
 .layer-menu .layer-list {
 	margin: 6px 0 7px 0;
 }
@@ -839,7 +828,7 @@ img.close-btn {
 
 .close2-btn {
 	display: inline-block;
-	background-color: #eee;
+	background-color: #e5e5e5;
 	background-image: url("images/close2.png");
 	background-size: cover;
 	float: right;
@@ -1014,6 +1003,7 @@ img.close-btn:hover,
 	visibility: hidden;
 }*/
 
+
 /* --- Popup -------------------- */
 
 .popup {
@@ -1220,6 +1210,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 +1243,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 +1285,6 @@ div.basemap-style-btn.active img {
 	fill: black !important;
 }
 
-.save-btn .save-menu {
-	top: 23px;
-}
 
 .inline-checkbox {
 	margin-left: 5px;
@@ -1297,13 +1296,22 @@ 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 1px 7px rgba(0,0,0,0.12);
+}
+
+.pointer-btn .nav-sub-menu {
+	top: -3px;
 }
 
 .nav-btn.open .nav-sub-menu {
@@ -1311,33 +1319,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 +1334,6 @@ div.basemap-style-btn.active img {
 
 .nav-btn.selected {
 	background-color: black;
-	/* border-radius: 3px; */
 }
 
 .nav-btn:hover:not(.disabled) svg *,
@@ -1365,16 +1345,43 @@ div.basemap-style-btn.active img {
 	fill: white;
 }
 
+.nav-menu-item,
+.contextmenu-item {
+	background-color: #fff;
+	white-space: nowrap;
+	padding: 6px 10px 7px 10px;
+	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 +1417,7 @@ div.basemap-style-btn.active img {
 
 
 .save-menu-link:hover {
-	/* background: #e6f7ff; */
-	font-weight: bold;	
+	color: black;
 }
 
 .save-item-label {