mapshaper 0.6.76 → 0.6.78

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;
   };
 
@@ -4279,6 +4278,10 @@
     return data;
   }
 
+  function layerHasAttributeData(lyr) {
+    return lyr.data && lyr.data.getFields().length > 0;
+  }
+
   function layerHasNonNullData(lyr) {
     return lyr.data && getFirstNonEmptyRecord(lyr.data.getRecords()) ? true : false;
   }
@@ -4552,6 +4555,7 @@
     __proto__: null,
     insertFieldValues: insertFieldValues,
     getLayerDataTable: getLayerDataTable,
+    layerHasAttributeData: layerHasAttributeData,
     layerHasNonNullData: layerHasNonNullData,
     layerHasGeometry: layerHasGeometry,
     layerIsGeometric: layerIsGeometric,
@@ -5123,10 +5127,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 +7208,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 +7327,7 @@
     copyDatasetForExport: copyDatasetForExport,
     copyDatasetForRenaming: copyDatasetForRenaming,
     getDatasetBounds: getDatasetBounds,
+    datasetIsEmpty: datasetIsEmpty,
     datasetHasGeometry: datasetHasGeometry,
     datasetHasPaths: datasetHasPaths,
     cleanupArcs: cleanupArcs,
@@ -13449,7 +13462,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++;
     }
@@ -18017,11 +18030,10 @@
     opts = utils.extend({}, opts);
     opts.rfc7946 = !opts.gj2008; // use RFC 7946 as the default
     var extension = opts.extension || "json";
-    var layerGroups, warn;
+    var layerGroups;
 
     if (opts.rfc7946) {
-      warn = getRFC7946Warnings(dataset);
-      if (warn) message(warn);
+      warnIfNotWgs84(dataset);
     }
 
     if (opts.file) {
@@ -18112,14 +18124,12 @@
     return feat;
   }
 
-  function getRFC7946Warnings(dataset) {
+  function warnIfNotWgs84(dataset) {
     var P = getDatasetCRS(dataset);
-    var str;
-    if (!P || !isLatLngCRS(P)) {
-      str = 'RFC 7946 warning: non-WGS84 GeoJSON output.';
-      if (P) str += ' Tip: use "-proj wgs84" to convert.';
-    }
-    return str;
+    if (P && isLatLngCRS(P) || datasetIsEmpty(dataset)) return;
+    var str = 'RFC 7946 warning: non-WGS84 GeoJSON output.';
+    if (P) str += ' Tip: use "-proj wgs84" to convert.';
+    message(str);
   }
 
   function getDatasetBbox(dataset, rfc7946) {
@@ -18389,7 +18399,7 @@
     'default': GeoJSON,
     exportGeoJSON: exportGeoJSON,
     exportLayerAsGeoJSON: exportLayerAsGeoJSON,
-    getRFC7946Warnings: getRFC7946Warnings,
+    warnIfNotWgs84: warnIfNotWgs84,
     getDatasetBbox: getDatasetBbox,
     exportDatasetAsGeoJSON: exportDatasetAsGeoJSON,
     preserveOriginalCRS: preserveOriginalCRS,
@@ -29352,7 +29362,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;
     };
 
@@ -45136,7 +45146,7 @@ ${svg}
               opts.target, getFormattedLayerList(job.catalog)));
         }
         if (!commandAcceptsEmptyTarget(name)) {
-          throw new UserError("No data is available");
+          stop("No data is available");
         }
       }
 
@@ -45522,7 +45532,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.76";
+  var version = "0.6.78";
 
   // 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;
 }
@@ -56,8 +60,6 @@ body {
 
 .selectable,.selectable * {
 	user-select: default;
-	-webkit-user-select: text;
-	-moz-user-select: text;
 	cursor: text;
 }
 
@@ -178,12 +180,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;	
 }
 
@@ -202,6 +208,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,
@@ -331,105 +338,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;
@@ -509,7 +439,7 @@ body.dragover #import-options-drop-area .drop-area {
 }
 
 .dropped-file-list {
-	margin-bottom: 8px;
+	margin-bottom: 4px;
 	max-height: 300px;
 	overflow-y: auto;
 }
@@ -532,6 +462,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;
@@ -546,12 +489,22 @@ body.dragover #import-options-drop-area .drop-area {
 	text-align: center;
 }
 
-.info-box,.popup,.contextmenu {
+.info-box,.popup {
 	border-radius: 9px;
-	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);
+	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 {
@@ -571,6 +524,10 @@ body.dragover #import-options-drop-area .drop-area {
 	/* border: 1px solid #aaa; */
 }
 
+.info-box label {
+	cursor: pointer;
+}
+
 .sidebar-buttons {
 	display: none;
 	position: absolute;
@@ -605,7 +562,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 {
@@ -827,6 +784,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;
 }
@@ -868,7 +830,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;
@@ -1044,13 +1006,6 @@ img.close-btn:hover,
 }*/
 
 
-.contextmenu {
-	font-size: 13px;
-	position: absolute;
-	z-index: 40;
-	padding: 5px 0;
-}
-
 /* --- Popup -------------------- */
 
 .popup {
@@ -1354,7 +1309,6 @@ div.basemap-style-btn.active img {
 	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);
 }
 
@@ -1397,7 +1351,7 @@ div.basemap-style-btn.active img {
 .contextmenu-item {
 	background-color: #fff;
 	white-space: nowrap;
-	padding: 6px 11px 7px 11px;
+	padding: 6px 10px 7px 10px;
 	line-height: 11px;
 	cursor: pointer;
 }