mapshaper 0.7.18 → 0.7.20

package/www/modules.js

@@ -19359,6 +19359,76 @@
 	  return defn.trim();
 	}
 
+	// Convert an initialized proj object to a stable Proj.4 string for comparing
+	// coordinate transforms. This omits no-op/default params and canonicalizes
+	// equivalent WGS84 ellipsoid definitions to +datum=WGS84.
+	function get_normalized_proj_defn(P) {
+	  var parts = get_normalized_param_names(P).map(function(name) {
+	    return {name: name, param: get_param(P, name).trim()};
+	  });
+	  var geodParts = get_normalized_geod_params(P);
+	  var defn = '';
+	  var names;
+	  parts = parts.filter(function(part) { return part.param; });
+	  names = parts.map(function(part) { return part.name; });
+	  if (names.indexOf('proj') > -1) {
+	    defn += ' ' + parts.filter(function(part) { return part.name == 'proj'; })[0].param;
+	    parts = parts.filter(function(part) { return part.name != 'proj'; });
+	  }
+	  parts.sort(function(a, b) {
+	    return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;
+	  }).forEach(function(part) {
+	    defn += ' ' + part.param;
+	  });
+	  geodParts.sort(function(a, b) {
+	    return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;
+	  }).forEach(function(part) {
+	    defn += ' ' + part.param;
+	  });
+	  return defn.trim();
+	}
+
+	function get_normalized_param_names(P) {
+	  var skip = 'datum,ellps,a,b,es,rf,f,towgs84,nadgrids,R,R_A,R_V,R_a,R_lat_a,R_lat_g,pm,init,no_defs'.split(',');
+	  return Object.keys(P.params).filter(function(name) {
+	    if (skip.indexOf(name) > -1) return false;
+	    if (P.params[name].used === false) return false;
+	    if (name == 'axis' && pj_param(P.params, 'saxis') == 'enu') return false;
+	    return true;
+	  });
+	}
+
+	function get_normalized_geod_params(P) {
+	  if (uses_wgs84_datum(P)) {
+	    return [{name: 'datum', param: '+datum=WGS84'}];
+	  }
+	  return get_geod_defn(P).split(' ').filter(function(part) {
+	    return part && part != '+pm=0' && part != '+no_defs';
+	  }).map(function(part) {
+	    return {
+	      name: part.replace(/^\+([^=]+).*/, '$1'),
+	      param: part
+	    };
+	  });
+	}
+
+	function uses_wgs84_datum(P) {
+	  if (pj_param(P.params, 'sdatum') == 'WGS84') return true;
+	  return has_no_datum_shift(P) && is_wgs84_ellipsoid(P);
+	}
+
+	function has_no_datum_shift(P) {
+	  return (P.datum_params || []).every(function(val) { return val === 0; }) &&
+	    (P.gridlist_count || 0) === 0 &&
+	    (P.vgridlist_geoid_count || 0) === 0 &&
+	    !pj_param(P.params, 'snadgrids');
+	}
+
+	function is_wgs84_ellipsoid(P) {
+	  return P.a_orig == 6378137 &&
+	    Math.abs(P.es_orig - 0.0066943799901413165) < 0.000000000050;
+	}
+
 	function get_param(P, name) {
 	  var param = '';
 	  if (name in P.params) {
@@ -33324,6 +33394,7 @@
 	  get_rtodms: get_rtodms,
 	  get_dtodms: get_dtodms,
 	  get_proj_defn: get_proj_defn,
+	  get_normalized_proj_defn: get_normalized_proj_defn,
 	  pj_latlong_from_proj: pj_latlong_from_proj,
 	  pj_get_params: pj_get_params,
 	  pj_datums: pj_datums,

package/www/page.css

@@ -18,7 +18,7 @@
 	--xlt-theme-col: #f4f8f9;
 	--accent-col: #ffa; /* yellow logo text */
 	--theme-col: #1385B7; /* blue header / btn col */
-	--dk-theme-col: #1A6A96; /* btn hover col */
+	--dk-theme-col: #196d8e; /* #1A6A96;  btn hover col */
 	--lt-theme-col: #e6f7ff;
 	--colored-text: #10699b;
 	--normal-text: #333;
@@ -671,7 +671,7 @@ textarea:focus {
 	min-width: 230px;
 	word-wrap: break-word;
 	text-align: left;
-	margin-top: 12px;
+	margin-top: 16px;
 	padding: 14px 16px 13px 18px;
 	vertical-align: top;
 	display: inline-block;
@@ -874,7 +874,7 @@ body.sidebar-resizing .sidebar-resize-handle::before,
 
 .sidebar-tabs {
 	position: absolute;
-	top: 85px; /* below line intersection repair link */
+	top: 66px; /* below line intersection repair link */
 	left: 0;
 	z-index: 40;
 	pointer-events: auto;
@@ -882,6 +882,7 @@ body.sidebar-resizing .sidebar-resize-handle::before,
 
 body.sidebar-open .sidebar-tabs {
 	left: var(--left-sidebar-width);
+	margin-left: -1.5px;
 }
 
 body.sidebar-tabs-over-popup .sidebar-tabs {
@@ -889,6 +890,8 @@ body.sidebar-tabs-over-popup .sidebar-tabs {
 }
 
 .sidebar-tab {
+	border: 1px solid rgba(255,255,255,0.8);
+	border-right: none;																										;
 	writing-mode: vertical-rl;
 	transform: rotate(180deg);
 	background-color: var(--theme-col);
@@ -902,12 +905,17 @@ body.sidebar-tabs-over-popup .sidebar-tabs {
 	pointer-events: auto;
 }
 
-.sidebar-tab:hover,
+.sidebar-tab:hover {
+	background-color: var(--dk-theme-col);
+}
+
 body.layers-open .layer-tab,
 body.console-open .console-tab {
-	background-color: #1A6A96;
+	background-color: black;
 }
 
+
+
 .console-window {
 	pointer-events: auto;
 	background-color: black;
@@ -1109,7 +1117,6 @@ body.simplify .layer-control-btn {
 .layer-control .info-box {
 	padding: 0;
 	pointer-events: none;
-	background-color: transparent;
 }
 
 .layer-control div.info-box-scrolled {
@@ -2512,8 +2519,8 @@ body.dragging-color-picker * {
 	cursor: pointer;
 }
 
-.label-style-selection-row .label-editing-clear:hover {
-	color: black;
+.label-style-selection-row .label-editing-clear:hover,
+.repair-btn:hover {
 	text-decoration: underline;
 }
 

package/www/sponsor.html

@@ -36,11 +36,9 @@
 
 <h2>Recent work</h2>
 <ul class="support-list">
-  <li><strong>GeoParquet</strong> import and export</li>
-  <li><strong>GeoPackage</strong> import and export</li>
-  <li><strong>FlatGeobuf</strong> import and export</li>
-  <li><strong>SVG import</strong> &mdash; for round-tripping maps originally exported from Mapshaper</li>
-  <li><strong>Performance improvements</strong> for large datasets</li>
+  <li><strong>Raster importing</strong> &mdash; GeoTIFF + georeferenced JPEG and PNG</li>
+  <li><strong>Undo/redo</strong> in the browser &mdash; the most requested feature</li>
+  <li><strong>New vector formats</strong> &mdash; GeoParquet, GeoPackage and FlatGeobuf</li>
   <li><a href="docs/whats-new.html">Learn more</a></li>
 </ul>