From a6c35dc62c956ae59c2b7698c2e1cc58dfa73319 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Fri, 25 Apr 2025 14:02:44 +0200
Subject: [PATCH] Fix elevation estimation
---
.../barkbeetleSeasonTrapsiteForm.ftl | 24 +++++--------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl
index cfddb54f..dec5d1c2 100644
--- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl
+++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl
@@ -54,25 +54,13 @@
if(isNaN(lon) || isNaN(lat)) return;
// Get altitude from the startkart web service
- fetch("/corsproxy/http://openwps.statkart.no/skwms1/wps.elevation2?request=Execute&service=WPS&version=1.0.0&identifier=elevation&datainputs=lat=" + lat + ";lon=" + lon + ";epsg=4326")
- .then(response => response.text())
- .then(str => (new window.DOMParser()).parseFromString(str,"text/xml"))
- .then(xmlDoc => {
- var outputs = xmlDoc.getElementsByTagName("wps:Output");
- for(var i=0; i<outputs.length;i++)
- {
- if(outputs[i].getElementsByTagName("ows:Identifier")[0].textContent.trim() == "elevation")
- {
- var elevation = parseFloat(outputs[i].getElementsByTagName("wps:LiteralData")[0].textContent.trim());
- if(isNaN(elevation))
- {
- elevation = 0;
- }
- theForm["altitude"].value = elevation;
- }
- }
-
+ // https://ws.geonorge.no/hoydedata/v1/punkt?koordsys=4326&nord=60.48413&ost=7.97852&geojson=false
+ fetch("/corsproxy/https://ws.geonorge.no/hoydedata/v1/punkt?koordsys=4326&nord=" + lat + "&ost=" + lon + "&geojson=false")
+ .then(response => response.json())
+ .then(data => {
+ theForm["altitude"].value = data["punkter"][0]["z"];
});
+
// Get County and municipality
fetch("/corsproxy/" + municipalityPolygonServiceUrl + "?lon=" + lon + "&lat=" + lat)
.then(response => response.json())
--
GitLab