@dataforsyningen/saul 5.0.0-alpha → 5.0.1-alpha

package/README.md

@@ -1,6 +1,6 @@
 # SAUL
 
-This is a collection of stand-alone methods for photogrammetry calculations and API interactions that are primarily used by https://github.com/SDFIdk/skraafoto_frontend
+This is a collection of stand-alone methods for photogrammetry calculations and API interactions that are primarily used by https://github.com/Klimadatastyrelsen/skraafoto_frontend
 
 You can use these as building blocks for your own web application that wants to interface with STAC API for Danske Skråfotos.
 

package/modules/elevation.js

@@ -152,16 +152,12 @@ function zeroPadNumber(input) {
 /**
  * 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);
@@ -169,12 +165,6 @@ class DHMParseError extends Error {
       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;
-    }
   }
 }
 
@@ -186,7 +176,7 @@ class DHMParseError extends Error {
  * @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.
+ * @throws {DHMParseError} When unable to parse response from DHM WMS. Includes response and some other data in the cause property.
  */
 async function getZ(xcoor, ycoor, auth) {
   const request = '&request=GetFeatureInfo&styles=&layers=dhm_terraen&query_layers=dhm_terraen&info_format=text/plain&i=175&j=175&width=351&height=351'
@@ -195,11 +185,12 @@ async function getZ(xcoor, ycoor, auth) {
   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))
+    const zsubstr = dhm_text.slice(text_begin.lastIndex)
+    const z = parseFloat(zsubstr)
     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 parse float value in response text from DHM GetFeatureInfo after pattern.', { cause: { response: dhm_text, index: text_begin.lastIndex, slice: zsubstr, x: xcoor, y: ycoor, coords: coords } })
   }
-  throw new DHMParseError('Cannot match response text from DHM GetFeatureInfo with pattern.', { response: dhm_text, pattern: text_begin })
+  throw new DHMParseError('Cannot match response text from DHM GetFeatureInfo with pattern.', { cause: { response: dhm_text, pattern: text_begin, x: xcoor, y: ycoor, coords: coords } })
 }
 
 /** Fetches a GeoTIFF with elevation data matching a bounding box of EPSG:25832 coordinates

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataforsyningen/saul",
-  "version": "5.0.0-alpha",
+  "version": "5.0.1-alpha",
   "description": "This is a collection of stand-alone methods for photogrammetry calculations and API interactions for 'Danske Skråfotos'.",
   "main": "index.js",
   "type": "module",
@@ -14,7 +14,8 @@
   },
   "keywords": [
     "skråfoto",
-    "SDFI", "KDS",
+    "SDFI",
+    "KDS",
     "saul"
   ],
   "author": {

package/test/saul-core.test.js

@@ -44,6 +44,19 @@ try {
   console.error(error)
 }
 
+// Test getZ 0
+try {
+
+  let elevation = await getZ(535022.36, 6173550.97, auth)
+
+  assert.almostEqual(elevation, 0, deviation, 'getZ 0 fail: Elevation is way apart from expected:')
+  
+  console.log("Test getZ 0 OK")
+
+} catch(error) {
+  console.error("Test getZ 0", error)
+}
+
 // Test iterate
 try {