@dataforsyningen/saul 3.1.1 → 3.1.3

package/modules/saul-core.js

@@ -118,7 +118,7 @@ function radians(degrees) {
 }
 
 /** 
- * (DEPRECATED - Use getElevation) Fetches elevation based on X,Y coordinates using DHM/Koter endpoint
+ * 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.
@@ -173,6 +173,26 @@ function iterate(image_data, col, row, auth, limit = 1) {
   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 at some point (iteration = 50) even if no precise z is found
+  if (options.iteration < 50 && 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
@@ -181,12 +201,17 @@ function iterate(image_data, col, row, auth, limit = 1) {
  * @returns {array} Array with world coordinates (indexes 0 and 1) and elevation (index 2). Coordinates are EPSG:25832 format.
  */
 async function getWorldXYZ(options) {
-
-  const world_xyz = image2world(options.image, options.xy[0], options.xy[1], 0)
-  world_xyz[2] = await getElevation(world_xyz[0], world_xyz[1], options.terrain)
-  const better_world_xyz = image2world(options.image, options.xy[0], options.xy[1], world_xyz[2])
   
-  return better_world_xyz
+  const best_world_xyz = compareZ({
+    image: options.image,
+    terrain: options.terrain,
+    xy: options.xy,
+    z: 0,
+    limit: 0.5,
+    iteration: 1
+  })
+
+  return best_world_xyz
 }
 
 export { 

package/modules/saul-elevation.js

@@ -3,7 +3,7 @@ import { get } from './api.js'
 
 /** 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_BASEURL: string, API_DHM_USERNAME: string, API_DHM_PASSWORD: string}} auth - API autentication data. See ../config.js.example for reference.
+ * @param {{API_DHM_WCS_BASEURL: string, API_DHM_USERNAME: string, API_DHM_PASSWORD: string}} auth - API autentication data. See ../config.js.example for reference.
  * @param {number} [fidelity] - Resolution fidelity. Higher number means more pixels and better precision. Between 1 and 0.01.
  * @returns {object} GeoTiff data
  */
@@ -13,8 +13,8 @@ function getTerrainGeoTIFF(stac_item, auth, fidelity = 0.05) {
   const width = Math.round( stac_item.properties['proj:shape'][0] * fidelity )
   const height = Math.round( stac_item.properties['proj:shape'][1] * fidelity )
 
-  // DHM data endpoint
-  let url = 'https://services.datafordeler.dk/DHMNedboer/dhm_wcs/1.0.0/WCS'
+  // 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_USERNAME }&password=${ auth.API_DHM_PASSWORD }` // TODO: Should be auth stuff
   url += `&height=${ height }`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataforsyningen/saul",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "This is a collection of stand-alone methods for photogrammetry calculations and API interactions for 'Danske Skråfotos'.",
   "main": "index.js",
   "type": "module",