npm - mapshaper - Versions diffs - 0.7.14 → 0.7.15 - Mend

mapshaper 0.7.14 → 0.7.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/www/index.html CHANGED Viewed

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<title>Mapshaper</title>
-	<meta name="Description" content="A topology-aware tool for editing and converting geospatial vector data. Works with Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf, GeoParquet and KML — in the browser or on the command line.">
+	<meta name="Description" content="A topology-aware tool for editing and converting geospatial data. Works with Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf, GeoParquet, GeoTIFF, KML and CSV — in the browser or on the command line.">
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -307,7 +307,7 @@ a smoother appearance.</div></div></div></div>
 			<span><input type="checkbox" class="advanced-import-options">with advanced options</span>
 			<div class="mini-drop-area">
 				<div class="subtitle">Drop, paste or <span class="add-btn inline-btn btn"><span class="label-text">select</span></span> files to import.</div>
-				<div class="subtitle">Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf, GeoParquet, KML and CSV formats are supported. Files can be zipped or gzipped.</div>
+				<div class="subtitle">Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf, GeoParquet, GeoTIFF, KML, CSV and more are supported. Files can be zipped or gzipped.</div>
 			</div>
 		</div>
 		<div class="queued-file-section">

package/www/mapshaper-gui.js CHANGED Viewed

