proj4 2.16.2 → 2.17.0

package/README.md

@@ -146,6 +146,7 @@ WKT1 definitions can contain a `TOWGS84` parameter. For proj strings, `towgs84`
 
 ## Grid Based Datum Adjustments
 
+### NTV2 format (.gsb)
 To use `+nadgrids=` in a proj definition or a WKT2/PROJJSON `ABRIDGEDTRANSFORM` with an `NTv2` method, first read your NTv2 `.gsb` file (e.g. from https://github.com/OSGeo/proj-datumgrid) into an ArrayBuffer, then pass it to `proj4.nadgrid`. E.g:
 
 ```javascript
@@ -164,6 +165,17 @@ proj4.nadgrid('key', buffer, {includeErrorFields:false});
 
 If the options argument is omitted, `includeErrorFields` is assumed to be true.
 
+
+### GeoTIFF format (.tif)
+To use `+nadgrids=` in a proj definition or a WKT2/PROJJSON `ABRIDGEDTRANSFORM` with a `GeoTIFF` method, first read your `.tif` file (e.g. from https://github.com/OSGeo/PROJ-data or https://cdn.proj.org/) into a GeoTIFF instance from the [GeoTIFF.js library](https://github.com/geotiffjs/geotiff.js/), then pass it to `proj4.nadgrid`. E.g:
+```javascript
+import { fromUrl} from "geotiff";
+const tiff = await fromUrl('ca_nrc_NA83SCRS.tif');
+await proj4.nadgrid('ca_nrc_NA83SCRS.tif', tiff).ready;
+```
+
+Then use the given key in your definition, e.g. `proj4.defs("EPSG:32188","+proj=tmerc +lat_0=0 +lon_0=-73.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=GRS80 +nadgrids=ca_nrc_NA83SCRS.tif +units=m +no_defs +type=crs");` noting the `+nadgrids=ca_nrc_NA83SCRS.tif` parameter.
+
 ## TypeScript
 
 TypeScript implementation was added to the [DefinitelyTyped repository](https://github.com/DefinitelyTyped/DefinitelyTyped).

package/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "homepage": "https://github.com/proj4js/proj4js",
   "main": "dist/proj4.js",

package/component.json

@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.16.2",
+  "version": "2.17.0",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "repo": "proj4js/proj4js",
   "keywords": [

package/dist/proj4-src.js

@@ -3349,10 +3349,17 @@
   var loadedNadgrids = {};
 
   /**
-   * Load a binary NTv2 file (.gsb) to a key that can be used in a proj string like +nadgrids=<key>. Pass the NTv2 file
-   * as an ArrayBuffer.
+   * Load either a NTv2 file (.gsb) or a Geotiff (.tif) to a key that can be used in a proj string like +nadgrids=<key>. Pass the NTv2 file
+   * as an ArrayBuffer. Pass Geotiff as a GeoTIFF instance from the geotiff.js library.
    */
   function nadgrid(key, data, options) {
+    if (data instanceof ArrayBuffer) {
+      return readNTV2Grid(key, data, options);
+    }
+    return { ready: readGeotiffGrid(key, data) };
+  }
+
+  function readNTV2Grid(key, data, options) {
     var includeErrorFields = true;
     if (options !== undefined && options.includeErrorFields === false) {
       includeErrorFields = false;
@@ -3366,6 +3373,50 @@
     return nadgrid;
   }
 
+  async function readGeotiffGrid(key, tiff) {
+    var subgrids = [];
+    var subGridCount = await tiff.getImageCount();
+    // proj produced tiff grid shift files appear to organize lower res subgrids first, higher res/ child subgrids last.
+    for (var subgridIndex = subGridCount - 1; subgridIndex >= 0; subgridIndex--) {
+      var image = await tiff.getImage(subgridIndex);
+
+      var rasters = await image.readRasters();
+      var data = rasters;
+      var lim = [image.getWidth(), image.getHeight()];
+      var imageBBoxRadians = image.getBoundingBox().map(degreesToRadians);
+      var del = [image.fileDirectory.ModelPixelScale[0], image.fileDirectory.ModelPixelScale[1]].map(degreesToRadians);
+
+      var maxX = imageBBoxRadians[0] + (lim[0] - 1) * del[0];
+      var minY = imageBBoxRadians[3] - (lim[1] - 1) * del[1];
+
+      var latitudeOffsetBand = data[0];
+      var longitudeOffsetBand = data[1];
+      var nodes = [];
+
+      for (let i = lim[1] - 1; i >= 0; i--) {
+        for (let j = lim[0] - 1; j >= 0; j--) {
+          var index = i * lim[0] + j;
+          nodes.push([-secondsToRadians(longitudeOffsetBand[index]), secondsToRadians(latitudeOffsetBand[index])]);
+        }
+      }
+
+      subgrids.push({
+        del: del,
+        lim: lim,
+        ll: [-maxX, minY],
+        cvs: nodes
+      });
+    }
+
+    var tifGrid = {
+      header: {
+        nSubgrids: subGridCount
+      },
+      subgrids: subgrids
+    };
+    loadedNadgrids[key] = tifGrid;
+    return tifGrid;
+  }
   /**
    * Given a proj4 value for nadgrids, return an array of loaded grids
    */
@@ -3397,6 +3448,10 @@
     };
   }
 
+  function degreesToRadians(degrees) {
+    return (degrees) * Math.PI / 180;
+  }
+
   function secondsToRadians(seconds) {
     return (seconds / 3600) * Math.PI / 180;
   }
@@ -3457,6 +3512,10 @@
     return grids;
   }
 
+  /**
+   * @param {*} nodes
+   * @returns Array<Array<number>>
+   */
   function mapNodes(nodes) {
     return nodes.map(function (r) {
       return [secondsToRadians(r.longitudeShift), secondsToRadians(r.latitudeShift)];
@@ -9454,7 +9513,7 @@
   proj4.nadgrid = nadgrid;
   proj4.transform = transform;
   proj4.mgrs = mgrs;
-  proj4.version = '2.16.2';
+  proj4.version = '2.17.0';
   includedProjections(proj4);
 
   return proj4;