proj4 2.16.1 → 2.17.0

package/lib/nadgrid.js

@@ -7,10 +7,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.
  */
 export default 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;
@@ -24,6 +31,51 @@ export default function nadgrid(key, data, options) {
   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
  */
@@ -55,6 +107,10 @@ function parseNadgridString(value) {
   };
 }
 
+function degreesToRadians(degrees) {
+  return (degrees) * Math.PI / 180;
+}
+
 function secondsToRadians(seconds) {
   return (seconds / 3600) * Math.PI / 180;
 }
@@ -115,6 +171,10 @@ function readSubgrids(view, header, isLittleEndian, includeErrorFields) {
   return grids;
 }
 
+/**
+ * @param {*} nodes
+ * @returns Array<Array<number>>
+ */
 function mapNodes(nodes) {
   return nodes.map(function (r) {
     return [secondsToRadians(r.longitudeShift), secondsToRadians(r.latitudeShift)];

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "proj4",
-  "version": "2.16.1",
+  "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://proj4js.github.io/proj4js/",
   "main": "dist/proj4-src.js",
   "module": "lib/index.js",
-  "directories": {
-    "test": "test",
-    "doc": "docs"
-  },
   "scripts": {
     "prepare": "npm run build && npm run test:all",
     "build": "grunt && npm run rollup",
@@ -38,6 +34,7 @@
     "@stylistic/eslint-plugin": "^4.2.0",
     "chai": "^5.0.0",
     "eslint": "^9.25.1",
+    "geotiff": "^2.1.3",
     "grunt": "^1.6.1",
     "grunt-cli": "^1.4.3",
     "mocha": "^10.2.0",
@@ -48,6 +45,6 @@
   "dependencies": {
     "geographiclib-geodesic": "^2.1.1",
     "mgrs": "1.0.0",
-    "wkt-parser": "^1.5.0"
+    "wkt-parser": "^1.5.1"
   }
 }

package/scripts/readme.md

@@ -1,10 +0,0 @@
-The script in this directory can be used to update `lib/constants/Datum.js` with data from a [`proj.db`](https://proj.org/en/stable/resource_files.html#proj-db) file placed in the root of the repository.
-
-After running the script, the formatting needs to be fixed.
-
-A complete command sequence (issued from the root of the repository) would look like this:
-
-    npm install sqlite3
-    node scripts/updateDatums.mjs
-    npm uninstall sqlite3
-    npm run format

package/scripts/updateDatums.mjs

@@ -1,119 +0,0 @@
-import sqlite3 from 'sqlite3';
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import datums from '../lib/constants/Datum.js'; // Import the datums object directly
-
-const DATUM_OVERRIDES = {
-  EPSG_4149: {
-    towgs84: '674.374,15.056,405.346'
-  },
-  EPSG_4267: {
-    towgs84: '-8.0,160.0,176.0'
-  },
-  EPSG_4818: {
-    towgs84: '589,76,480'
-  }
-};
-
-// Get the current file's directory
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-// Open proj.db
-const dbPath = path.resolve(__dirname, '../proj.db');
-const db = new sqlite3.Database(dbPath);
-
-for (const key in datums) {
-  if (key === datums[key].datumName && datums[datums[key].datumName] === datums[key]) {
-    delete datums[key];
-  }
-}
-
-const databaseDatumNames = new Set();
-
-// Query proj.db for Helmert transforms with method_code = 9606
-db.all(
-  `SELECT ht.source_crs_auth_name, 
-          ht.source_crs_code, 
-          ht.tx, ht.ty, ht.tz, 
-          ht.rx, ht.ry, ht.rz, 
-          ht.scale_difference,
-          ht.accuracy, 
-          gd.name AS datum_name,
-          cv.name AS datum_code,
-          e.name AS ellipse_name,
-          ht.method_code
-   FROM helmert_transformation ht
-   JOIN crs_view cv 
-     ON ht.source_crs_auth_name = cv.auth_name 
-    AND ht.source_crs_code = cv.code
-   JOIN geodetic_crs gcrs
-     ON cv.table_name = 'geodetic_crs'
-    AND cv.auth_name = gcrs.auth_name
-    AND cv.code = gcrs.code
-   JOIN geodetic_datum gd
-     ON gcrs.datum_auth_name = gd.auth_name
-    AND gcrs.datum_code = gd.code
-   JOIN ellipsoid e
-     ON gd.ellipsoid_auth_name = e.auth_name
-    AND gd.ellipsoid_code = e.code
-   WHERE ht.deprecated = 0 
-     AND ht.method_code IN (9606, 9607, 9603)
-     AND (ht.target_crs_auth_name = 'EPSG' AND ht.target_crs_code IN ('4326', '7019', '4258')) -- WGS84, GRS80, ETRS89
-     AND cv.type != 'vertical' -- Exclude vertical datums
-   ORDER BY
-     ht.accuracy ASC,
-     CASE ht.method_code 
-       WHEN 9606 THEN 1
-       WHEN 9607 THEN 2
-       WHEN 9603 THEN 3
-       ELSE 4
-     END ASC`, // Sort by method_code (9606 first, then 9607), then by accuracy`, // Assuming lower accuracy values are better
-  (err, rows) => {
-    if (err) {
-      console.error('Error querying proj.db:', err);
-      return;
-    }
-
-    rows.forEach((row) => {
-      const normalizedDatumName = row.datum_name.toLowerCase();
-
-      // Skip if the datumName already exists (case-insensitive)
-      if (databaseDatumNames.has(normalizedDatumName)) {
-        return;
-      }
-
-      if (row.method_code === 9607 && row.rx) {
-        row.rx = -row.rx;
-        row.ry = -row.ry;
-        row.rz = -row.rz;
-      }
-
-      // Construct the towgs84 string from tx, ty, tz, rx, ry, rz, and scale_difference
-      const towgs84 = row.rx ? `${row.tx},${row.ty},${row.tz},${row.rx},${row.ry},${row.rz},${row.scale_difference}` : `${row.tx},${row.ty},${row.tz}`;
-
-      datums[`${row.source_crs_auth_name}_${row.source_crs_code}`] = {
-        towgs84
-      };
-
-      databaseDatumNames.add(normalizedDatumName);
-    });
-
-    Object.assign(datums, DATUM_OVERRIDES);
-
-    // Write updated datums back to Datum.js
-    const datumFilePath = path.resolve(__dirname, '../lib/constants/Datum.js');
-    const updatedContent = `var datums = ${JSON.stringify(datums, null, 2)};\n\n`
-      + `for (var key in datums) {\n`
-      + `  var datum = datums[key];\n`
-      + `  if (!datum.datumName) {\n`
-      + `    continue;\n`
-      + `  }\n`
-      + `  datums[datum.datumName] = datum;\n`
-      + `}\n\n`
-      + `export default datums;`;
-    fs.writeFileSync(datumFilePath, updatedContent, 'utf-8');
-    console.log('Datum.js updated successfully!');
-  }
-);

package/scripts/updateEllipsoids.mjs

@@ -1,70 +0,0 @@
-import sqlite3 from 'sqlite3';
-import fs from 'fs';
-import path from 'path';
-import datums from '../lib/constants/Datum.js'; // Import datums directly
-import ellipsoids from '../lib/constants/Ellipsoid.js'; // Import ellipsoids directly
-import { fileURLToPath } from 'url';
-
-// Get the current file's directory
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-// Extract ellipsoid keys and ellipseName values from Ellipsoid.js
-const ellipsoidKeys = Object.keys(ellipsoids);
-const ellipsoidNames = Object.values(ellipsoids).map(ellipsoid => ellipsoid.ellipseName);
-
-// Combine ellipsoid keys and ellipseName values into a single set
-const ellipsoidSet = new Set([...ellipsoidKeys, ...ellipsoidNames]);
-
-// Extract ellipse values from Datum.js
-const datumEllipses = new Set(Object.values(datums).map(datum => datum.ellipse));
-
-// Find missing ellipses
-const missingEllipses = [...datumEllipses].filter(ellipse => !ellipsoidSet.has(ellipse));
-
-// If no missing ellipses, exit early
-if (missingEllipses.length === 0) {
-  console.log('No missing ellipses found.');
-  process.exit(0);
-}
-
-// Open proj.db
-const dbPath = path.resolve(__dirname, '../proj.db');
-const db = new sqlite3.Database(dbPath);
-
-// Query the ellipsoid table for missing ellipses
-const placeholders = missingEllipses.map(() => '?').join(',');
-const query = `
-  SELECT e.auth_name || ':' || e.code AS key,
-         e.semi_major_axis AS a,
-         e.inv_flattening AS rf,
-         e.name AS ellipseName
-  FROM ellipsoid e
-  WHERE e.name IN (${placeholders})
-`;
-
-db.all(query, missingEllipses, (err, rows) => {
-  if (err) {
-    console.error('Error querying proj.db:', err);
-    return;
-  }
-
-  // Add missing ellipsoids to the ellipsoids object
-  rows.forEach((row) => {
-    const key = row.key.replace(/:/g, '_'); // Replace ":" with "_" for valid JavaScript keys
-    ellipsoids[key] = {
-      a: row.a,
-      rf: row.rf,
-      ellipseName: row.ellipseName
-    };
-  });
-
-  // Write the updated ellipsoids object back to Ellipsoid.js
-  const ellipsoidFilePath = path.resolve(__dirname, '../lib/constants/Ellipsoid.js');
-  const ellipsoidContent = `var ellipsoids = ${JSON.stringify(ellipsoids, null, 2)};\n\nexport default ellipsoids;`;
-  fs.writeFileSync(ellipsoidFilePath, ellipsoidContent, 'utf-8');
-  console.log(`Ellipsoid.js updated successfully with ${rows.length} missing ellipsoids.`);
-});
-
-// Close the database connection
-db.close();

package/test/opt.html

@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Mocha Tests</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
-</head>
-<body><div id="mocha"></div>
-  <script src="../node_modules/mocha/mocha.js"></script>
-  <script src="../node_modules/chai/chai.js" type="module"></script>
-  <script src="testData.js"></script>
-  <script src="../dist/proj4.js"></script>
-  <script src="test.js"></script>
-  <script type="module">
-    import * as chai from '../node_modules/chai/chai.js';
-
-    mocha.setup({
-      reporter: "JSON",
-      ui: 'bdd',
-      globals: [],
-      timeout: 300000,
-      checkLeaks: false
-    });
-    startTests(chai,proj4,testPoints);
-    mocha.run();
-  </script>
-</body>
-</html>

package/test/puppeteer-tests.mjs

@@ -1,110 +0,0 @@
-import puppeteer from 'puppeteer';
-import http from 'http';
-import fs from 'fs';
-import path from 'path';
-import assert from 'assert';
-
-const hostname = process.env.HOST || '127.0.0.1'; // use hostname 127.0.0.1 unless there exists a preconfigured port
-const port = process.env.PORT || 8080; // use port 8080 unless there exists a preconfigured port
-
-const server = http.createServer(function (request, response) {
-  let filePath = request.url;
-
-  if (filePath === '/') {
-    filePath = 'index.html';
-  } else {
-    filePath = './' + request.url;
-  }
-
-  let extname = String(path.extname(filePath)).toLowerCase();
-  let mimeTypes = {
-    '.html': 'text/html',
-    '.js': 'text/javascript',
-    '.css': 'text/css',
-    '.json': 'application/json',
-    '.png': 'image/png',
-    '.jpg': 'image/jpg',
-    '.gif': 'image/gif',
-    '.svg': 'image/svg+xml',
-    '.wav': 'audio/wav',
-    '.mp4': 'video/mp4',
-    '.woff': 'application/font-woff',
-    '.ttf': 'application/font-ttf',
-    '.eot': 'application/vnd.ms-fontobject',
-    '.otf': 'application/font-otf',
-    '.wasm': 'application/wasm',
-    '.ico': 'image/x-icon'
-  };
-
-  let contentType = mimeTypes[extname] || 'application/octet-stream';
-
-  fs.readFile(filePath, function (error, content) {
-    if (error) {
-      if (error.code === 'ENOENT') {
-        fs.readFile('public/404.html', function (error, content) {
-          response.writeHead(404, { 'Content-Type': 'text/html' });
-          response.end(content, 'utf-8');
-        });
-      } else {
-        response.writeHead(500);
-        response.end('Sorry, check with the site admin for error: ' + error.code + ' ..\n');
-      }
-    } else {
-      response.writeHead(200, { 'Content-Type': contentType });
-      response.end(content, 'utf-8');
-    }
-  });
-});
-function timeoutPromise(timeout, callback) {
-  return new Promise((resolve, reject) => {
-    // Set up the timeout
-    const timer = setTimeout(() => {
-      reject(new Error(`Promise timed out after ${timeout} ms`));
-    }, timeout);
-
-    // Set up the real work
-    callback(
-      (value) => {
-        clearTimeout(timer);
-        resolve(value);
-      },
-      (error) => {
-        clearTimeout(timer);
-        reject(error);
-      }
-    );
-  });
-}
-(async () => {
-  server.listen(port, hostname);
-
-  // Launch the browser and open a new blank page
-
-  const browser = await puppeteer.launch({ headless: 'new', args: ['--no-sandbox'] });
-  const page = await browser.newPage();
-
-  // Navigate the page to a URL
-  await page.goto('http://' + hostname + ':' + port + '/test/opt.html');
-
-  // Set screen size
-  await page.setViewport({ width: 1080, height: 1024 });
-
-  // Type into search box
-  const testResult = await timeoutPromise(10000, (resolve) => {
-    page.on('console', (consoleMessage) => {
-      if (consoleMessage.type() === 'log') {
-        const res = JSON.parse(consoleMessage.text());
-        if (res.stats !== undefined) {
-          resolve(res.stats);
-        }
-      }
-    });
-  });
-
-  assert.strictEqual(testResult.failures, 0, 'Tests: passed: ' + testResult.passes + ', fail: ' + testResult.failures + ', total:' + testResult.tests);
-  assert.strictEqual(testResult.tests, testResult.passes, 'Tests: ' + testResult.passes + '/' + testResult.tests);
-  console.log('Tests: ' + testResult.passes + '/' + testResult.tests);
-
-  await browser.close();
-  server.close();
-})();

package/test/test-ci.mjs

@@ -1,10 +0,0 @@
-import * as chai from 'chai';
-import proj4 from '../dist/proj4-src.js';
-import testData from './testData.js';
-import startTests from './test.js';
-
-if (typeof process !== 'undefined' && process.toString() === '[object process]') {
-  (async function () {
-    startTests(chai, proj4, testData);
-  })();
-}