@dataforsyningen/saul 4.2.0 → 5.0.0

package/.github/workflows/release-package.yml

@@ -4,14 +4,18 @@ on:
   release:
     types: [created]
 
+permissions:
+  id-token: write  # Required for OIDC
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
-          node-version: 16
+          node-version: 26
       - run: npm ci
       # - run: npm test
 
@@ -21,11 +25,9 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
-          node-version: 16
+          node-version: 26
           registry-url: https://registry.npmjs.org
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+      - run: npm stage publish --access public

package/Dockerfile

@@ -0,0 +1,13 @@
+FROM node:26-alpine
+
+# Set the working directory inside the container
+WORKDIR /saul
+
+# Copy files to the container
+COPY . .
+
+# Install dependencies
+RUN npm install
+
+# Run the Vite dev server
+CMD ["npm", "run", "test"]

package/README.md

@@ -11,7 +11,7 @@ You can use these as building blocks for your own web application that wants to
 npm i --save @dataforsyningen/saul
 ```
 
-2. Create a configuration file or Javascript object with proper values and make sure to load it into your application before using any of the SAUL utilities. This package ships with an example configuration file at `/example/config.js.example`
+2. Create a configuration file or Javascript object with proper values and make sure to load it into your application before using any of the SAUL utilities. This package ships with an example configuration file at [`config.js.example`](config.js.example)
 
 ## How to use
 
@@ -39,11 +39,16 @@ From within `node_modules/@dataforsyningen/saul` you can run the `test` command
 npm run test
 ```
 
+Or if you have Docker, you may run the test in a container:
+```shell
+docker compose run --rm saul
+```
+
 ## Updating local terrain model
 
 The Saul package includes a terrain elevation model hosted as a single GeoTiff file for events where terrain data from Datafordeler service is unavailable. To update the terrain model, simply download a new GeoTiff from Datafordeler with the following URL (supply your own username/password) and save it to `/assets/dk-terrain.tiff` in the package directory.
 
-https://services.datafordeler.dk/DHMNedboer/dhm_wcs/1.0.0/WCS?SERVICE=WCS&COVERAGE=dhm_terraen&RESPONSE_CRS=epsg:25832&CRS=epsg:25832&FORMAT=GTiff&REQUEST=GetCoverage&VERSION=1.0.0&username=xxx&password=xxx&height=1000&width=1260&bbox=430000,6040000,900000,6413000
+https://wcs.datafordeler.dk/DHMNedboer/dhm_wcs/1.0.0/WCS?SERVICE=WCS&COVERAGE=dhm_terraen&RESPONSE_CRS=epsg:25832&CRS=epsg:25832&FORMAT=GTiff&REQUEST=GetCoverage&VERSION=1.0.0&apikey=xxx&height=1000&width=1260&bbox=430000,6040000,900000,6413000
 
 
 ## Acknowledgements

package/compose.yaml

@@ -0,0 +1,10 @@
+services:
+  saul:
+    build: .
+    volumes:
+      - .:/saul  # Local source of Saul library
+      - /saul/node_modules  # Do not mount over node_modules
+    environment:
+      - NODE_ENV=development
+    deploy:
+      mode: replicated_job

package/config.js.example

@@ -4,9 +4,10 @@ export default {
   API_STAC_TOKEN: "", // Dataforsyningen token
   API_STAC_BASEURL: "https://api.dataforsyningen.dk/rest/skraafoto_api/v2",
 
-  // DHM URL and auth can be aquired from https://datafordeler.dk/dataoversigt/danmarks-hoejdemodel-dhm/koter/
-  API_DHM_WCS_BASEURL: "https://services.datafordeler.dk/DHMNedboer/dhm_wcs/1.0.0/WCS",
-  API_DHM_BASEURL: "https://services.datafordeler.dk/DHMTerraen/DHMKoter/1.0.0/GEOREST/HentKoter",
-  API_DHM_TOKENA: "", // DHM API service username
-  API_DHM_TOKENB: "" // DHM API service password
+  // DHM WCS URL can be aquired from https://datafordeler.dk/dataoversigt/danmarks-hoejdemodel-dhm/dhm-wcs/
+  API_DHM_WCS_BASEURL: "https://wcs.datafordeler.dk/DHMNedboer/dhm_wcs/1.0.0/WCS",
+  // DHM WMS URL can be aquired from https://datafordeler.dk/dataoversigt/danmarks-hoejdemodel-dhm/dhm-wms/
+  API_DHM_WMS_BASEURL: "https://wms.datafordeler.dk/DHMNedboer/dhm/1.0.0/WMS",
+  // DHM auth is described at https://confluence.kds.dk/pages/viewpage.action?pageId=187105503#Autentifikationsmetoderp%C3%A5DatafordelerAdministration-API-Key
+  API_DHM_KEY: "", // DHM API service key
 }

