From 606616a00b2cb022f1db171a6a8775aeacd0c77d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 6 Aug 2024 14:33:30 +0200
Subject: [PATCH] Fix Norwegian map WMS for barkbeetle registration system
---
.../modules/barkbeetle/seasonTrapsiteFormMap.js | 6 +++---
.../modules/barkbeetle/seasonTrapsiteListMap.js | 17 ++++-------------
.../barkbeetle/barkbeetleSeasonTrapsiteForm.ftl | 4 ++--
.../barkbeetle/barkbeetleSeasonTrapsiteList.ftl | 4 ++--
4 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js
index 331e0b72..6e2fd417 100644
--- a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js
+++ b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js
@@ -46,13 +46,13 @@
})
});
var parser = new ol.format.WMTSCapabilities();
- fetch('https://opencache.statkart.no/gatekeeper/gk/gk.open_wmts?Version=1.0.0&service=wmts&request=getcapabilities').then(function(response) {
+ fetch('https://cache.kartverket.no/v1/wmts/1.0.0/WMTSCapabilities.xml').then(function(response) {
return response.text();
}).then(function(text) {
var result = parser.read(text);
var options = ol.source.WMTS.optionsFromCapabilities(result, {
- layer: 'topo4',
- matrixSet: 'EPSG:3857'
+ layer: 'topo',
+ matrixSet: 'webmercator'
});
var topo4 =
new ol.layer.Tile({
diff --git a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js
index e2ac5005..a24d2b44 100644
--- a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js
+++ b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js
@@ -27,16 +27,7 @@
var poiDetails;
function initMap(season){
- // Background layer is OpenStreetMap
- var backgroundLayer = new ol.layer.Tile({
- source: new ol.source.OSM({
- attributions: [
- new ol.Attribution({
- html: mapConstants.MAP_ATTRIBUTION
- })
- ]
- })
- });
+
// The trapsite layer
var trapLayer = new ol.layer.Vector({
@@ -55,13 +46,13 @@
element: document.getElementById("popover")
});
var parser = new ol.format.WMTSCapabilities();
- fetch('https://opencache.statkart.no/gatekeeper/gk/gk.open_wmts?Version=1.0.0&service=wmts&request=getcapabilities').then(function(response) {
+ fetch('https://cache.kartverket.no/v1/wmts/1.0.0/WMTSCapabilities.xml').then(function(response) {
return response.text();
}).then(function(text) {
var result = parser.read(text);
var options = ol.source.WMTS.optionsFromCapabilities(result, {
- layer: 'topo4',
- matrixSet: 'EPSG:3857'
+ layer: 'topo',
+ matrixSet: 'webmercator'
});
var topo4 =
new ol.layer.Tile({
diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl
index ce2f74ca..cfddb54f 100644
--- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl
+++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl
@@ -21,7 +21,7 @@
</#macro>
<#macro custom_js>
<script type="text/javascript" src="/js/constants.js"></script>
- <script type="text/javascript" src="/js/3rdparty/ol.js"></script>
+ <script type="text/javascript" src="/js/3rdparty/ol_6_5_0.js"></script>
<script type="text/javascript" src="/js/modules/barkbeetle/seasonTrapsiteFormMap.js"></script>
<script type="text/javascript" src="/js/resourcebundle.js"></script>
<script src="/js/validateForm.js"></script>
@@ -168,7 +168,7 @@
</#macro>
<#macro custom_css>
<link href="//code.jquery.com/ui/1.10.3/themes/redmond/jquery-ui.css" rel="stylesheet" />
- <link rel="stylesheet" type="text/css" href="/css/3rdparty/ol.css"/ >
+ <link rel="stylesheet" type="text/css" href="/css/3rdparty/ol_6_5_0.css"/ >
<style type="text/css">
#seasonTrapsiteFormMap {
height: 600px;
diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl
index 721f2ed2..acf33707 100644
--- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl
+++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl
@@ -157,7 +157,7 @@
</#macro>
<#macro custom_js>
<script type="text/javascript" src="/js/constants.js"></script>
- <script type="text/javascript" src="/js/3rdparty/ol.js"></script>
+ <script type="text/javascript" src="/js/3rdparty/ol_6_5_0.js"></script>
<script type="text/javascript" src="/js/modules/barkbeetle/seasonTrapsiteListMap.js"></script>
<script type="text/javascript">
$(document).ready(function() {
@@ -186,7 +186,7 @@ function filter(searchTxt){
</script>
</#macro>
<#macro custom_css>
- <link rel="stylesheet" type="text/css" href="/css/3rdparty/ol.css"/ >
+ <link rel="stylesheet" type="text/css" href="/css/3rdparty/ol_6_5_0.css"/ >
<style type="text/css">
td.status_1 {
background-color: #ffe066 !important;
--
GitLab