@@ -9401,8 +9401,8 @@
         } else if (kc == 40) {
           forward();
         } else if (kc == 32 && (!typing || (inputText === '' && typingInConsole))) {
-          // space bar toggles the sidebar if nothing has been typed
-          gui.toggleSidebar();
+          // space bar toggles the console tab if nothing has been typed
+          gui.toggleSidebarPanel('console');
         } else if (!typing && e.target != input.node() && !metaKey(e)) {
           // typing returns focus, unless a meta key is down (to allow Cmd-C copy)
           // or user is typing in a different input area somewhere
@@ -9419,9 +9419,9 @@
       // various shortcuts (while not typing in an input field or editable el)
       } else if (!typing) {
-         if (kc == 32) { // space bar toggles the sidebar
+         if (kc == 32) { // space bar toggles the console tab
           capture = true;
-          gui.toggleSidebar();
+          gui.toggleSidebarPanel('console');
         // } else if (kc == 73) { // letter i opens inspector
         //   gui.dispatchEvent('interaction_toggle');
         } else if (kc == 72) { // letter h resets map extent
@@ -10788,17 +10788,25 @@
     headerBtn.on('click', function() {
       toggle();
     }).on('keydown', function(e) {
-      if (e.key == 'Enter' || e.key == ' ') {
+      if (e.key == 'Enter') {
         e.preventDefault();
         e.stopPropagation();
         toggle();
+      } else if (e.key == ' ') {
+        e.preventDefault();
+        e.stopPropagation();
+        gui.toggleSidebarPanel('console');
       }
     });
     tab.on('click', toggle).on('keydown', function(e) {
-      if (e.key == 'Enter' || e.key == ' ') {
+      if (e.key == 'Enter') {
         e.preventDefault();
         e.stopPropagation();
         toggle();
+      } else if (e.key == ' ') {
+        e.preventDefault();
+        e.stopPropagation();
+        gui.toggleSidebarPanel('console');
       }
     });

package/www/mapshaper.js CHANGED Viewed

@@ -35693,6 +35693,7 @@ ${svg}
   }
   var geotiffPromise = null;
+  var geoKeysToProj4Promise = null;
   var dynamicImportModule = Function('id', 'return import(id)');
   var DEFAULT_MAX_IMPORT_PIXELS = 16e6;
@@ -35734,6 +35735,18 @@ ${svg}
     return mod.default && !mod.fromArrayBuffer ? mod.default : mod;
   }
+  async function loadGeoKeysToProj4Lib() {
+    var mod;
+    if (runningInBrowser()) {
+      return require$1('geotiff-geokeys-to-proj4');
+    }
+    if (!geoKeysToProj4Promise) {
+      geoKeysToProj4Promise = dynamicImportModule('geotiff-geokeys-to-proj4');
+    }
+    mod = await geoKeysToProj4Promise;
+    return mod.default || mod;
+  }
   async function openGeoTIFF(source, geotiff) {
     if (!source) {
       stop$1('Missing GeoTIFF source data');
@@ -36040,23 +36053,123 @@ ${svg}
   }
   async function importGeoTIFFCrs(dataset, image) {
-    var crsString = getGeoTIFFCrsString(image);
+    var crsInfo = await getGeoTIFFCrsInfo(image);
+    var crsString = crsInfo.crsString;
     if (!crsString) {
-      warnOnce('Unable to import CRS from GeoTIFF metadata');
+      warnOnce(getGeoTIFFCrsWarning(crsInfo));
       return;
     }
-    await initProjLibrary({crs: crsString});
     try {
+      await initProjLibrary({crs: crsString});
       setDatasetCrsInfo(dataset, getCrsInfo(crsString));
     } catch(e) {
-      dataset.info = Object.assign(dataset.info || {}, {crs_string: crsString});
+      dataset.info = dataset.info || {};
+      warnOnce(getGeoTIFFCrsWarning(crsInfo, e.message || e));
     }
   }
-  function getGeoTIFFCrsString(image) {
+  async function getGeoTIFFCrsInfo(image) {
     var keys = image.getGeoKeys && image.getGeoKeys() || {};
-    var code = keys.ProjectedCSTypeGeoKey || keys.GeographicTypeGeoKey;
-    return code ? 'EPSG:' + code : null;
+    var code = keys.ProjectedCSTypeGeoKey;
+    var customProjection;
+    if (isGeoTIFFAuthorityCode(code)) {
+      return {crsString: 'EPSG:' + code};
+    }
+    customProjection = await getGeoTIFFCustomProjection(keys);
+    if (customProjection.crsString) return customProjection;
+    code = keys.GeographicTypeGeoKey;
+    if (isGeoTIFFAuthorityCode(code)) return {crsString: 'EPSG:' + code};
+    return {crsString: null, warning: customProjection.warning};
+  }
+  function getGeoTIFFCrsWarning(crsInfo, detail) {
+    if (detail || crsInfo && crsInfo.warning) {
+      logGeoTIFFCrsWarningDetails(detail, crsInfo && crsInfo.warning);
+    }
+    return 'The GeoTIFF does not contain usable CRS data';
+  }
+  function isGeoTIFFAuthorityCode(code) {
+    return code > 0 && code != 32767;
+  }
+  async function getGeoTIFFCustomProjection(keys) {
+    var converted = await getGeoTIFFProj4FromGeoKeys(keys);
+    if (converted.crsString) return converted;
+    if (keys.ProjectedCSTypeGeoKey != 32767 && keys.ProjectionGeoKey != 32767) return converted;
+    if (keys.ProjCoordTransGeoKey == 11) {
+      return {
+        crsString: getGeoTIFFAlbersProjection(keys),
+        warning: converted.warning
+      };
+    }
+    return converted;
+  }
+  async function getGeoTIFFProj4FromGeoKeys(keys) {
+    var geokeysToProj4, result;
+    try {
+      geokeysToProj4 = await loadGeoKeysToProj4Lib();
+      result = geokeysToProj4.toProj4(keys);
+    } catch(e) {
+      return {crsString: null, warning: {type: 'GeoKey converter error', error: e.message || e}};
+    }
+    if (result && result.proj4) {
+      return {crsString: normalizeGeoTIFFProj4(result.proj4)};
+    }
+    return {crsString: null, warning: result && result.errors || null};
+  }
+  function normalizeGeoTIFFProj4(str) {
+    return String(str).replace(/\s\+axis=[^ ]+/g, '').trim();
+  }
+  function logGeoTIFFCrsWarningDetails(parseError, converterDetails) {
+    if (typeof console == 'undefined' || !console.warn) return;
+    console.warn('Unable to import GeoTIFF CRS metadata', {
+      parseError: parseError || null,
+      converterDetails: converterDetails || null
+    });
+  }
+  function getGeoTIFFAlbersProjection(keys) {
+    var units = getGeoTIFFLinearUnits(keys);
+    var ellipsoid = getGeoTIFFEllipsoid(keys);
+    if (!units || !ellipsoid ||
+        !isFinite(keys.ProjStdParallel1GeoKey) || !isFinite(keys.ProjStdParallel2GeoKey) ||
+        !isFinite(keys.ProjNatOriginLatGeoKey) || !isFinite(keys.ProjNatOriginLongGeoKey)) {
+      return null;
+    }
+    return [
+      '+proj=aea',
+      '+lat_1=' + keys.ProjStdParallel1GeoKey,
+      '+lat_2=' + keys.ProjStdParallel2GeoKey,
+      '+lat_0=' + keys.ProjNatOriginLatGeoKey,
+      '+lon_0=' + keys.ProjNatOriginLongGeoKey,
+      '+x_0=' + (keys.ProjFalseEastingGeoKey || 0),
+      '+y_0=' + (keys.ProjFalseNorthingGeoKey || 0),
+      ellipsoid,
+      units
+    ].join(' ');
+  }
+  function getGeoTIFFLinearUnits(keys) {
+    var code = keys.ProjLinearUnitsGeoKey;
+    if (!code || code == 9001) return '+units=m';
+    if (code == 9002) return '+units=ft';
+    if (code == 9003) return '+to_meter=0.3048006096012192';
+    return null;
+  }
+  function getGeoTIFFEllipsoid(keys) {
+    if (keys.GeographicTypeGeoKey == 4326) return '+datum=WGS84';
+    if (isFinite(keys.GeogSemiMajorAxisGeoKey) && isFinite(keys.GeogInvFlatteningGeoKey)) {
+      return '+a=' + keys.GeogSemiMajorAxisGeoKey + ' +rf=' + keys.GeogInvFlatteningGeoKey;
+    }
+    if (isFinite(keys.GeogSemiMajorAxisGeoKey) && isFinite(keys.GeogSemiMinorAxisGeoKey)) {
+      return '+a=' + keys.GeogSemiMajorAxisGeoKey + ' +b=' + keys.GeogSemiMinorAxisGeoKey;
+    }
+    return null;
   }
   async function importImageRaster(input, optsArg) {
@@ -57269,7 +57382,7 @@ ${svg}
     });
   }
-  var version = "0.7.14";
+  var version = "0.7.15";
   // 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.