package/index.js

@@ -1,11 +1,8 @@
 // Import/export modules with their public methods
 
 export {
-  postSTAC,
   getSTAC,
-  getDHM,
-  get,
-  post
+  get
 } from './modules/api.js'
 
 export {
@@ -17,6 +14,7 @@ export {
   getElevation,
   visualizeGeotiff,
   getZ,
+  DHMParseError,
   getTerrainGeoTIFF,
   getDenmarkGeoTiff,
   getTerrainByBbox,

package/modules/api.js

@@ -62,7 +62,12 @@ function getErrorMsg() {
   return error_msg
 }
 
-/** Returns response data */
+/**
+ *  Returns response data
+ * @param {Response} response
+ * @param {boolean} is_json Whether to extract JSON data from the response body.
+ * @returns {(Response|Promise.<object>)} The response object or a Promise with the JavaScript representation of the response body JSON.
+ */
 function HttpResponseHandler(response, is_json) {
   if (!response.ok) {
     error_msg = response.status
@@ -79,12 +84,12 @@ function HttpResponseHandler(response, is_json) {
   
 }
 
-/** 
- * GET HTTP responsee from API
- * @param {string} url - API service URL, including endpoint paths and query parameters.
- * @param {object} [config] - Custom request configs. See https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#supplying_request_options
- * @param {boolean} [is_json] - `true` if requested output is JSON
- * @returns {object} response object
+/**
+ * GET HTTP response from API
+ * @param {string} url API service URL, including endpoint paths and query parameters.
+ * @param {object} [config] Custom request config, see https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#supplying_request_options.
+ * @param {boolean} [is_json=true] `true` (default) if the response body JSON shall be converted to JavaScript representation and returned, `false` if the response object shall be returned.
+ * @returns {Promise<(Response|object)>} A Promise with the response object or with the JavaScript representation of the response body JSON.
  */
 function get(url, config = {}, is_json = true) {
   if (!url) {
@@ -150,16 +155,18 @@ function post(url, requestbody, token) {
   }
 }
 
-/** 
- * API method to fetch data from DHM
- * @param {string} query - DHM API query. Find details at https://datafordeler.dk/dataoversigt/danmarks-hoejdemodel-dhm/koter/
- * @param {{API_DHM_BASEURL: string, API_DHM_TOKENA: string, API_DHM_TOKENB: string}} auth - API autentication data. See ../config.js.example for reference.
- * @returns {object} Response data
+/**
+ * Fetch data from DHM
+ * @param {string} query DHM API query. Find details at https://datafordeler.dk/dataoversigt/danmarks-hoejdemodel-dhm/dhm-wms/
+ * @param {object} auth API autentication data. See ../config.js.example for reference.
+ * @param {string} auth.API_DHM_WMS_BASEURL The base URL of the DHM WMS endpoint.
+ * @param {string} auth.API_DHM_KEY Your API key to access services on Datafordeler.
+ * @returns {Promise.<string>} Eventually the response body text.
  */
 function getDHM(query, auth) {
-  const auth_params = `&username=${auth.API_DHM_TOKENA}&password=${auth.API_DHM_TOKENB}`
-  return get(encodeURI(auth.API_DHM_BASEURL + query + auth_params), {cache: 'force-cache'})
-  .then((data) => data)
+  const auth_params = `&apikey=${encodeURIComponent(auth.API_DHM_KEY)}`
+  return get(auth.API_DHM_WMS_BASEURL + '?SERVICE=WMS&VERSION=1.3.0' + query + auth_params, { cache: 'force-cache' }, false)
+    .then((response) => response.text())
 }
 
 /** 

package/modules/elevation.js

@@ -15,7 +15,7 @@ function calcSizeRatio(sizeX, bbox) {
 
 /** Fetches a GeoTIFF with elevation data matching the bounding box of a STAC API item (image)
  * @param {object} stac_item - STAC API item from a featureCollection request
- * @param {{API_DHM_WCS_BASEURL: string, API_DHM_TOKENA: string, API_DHM_TOKENB: string}} auth - API autentication data. See ../config.js.example for reference.
+ * @param {{API_DHM_WCS_BASEURL: string, API_DHM_KEY: string}} auth - API autentication data. See ../config.js.example for reference.
  * @param {number} [resolution] - Resolution (1 - 0.01). Higher number means more pixels and better precision.
  * @returns {object} GeoTiff data
  */
@@ -149,22 +149,62 @@ function zeroPadNumber(input) {
   }
 }
 
-/** 
- * Fetches a single elevation value based on X,Y coordinates using DHM/Koter endpoint
- * @param {number} xcoor - EPSG:25832 X coordinate
- * @param {number} ycoor - EPSG:25832 Y coordinate
- * @param {{API_DHM_BASEURL: string, API_DHM_USERNAME: string, API_DHM_PASSWORD: string}} auth - API autentication data. See ../config.js.example for reference.
- * @returns {number} Elevation in meters 
+/**
+ * Exception thrown, when the response from DHM cannot be parsed.
+ * @extends Error
+ * @property {string} [response] The given response text from DHM.
+ * @property {RexExp} [pattern] The given pattern used to parse the response text.
+ */
+class DHMParseError extends Error {
+  /**
+   * Create a parse exception. All arguments are forwarded to Error.
+   * @param {string} message Description of exception.
+   * @param {object} [options] Standard options parameter to Error, may contain a cause, see Error.
+   * @param {string} [options.response] Response text from DHM, that could not be parsed with pattern.
+   * @param {RegExp} [options.pattern] The pattern, that did not parse the Response text well.
+   */
+  constructor(...params) {
+    super(...params);
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, DHMParseError);
+    }
+    this.name = "DHMParseError";
+    if (params.length > 1 && typeof params[1] == 'object') {
+      if (params[1].response)
+        this.response = params[1].response;
+      if (params[1].pattern)
+        this.pattern = params[1].pattern;
+    }
+  }
+}
+
+/**
+ * Fetches a single elevation value based on X,Y coordinates using DHM/Koter endpoint.
+ * @param {number} xcoor EPSG:25832 X coordinate.
+ * @param {number} ycoor EPSG:25832 Y coordinate.
+ * @param {object} auth API autentication data. See ../config.js.example for reference.
+ * @param {string} auth.API_DHM_WMS_BASEURL The base URL of the DHM WMS endpoint.
+ * @param {string} auth.API_DHM_KEY Your API key to access services on Datafordeler.
+ * @returns {number} Eventually returns the elevation in meters.
+ * @throws {DHMParseError} When unable to parse response from DHM WMS.
  */
 async function getZ(xcoor, ycoor, auth) {
-  let zcoor_data = await getDHM(`?geop=POINT(${xcoor} ${ycoor})&elevationmodel=dtm`, auth)
-  let z = zcoor_data.HentKoterRespons.data[0].kote
-  return z
+  const request = '&request=GetFeatureInfo&styles=&layers=dhm_terraen&query_layers=dhm_terraen&info_format=text/plain&i=175&j=175&width=351&height=351'
+  const bbox = [xcoor - 1, ycoor - 1, xcoor + 1, ycoor + 1]
+  const coords = '&crs=EPSG:25832&bbox=' + encodeURIComponent(bbox.join())
+  const dhm_text = await getDHM(request + coords, auth)
+  const text_begin = /GetFeatureInfo\s+results:\s*Layer\s+'dhm_terraen'\s+Feature\s*0:\s*value_0\s*=\s*'/y
+  if (text_begin.test(dhm_text)) {
+    const z = parseFloat(dhm_text.slice(text_begin.lastIndex))
+    if (z) return z
+    throw new DHMParseError('Cannot parse float value in response text from DHM GetFeatureInfo after pattern.', { response: dhm_text, pattern: text_begin })
+  }
+  throw new DHMParseError('Cannot match response text from DHM GetFeatureInfo with pattern.', { response: dhm_text, pattern: text_begin })
 }
 
 /** Fetches a GeoTIFF with elevation data matching a bounding box of EPSG:25832 coordinates
  * @param {Array} bbox - Bounding box array consisting of two sets of EPSG:25832 coordinates (ie. `[543049, 6153925, 544463, 6155221]`)
- * @param {{API_DHM_WCS_BASEURL: string, API_DHM_TOKENA: string, API_DHM_TOKENB: string}} auth - API autentication data. See ../config.js.example for reference.
+ * @param {{API_DHM_WCS_BASEURL: string, API_DHM_KEY: string}} auth - API autentication data. See ../config.js.example for reference.
  * @param {number} [sizeLimit] - Optional size limiter. Will request GeoTIFF with width that does not exceed this number. Default is 500
  * @returns {object} GeoTiff data
  */
@@ -176,7 +216,7 @@ function getTerrainByBbox(bbox, auth, sizeLimit = 500) {
   // GET request for DHM WCS data
   let url = auth.API_DHM_WCS_BASEURL
   url += '?SERVICE=WCS&COVERAGE=dhm_terraen&RESPONSE_CRS=epsg:25832&CRS=epsg:25832&FORMAT=GTiff&REQUEST=GetCoverage&VERSION=1.0.0'
-  url += `&username=${ auth.API_DHM_TOKENA }&password=${ auth.API_DHM_TOKENB }`
+  url += `&apikey=${ auth.API_DHM_KEY }`
   url += `&height=${ height }`
   url += `&width=${ width }`
   url += `&bbox=${ Math.round(bbox[0]) - 200 },${ Math.round(bbox[1]) - 200 },${ Math.round(bbox[2]) + 200},${ Math.round(bbox[3]) + 200}` // Add/subtract 200 meters to bbox to ensure coverage on the edges
@@ -197,6 +237,7 @@ export {
   getElevation,
   visualizeGeotiff,
   getZ,
+  DHMParseError,
   getTerrainGeoTIFF,
   getDenmarkGeoTiff,
   getTerrainByBbox,

package/modules/image.js

@@ -142,10 +142,6 @@ function iterateRecursive(image_data, col, row, z, count, limit, auth, i) {
   const worldcoor = image2world(image_data,col,row,z)
 
   i--
-  if (i <= 0) {
-    // max iterations reached
-    return [worldcoor, 0, count]
-  }
 
   // Get new z value from coordinates
   return getZ(worldcoor[0],worldcoor[1], auth).then((new_z) => {
@@ -153,13 +149,12 @@ function iterateRecursive(image_data, col, row, z, count, limit, auth, i) {
     // How big is the different between z and new z?
     const delta = Math.abs(new_z - z)
     
-    if (delta >= limit) {
-      // If the difference is too big, try building coordinates with the new z
-      count = count + 1
-      return iterateRecursive(image_data, col, row, new_z, count, limit, auth, i)
-    } else {
-      // If the difference is small, return coordinates
+    if (delta < limit || i <= 0) {
+      // If the difference is small or max iterations reached, return coordinates
       return [worldcoor, delta, count]
+    } else {
+      // If the difference is too big, try building coordinates with the new z
+      return iterateRecursive(image_data, col, row, new_z, count + 1, limit, auth, i)
     }
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataforsyningen/saul",
-  "version": "4.2.0",
+  "version": "5.0.0",
   "description": "This is a collection of stand-alone methods for photogrammetry calculations and API interactions for 'Danske Skråfotos'.",
   "main": "index.js",
   "type": "module",
@@ -10,23 +10,23 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/SDFIdk/saul.git"
+    "url": "git+https://github.com/Klimadatastyrelsen/saul.git"
   },
   "keywords": [
     "skråfoto",
-    "SDFI",
+    "SDFI", "KDS",
     "saul"
   ],
   "author": {
-    "name": "Styrelsen for Dataforsyning og Infrastruktur",
-    "email": "support@sdfi.dk",
-    "url": "https://sdfi.dk/"
+    "name": "Klimadatastyrelsen",
+    "email": "support@kds.dk",
+    "url": "https://kds.dk/"
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/SDFIdk/saul/issues"
+    "url": "https://github.com/Klimadatastyrelsen/saul/issues"
   },
-  "homepage": "https://github.com/SDFIdk/saul#readme",
+  "homepage": "https://github.com/Klimadatastyrelsen/saul#readme",
   "devDependencies": {
     "jsdoc": "^4.0.2"
   },

package/test/assert.js

@@ -0,0 +1,48 @@
+import assert from 'node:assert'; // https://nodejs.org/api/assert.html
+
+/**
+ * @class Assert
+ * @param {AssertOptions} [options] - Optional configuration for assertions, see node:assert.Assert.
+ * @throws {ERR_CONSTRUCT_CALL_REQUIRED} If not called with `new`.
+ */
+export class Assert extends assert.Assert {
+    constructor(options) {
+        super(options);
+    }
+
+    /**
+     * Test for approximate equality.
+     * @param {(number | Array<number>} actual
+     * @param {(number | Array<number>} expected
+     * @param {number} [tolerance] Allowed deviation (default 0.5).
+     * @param {string | Error | MessageFactory} [message]
+     * @returns {number} Difference between actual and expected value.
+     */
+    almostEqual(actual, expected, tolerance = 0.5, ...message) {
+        if (arguments.length < 2) {
+            throw new ERR_MISSING_ARGS('actual', 'expected');
+        }
+        const diff = [];
+        if (expected instanceof Array) {
+            for (let i = 0; i < expected.length; i++) {
+                diff[i] = Math.abs(actual[i] - expected[i]);
+            }
+        } else {
+            diff[0] = Math.abs(actual - expected);
+        }
+        const maxdiff = Math.max(...diff);
+        if (maxdiff <= tolerance) {
+            return maxdiff;
+        } else {
+            try {
+                if (arguments.length < 4) {
+                    message[0] = 'Expected values to be almost equal:';
+                }
+                this.deepStrictEqual(actual, expected, ...message);
+            } catch (err) {
+                err.operator = `tolerance ${tolerance}`;
+                throw err;
+            }
+        }
+    }
+}

package/test/saul-core.test.js

@@ -4,9 +4,11 @@
 // Check config.js.example for info on how to set it up
 import auth from '../config.js'
 
-import assert from 'assert'
+import { Assert } from './assert.js'
 import {getSTAC, world2image, image2world, getZ, iterate} from '../index.js'
 
+const assert = new Assert()
+
 console.log('---------------')
 console.log('  Core tests   ')
 console.log('---------------')
@@ -27,20 +29,14 @@ const image_x = 41839.698939
 const image_y = 3204.326930
 const world_elevation = 38.874336
 
-function is_equalIsh(num1, num2, deviation = 0.05) {
-  if (Math.abs(num1 - num2) > deviation) {
-    return false
-  } else {
-    return true
-  }
-} 
+const deviation = 0.05
 
 // Test getZ
 try {
 
   let elevation = await getZ(world_x, world_y, auth)
 
-  assert(is_equalIsh(elevation, world_elevation), "getZ fail: This is not the Z value we were hoping for.")
+  assert.almostEqual(elevation, world_elevation, deviation, 'getZ fail: Elevation is way apart from expected:')
   
   console.log("Test getZ OK")
 
@@ -53,8 +49,7 @@ try {
 
   let ite = await iterate(item, image_x, image_y, auth, 0.05)
 
-  assert(is_equalIsh(ite[0][0], world_x), "iterate fail: The coordinate values are not equal") //test if the values are equal
-  assert(is_equalIsh(ite[0][1], world_y), "iterate fail: The coordinate values are not equal") //test if the values are equal
+  assert.almostEqual(ite[0], [world_x, world_y], 0.1, `iterate fail: Coordinates are way apart, ite: ${ite}.`)
 
   console.log("Test iterate OK")
 
@@ -67,8 +62,7 @@ try {
 
   let xy = world2image(item, world_x, world_y, world_elevation)
 
-  assert(is_equalIsh(xy[0], image_x, 1), `world2image fail: The x coordinate values ${xy[0]} ${image_x} are not equal`)
-  assert(is_equalIsh(xy[1], image_y, 1), `world2image fail: The y coordinate values ${xy[1]} ${image_y} are not equal`)
+  assert.almostEqual(xy, [image_x, image_y], 1, 'world2image fail: The coordinate values are not as expected:')
   
   console.log("Test world2image OK")
 
@@ -81,8 +75,7 @@ try {
 
   let coords = image2world(item, image_x, image_y, world_elevation)
 
-  assert(is_equalIsh(coords[0], world_x), "image2world fail: The longitude values are not equal")
-  assert(is_equalIsh(coords[1], world_y), "image2world fail: The latitude values are not equal")
+  assert.almostEqual(coords, [world_x, world_y], deviation, 'image2world fail: The longitude or latitude are not equal to expected:')
 
   console.log("Test image2world OK")
 
@@ -96,8 +89,7 @@ try {
   let xy1 = world2image(item, world_x, world_y, world_elevation)
   let coords1 = image2world(item, xy1[0], xy1[1], world_elevation)
 
-  assert(is_equalIsh(coords1[0], world_x), "world2image > image2world fail: The longitude values are not equal")
-  assert(is_equalIsh(coords1[1], world_y), "world2image > image2world fail: The latitude values are not equal")
+  assert.almostEqual(coords1, [world_x, world_y], deviation, 'world2image > image2world fail: The longitude or latitude values are not equal to expected:')
 
   console.log("Test world2image > image2world OK")
 
@@ -109,10 +101,9 @@ try {
 try {
 
   let xy2 = world2image(item, world_x, world_y, world_elevation)
-  let coords2 = iterate(item, xy2[0], xy2[1], auth)
-
-  assert(is_equalIsh(coords2[0], world_x), "world2image > iterate fail: The longitude values are not equal")
-  assert(is_equalIsh(coords2[1], world_y), "world2image > iterate fail: The latitude values are not equal")
+  let iterate_result = await iterate(item, xy2[0], xy2[1], auth, 0.1)
+  let coords2 = iterate_result[0]
+  assert.almostEqual(coords2, [world_x, world_y], 0.1, `world2image > iterate fail: The longitude or latitude values are not equal, iterate result: ${iterate_result}.`)
 
   console.log("Test world2image > iterate OK")
 

package/test/saul-elevation.test.js

@@ -2,9 +2,11 @@
 // Check config.js.example for info on how to set it up
 import auth from '../config.js'
 
-import assert from 'assert'
+import { Assert } from './assert.js'
 import { getElevation, get, getTerrainGeoTIFF, getZ, getWorldXYZ, world2image, getTerrainByBbox } from '../index.js'
 
+const assert = new Assert()
+
 console.log('---------------')
 console.log('Elevation tests')
 console.log('---------------')
@@ -12,20 +14,11 @@ console.log('---------------')
 // Vars
 const stac_item = '2021_83_29_2_0019_00003995'
 const fidelity = 0.03 // Higher number means more points and better precision
-const max_deviation = 0.5
 
 // STAC API endpoint
 let url_stac = auth.API_STAC_BASEURL + '/search?limit=1&crs=http://www.opengis.net/def/crs/EPSG/0/25832&token=9b554b6c854184c3b0f377ffc7481585'
 url_stac += `&ids=${ stac_item }`
 
-function is_equalIsh(num1, num2, deviation = max_deviation) {
-  if (Math.abs(num1 - num2) > deviation) {
-    return false
-  } else {
-    return true
-  }
-}
-
 function getRandomCoordinate(bbox) {
   const x = bbox[0] + Math.random() * (bbox[2] - bbox[0])
   const y = bbox[1] + Math.random() * (bbox[3] - bbox[1])
@@ -57,22 +50,23 @@ function testGetWorldXYZAnumberOfTimes(item, terrain, times) {
     }).then(world_xy => {
       compareElevations(world_xy[0], world_xy[1], terrain)
       const image_coords = world2image(item, world_xy[0], world_xy[1], world_xy[2])
-      assert(is_equalIsh(image_coords[0], xy[0], 2), `Image x coordinates ${image_coords[0]} / ${xy[0]} do not match`)
-      assert(is_equalIsh(image_coords[1], xy[1], 2), `Image y coordinates ${image_coords[1]} / ${xy[1]} do not match`)
+      assert.almostEqual(image_coords, xy, 2, `Image coordinates ${image_coords} / ${xy} do not match`)
       console.log('getWorldXYZ => world2image OK')
     })
+    .catch(console.error)
   }
 }
 
 function compareElevations(x,y,geotiff) {
   getElevation(x, y, geotiff)
-  .then(elevation => {
+  .then(elevation =>
     getZ(x, y, auth)
-    .then(getz_e => {
-      assert(is_equalIsh(getz_e, elevation, 2.7), `Elevations ${elevation} / ${getz_e} at ${x} ${y} are way apart`)
-      console.log(`Elevation at ${ x } ${ y } with delta ${Math.abs(elevation - getz_e).toFixed(2)} OK`)
-    })
-  })
+    .then(getz_e =>
+      assert.almostEqual(getz_e, elevation, 2.7, `Deviant elevation at (${x}, ${y}):`)
+    )
+  )
+  .then(delta => console.log(`Elevation deviation ${delta.toFixed(2)} at (${x}, ${y}) OK`))
+  .catch(console.error)
 }
 
 // Test getTerrainGeoTIFF and getElevation with a STAC API item
@@ -111,7 +105,7 @@ get(url_stac)
 // Testing getTerrainByBbox()
 try {
   const gtiff = await getTerrainByBbox([542929.6729020511, 6153925.479277819, 544463.7189110086, 6155242.76541582], auth)
-  assert(gtiff.fileDirectory.ImageWidth === 500, 'GeoTIFF has weird dimensions')
+  assert.equal(gtiff.fileDirectory.ImageWidth, 500, 'GeoTIFF has weird dimensions')
   console.log('Test getTerrainByBbox() => OK')
 } catch(error) {
   console.error(error)

package/modules/core.js

@@ -1,231 +0,0 @@
-/**
- * SAUL photogrammetry utilities 
- */
- 
-
-import { getElevation } from './saul-elevation.js'
-
-/** 
- * Converts x,y coordinates from an image to real world lat,lon coordinates
- * @param {object} image_data - skraafoto-stac-api image data
- * @param {number} col - Image x coordinate (from left to right). Should be a coordinate for the entire image, not just the part displayed in the viewport.
- * @param {number} row - Image y coordinate (from top to bottom). Should be a coordinate for the entire image, not just the part displayed in the viewport.
- * @param {number} [Z] - Elevation (geoide)
- * @returns {array} [longitude, latitude, elevation] 
- */
-function image2world(image_data, col, row, Z = 0) {
-
-  // constants pulled from image_data
-  const xx0  = image_data.properties['pers:interior_orientation'].principal_point_offset[0]
-  const yy0  = image_data.properties['pers:interior_orientation'].principal_point_offset[1]
-  const ci   = image_data.properties['pers:interior_orientation'].focal_length
-  const pix  = image_data.properties['pers:interior_orientation'].pixel_spacing[0]
-  const dimXi = image_data.properties['pers:interior_orientation'].sensor_array_dimensions[0]
-  const dimYi = image_data.properties['pers:interior_orientation'].sensor_array_dimensions[1]
-  const X0   = image_data.properties['pers:perspective_center'][0]
-  const Y0   = image_data.properties['pers:perspective_center'][1]
-  const Z0   = image_data.properties['pers:perspective_center'][2]
-  const Ome  = image_data.properties['pers:omega']
-  const Phi  = image_data.properties['pers:phi']
-  const Kap  = image_data.properties['pers:kappa']
-
-  // recalc values
-  var c = ci*(-1)
-  var dimX = dimXi*pix/2*(-1)
-  var dimY = dimYi*pix/2*(-1)
-  
-  // ... Do calculations ...
-  var o = radians(Ome)
-  var p = radians(Phi)
-  var k = radians(Kap)
-  var D11 =   Math.cos(p) * Math.cos(k)
-  var D12 = - Math.cos(p) * Math.sin(k)
-  var D13 =   Math.sin(p)
-  var D21 =   Math.cos(o) * Math.sin(k) + Math.sin(o) * Math.sin(p) * Math.cos(k)
-  var D22 =   Math.cos(o) * Math.cos(k) - Math.sin(o) * Math.sin(p) * Math.sin(k)
-  var D23 = - Math.sin(o) * Math.cos(p)
-  var D31 =   Math.sin(o) * Math.sin(k) - Math.cos(o) * Math.sin(p) * Math.cos(k)
-  var D32 =   Math.sin(o) * Math.cos(k) + Math.cos(o) * Math.sin(p) * Math.sin(k)
-  var D33 =   Math.cos(o) * Math.cos(p)
-
-  var x_dot = ((col*pix)-dimX*-1)-xx0
-  var y_dot = ((row*pix)-dimY*-1)-yy0
-
-  var kx = (D11*x_dot + D12*y_dot + D13*c)/(D31*x_dot + D32*y_dot + D33*c)
-  var ky = (D21*x_dot + D22*y_dot + D23*c)/(D31*x_dot + D32*y_dot + D33*c)
-
-  var X = (Z-Z0)*kx + X0
-  var Y = (Z-Z0)*ky + Y0
-
-  return[
-    Math.round(X * 100) / 100,
-    Math.round(Y * 100) / 100,
-    Z
-  ]
-}
-
-/** 
- * Converts world lat,lon coordinates to x,y coordinates within a specific image
- * @param {Object} image_data - skraafoto-stac-api image data
- * @param {Number} Y - northing
- * @param {Number} X - easting
- * @param {Number} [Z] - elevation (geoide)
- * @returns {array} [x,y] Column/row image coordinate 
- */
-function getImageXY(image_data, X, Y, Z = 0) {
-
-  // constants pulled from image_data
-  const xx0  = image_data.properties['pers:interior_orientation'].principal_point_offset[0]
-  const yy0  = image_data.properties['pers:interior_orientation'].principal_point_offset[1]
-  const ci   = image_data.properties['pers:interior_orientation'].focal_length
-  const pix  = image_data.properties['pers:interior_orientation'].pixel_spacing[0]
-  const dimXi = image_data.properties['pers:interior_orientation'].sensor_array_dimensions[0]
-  const dimYi = image_data.properties['pers:interior_orientation'].sensor_array_dimensions[1]
-  const X0   = image_data.properties['pers:perspective_center'][0]
-  const Y0   = image_data.properties['pers:perspective_center'][1]
-  const Z0   = image_data.properties['pers:perspective_center'][2]
-  const Ome  = image_data.properties['pers:omega']
-  const Phi  = image_data.properties['pers:phi']
-  const Kap  = image_data.properties['pers:kappa']
-
-  // recalc values
-  var c = ci*(-1)
-  var dimX = dimXi*pix/2*(-1)
-  var dimY = dimYi*pix/2*(-1)
-  
-  // ... Do calculations ...
-  var o = radians(Ome)
-  var p = radians(Phi)
-  var k = radians(Kap)
-  var D11 =   Math.cos(p) * Math.cos(k)
-  var D12 = - Math.cos(p) * Math.sin(k)
-  var D13 =   Math.sin(p)
-  var D21 =   Math.cos(o) * Math.sin(k) + Math.sin(o) * Math.sin(p) * Math.cos(k)
-  var D22 =   Math.cos(o) * Math.cos(k) - Math.sin(o) * Math.sin(p) * Math.sin(k)
-  var D23 = - Math.sin(o) * Math.cos(p)
-  var D31 =   Math.sin(o) * Math.sin(k) - Math.cos(o) * Math.sin(p) * Math.cos(k)
-  var D32 =   Math.sin(o) * Math.cos(k) + Math.cos(o) * Math.sin(p) * Math.sin(k)
-  var D33 =   Math.cos(o) * Math.cos(p)
-
-  var x_dot = (-1)*c*((D11*(X-X0)+D21*(Y-Y0)+D31*(Z-Z0))/(D13*(X-X0)+D23*(Y-Y0)+D33*(Z-Z0)))
-  var y_dot = (-1)*c*((D12*(X-X0)+D22*(Y-Y0)+D32*(Z-Z0))/(D13*(X-X0)+D23*(Y-Y0)+D33*(Z-Z0)))
-
-  var col = ((x_dot-xx0)+(dimX))*(-1)/pix
-  var row = ((y_dot-yy0)+(dimY))*(-1)/pix
-
-  return [
-    Math.round(col),
-    Math.round(row)
-  ]
-}
-
-/** 
- * (DEPRECATED - Use getImageXY) Converts lat,lon coordinates to x,y coordinates within a specific image
- * @param {Object} image_data - skraafoto-stac-api image data
- * @param {Number} Y - northing
- * @param {Number} X - easting
- * @param {Number} [Z] - elevation (geoide)
- * @returns {array} [x,y] Column/row image coordinate 
- */
-function world2image(image_data, X, Y, Z = 0) {
-  return getImageXY(image_data, X, Y, Z)
-}
-
-/** Converts degress to radians */
-function radians(degrees) {
-  return degrees * (Math.PI / 180)
-}
-
-/** (DEPRECATED - Use getWorldXYZ) Iterates guessing at a world coordinate using image coordinates and elevation info */
-function iterateRecursive(image_data, col, row, z, count, limit, auth, i) {
-
-  // Get coordinates based on current z value
-  const worldcoor = image2world(image_data,col,row,z)
-
-  i--
-  if (i <= 0) {
-    // max iterations reached
-    return [worldcoor, 0, count]
-  }
-
-  // Get new z value from coordinates
-  return getZ(worldcoor[0],worldcoor[1], auth).then((new_z) => {
-    
-    // How big is the different between z and new z?
-    const delta = Math.abs(new_z - z)
-    
-    if (delta >= limit) {
-      // If the difference is too big, try building coordinates with the new z
-      count = count + 1
-      return iterateRecursive(image_data, col, row, new_z, count, limit, auth, i)
-    } else {
-      // If the difference is small, return coordinates
-      return [worldcoor, delta, count]
-    }
-  })
-}
-
-/** 
- * (DEPRECATED - Use getWorldXYZ) Tries to guess world coordinate for a pixel position within an image using STAC API image data and requests to DHM elevation data.
- * @param {object} image_data - image item data from STAC API
- * @param {number} col - image x coordinate (from left to right)
- * @param {number} row - image y coordinate (from top to bottom)
- * @param {{API_DHM_BASEURL: string, API_DHM_USERNAME: string, API_DHM_PASSWORD: string}} auth - API autentication data. See ../config.js.example for reference.
- * @param {number} [limit] - result may be inaccurate within this limit. Default is 1.
- * @returns {array} [world coordindates (array), elevation discrepancy, calculation iterations]
- */
-function iterate(image_data, col, row, auth, limit = 1) {
-  let i = 20 // Maximum number of iterations allowed
-  return iterateRecursive(image_data, col, row, 0.5, 0, limit, auth, i)
-}
-
-async function compareZ(options) {
-
-  // Get coordinates based on current z value
-  const world_xyz = image2world(options.image, options.xy[0], options.xy[1], options.z)
-  // Get new z value from coordinates
-  world_xyz[2] = await getElevation(world_xyz[0], world_xyz[1], options.terrain)
-  // How big is the different between z and new z?
-  const delta = Math.abs(world_xyz[2] - options.z)
-  
-  // Check delta vs. limit. If the difference is too big, try building coordinates with the new z
-  // Make sure the recursive loop ends after 20 iterations even if no precise z is found
-  if (options.iteration < 20 && delta > options.limit) {
-    options.iteration++
-    options.z = world_xyz[2]
-    return compareZ(options)
-  } else {
-    return world_xyz
-  }
-}
-
-/** Find world coordinate and elevation that correspond to image x,y. Uses image item information from STAC API and a GeoTIFF terrain model from Datafordeler.
- * @param {object} options
- * @param {array} options.xy - image coordinates
- * @param {object} options.image - STAC API item
- * @param {object} options.terrain - GeoTIFF object from getTerrainGeoTIFF() output
- * @param {number} precision - Precision in meters for "good enough"
- * @returns {array} Array with world coordinates (indexes 0 and 1) and elevation (index 2). Coordinates are EPSG:25832 format.
- */
-async function getWorldXYZ(options, precision = 0.3) {
-  
-  const best_world_xyz = compareZ({
-    image: options.image,
-    terrain: options.terrain,
-    xy: options.xy,
-    z: 0,
-    limit: precision,
-    iteration: 1
-  })
-
-  return best_world_xyz
-}
-
-export { 
-  image2world,
-  world2image,
-  getWorldXYZ,
-  getImageXY,
-  iterate
-}
-