From 3cb02f24857963107b5cca63b991bd9cce214b4a Mon Sep 17 00:00:00 2001
From: Frank R Thomsen <frank@sdfi.dk>
Date: Fri, 22 Nov 2024 14:55:41 +0100
Subject: [PATCH 1/4] update some services

---
 examples/openlayers/example1.html | 14 ++++++++------
 examples/openlayers/example2.html | 15 +++++++++------
 package-lock.json                 | 18 +++++++++---------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/examples/openlayers/example1.html b/examples/openlayers/example1.html
index 16f10bd..ca2d071 100644
--- a/examples/openlayers/example1.html
+++ b/examples/openlayers/example1.html
@@ -42,8 +42,10 @@ <h1>WMTS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
         ScaleLine
       } from '../lib/openlayers.js';            
       
-      // Set Dataforsyningen token, replace with your own token
+      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
       const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set projection as we are not using the default OpenLayers projections
       // You can define it yourself or you can use the proj4 library as done below
@@ -86,7 +88,7 @@ <h1>WMTS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       const WMTSparser = new WMTSCapabilities();
 
       // Fetches 'topo_skaermkort' capabilites and adds layer to map
-      const skaermkortCapabilitesUrl = 'https://api.dataforsyningen.dk/topo_skaermkort_wmts_DAF?service=WMTS&request=GetCapabilities&token=' + dftoken
+      const skaermkortCapabilitesUrl =  `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetCapabilities`
       fetch(skaermkortCapabilitesUrl)
       .then(function (response) {
         return response.text();
@@ -111,7 +113,7 @@ <h1>WMTS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       });
 
       // Fetches 'orto_foraar' capabilites and adds layer to map
-      const ortoCapabilitesUrl = 'https://api.dataforsyningen.dk/orto_foraar_wmts_DAF?service=WMTS&request=GetCapabilities&token=' + dftoken
+      const ortoCapabilitesUrl = `https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar_wmts/1.0.0/WMTS?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetCapabilities`
       fetch(ortoCapabilitesUrl)
       .then(function (response) {
         return response.text();
@@ -137,7 +139,7 @@ <h1>WMTS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       });
 
       // Create Matrikel overlay
-      const matrikelServiceUrl = 'https://api.dataforsyningen.dk/MatrikelGaeldendeOgForeloebigWMS_DAF?ignoreillegallayers=TRUE&transparent=TRUE&token=' + dftoken
+      const matrikelServiceUrl = `https://services.datafordeler.dk/MATRIKLEN2/MatGaeldendeOgForeloebigWMS/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const matrikelLayer = new TileLayer({
         visible: false,
         title: 'Matrikel',
@@ -154,7 +156,7 @@ <h1>WMTS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       overlayLayerGroup.getLayers().push(matrikelLayer)
 
       // Create Hill shade overlay
-      const hillShadeServiceUrl = 'https://api.dataforsyningen.dk/dhm?ignoreillegallayers=TRUE&transparent=TRUE&token=' + dftoken
+      const hillShadeServiceUrl = `https://services.datafordeler.dk/DHMNedboer/dhm/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const hillShadeLayer = new TileLayer({
         visible: false,
         title: 'Skyggekort',
@@ -162,7 +164,7 @@ <h1>WMTS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
         source: new TileWMS({
           url: hillShadeServiceUrl,
           params: {
-            'LAYERS': 'dhm_terraen_skyggekort_transparent_overdrevet',
+            'LAYERS': 'dhm_terraen_skyggekort',
             'TRANSPARENT': 'TRUE'
           }
         })
diff --git a/examples/openlayers/example2.html b/examples/openlayers/example2.html
index 0cc1bf0..bebce38 100644
--- a/examples/openlayers/example2.html
+++ b/examples/openlayers/example2.html
@@ -40,8 +40,10 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
         ScaleLine
       } from '../lib/openlayers.js';            
       
-      // Set Dataforsyningen token, replace with your own token
+      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
       const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set projection as we are not using the default OpenLayers projections
       // You can define it yourself or you can use the proj4 library as done below
@@ -81,7 +83,7 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       });
 
       // Create Skærmkort base layer
-      const skaermkortServiceUrl = 'https://api.dataforsyningen.dk/topo_skaermkort_DAF?ignoreillegallayers=TRUE&token=' + dftoken
+      const skaermkortServiceUrl = `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort/1.0.0/wms?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const skaermLayer = new TileLayer({
         title: 'Skærmkort',
         type: 'base',
@@ -98,7 +100,7 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       baseMapLayerGroup.getLayers().push(skaermLayer)
 
       // Create ortofoto base layer
-      const ortofotoServiceUrl = 'https://api.dataforsyningen.dk/orto_foraar_DAF?ignoreillegallayers=TRUE&token=' + dftoken
+      const ortofotoServiceUrl = `https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const ortofotoLayer = new TileLayer({
         visible: false,
         title: 'Ortofoto',
@@ -116,7 +118,8 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       baseMapLayerGroup.getLayers().push(ortofotoLayer)
 
       // Create Matrikel overlay
-      const matrikelServiceUrl = 'https://api.dataforsyningen.dk/MatrikelGaeldendeOgForeloebigWMS_DAF?ignoreillegallayers=TRUE&token=' + dftoken
+
+      const matrikelServiceUrl = `https://services.datafordeler.dk/MATRIKLEN2/MatGaeldendeOgForeloebigWMS/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const matrikelLayer = new TileLayer({
         visible: false,
         title: 'Matrikel',
@@ -133,7 +136,7 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       overlayLayerGroup.getLayers().push(matrikelLayer)
 
       // Create Hill shade overlay
-      const hillShadeServiceUrl = 'https://api.dataforsyningen.dk/dhm?ignoreillegallayers=TRUE&token=' + dftoken
+      const hillShadeServiceUrl = `https://services.datafordeler.dk/DHMNedboer/dhm/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const hillShadeLayer = new TileLayer({
         visible: false,
         title: 'Skyggekort',
@@ -141,7 +144,7 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
         source: new TileWMS({
           url: hillShadeServiceUrl,
           params: {
-            'LAYERS': 'dhm_terraen_skyggekort_transparent_overdrevet',
+            'LAYERS': 'dhm_terraen_skyggekort',
             'TRANSPARENT': 'TRUE'
           }
         })
diff --git a/package-lock.json b/package-lock.json
index 5f993d2..c4d5aac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,9 +25,9 @@
       "license": "MIT"
     },
     "node_modules/@dataforsyningen/saul": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/@dataforsyningen/saul/-/saul-3.5.1.tgz",
-      "integrity": "sha512-mBiAcZGV+A0UhVCqaTWb1MBh6wcJvtFMoBYlWzEHdkZdE2j0lipPEkGtSR0soSLQUZPeKP9IRj4QObbP0PG+gw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@dataforsyningen/saul/-/saul-3.6.0.tgz",
+      "integrity": "sha512-jAz4hng3kodoKNEJxt1DyKbyqmxsvUrNM/LGnpKMr2k+W/Y3e5PNscRrSUEhbQpe+J71JWDWMn3Mi8jIMjzMbA==",
       "license": "MIT",
       "dependencies": {
         "geotiff": "^2.0.5",
@@ -596,9 +596,9 @@
       }
     },
     "node_modules/proj4": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.1.tgz",
-      "integrity": "sha512-vmhP3hmstjXjzFwg8QXJwpoj4n7GVrXk3ZW3DzNK/Ur4cuwXq7ZiMXaWYvLYLQbX8n4MXgbwTr4lthOUZltBpA==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.14.0.tgz",
+      "integrity": "sha512-fumDL50ThQ3issOLxaLYwv1j4LePEzYleY6vqsX+2uWOcvKzqpzHhtTTH18CvIDg+nf8MYl0/XF6yYyESKDi4w==",
       "license": "MIT",
       "dependencies": {
         "mgrs": "1.0.0",
@@ -654,9 +654,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/wkt-parser": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.3.tgz",
-      "integrity": "sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.4.0.tgz",
+      "integrity": "sha512-qpwO7Ihds/YYDTi1aADFTI1Sm9YC/tTe3SHD24EeIlZxy7Ik6a1b4HOz7jAi0xdUAw487duqpo8OGu+Tf4nwlQ==",
       "license": "MIT"
     },
     "node_modules/xml-utils": {

From 9ec7e0ba809c4774e31cd9c53f788a6dc6f02c8c Mon Sep 17 00:00:00 2001
From: Frank R Thomsen <frank@sdfi.dk>
Date: Fri, 22 Nov 2024 16:57:30 +0100
Subject: [PATCH 2/4] update service URLs

---
 examples/openlayers/example1.html | 3 +--
 examples/openlayers/example2.html | 3 +--
 examples/openlayers/example3.html | 9 +++++----
 examples/openlayers/example4.html | 9 +++++----
 examples/openlayers/example5.html | 8 +++++---
 examples/openlayers/example6.html | 8 +++++---
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/examples/openlayers/example1.html b/examples/openlayers/example1.html
index ca2d071..6ca16be 100644
--- a/examples/openlayers/example1.html
+++ b/examples/openlayers/example1.html
@@ -42,8 +42,7 @@ <h1>WMTS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
         ScaleLine
       } from '../lib/openlayers.js';            
       
-      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
-      const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
       const dfUser = 'QKJBQATHVS'
       const dfPass = 'ytxCA8UGM5n0Z*zi'
 
diff --git a/examples/openlayers/example2.html b/examples/openlayers/example2.html
index bebce38..2ce1b14 100644
--- a/examples/openlayers/example2.html
+++ b/examples/openlayers/example2.html
@@ -40,8 +40,7 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
         ScaleLine
       } from '../lib/openlayers.js';            
       
-      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
-      const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
       const dfUser = 'QKJBQATHVS'
       const dfPass = 'ytxCA8UGM5n0Z*zi'
 
diff --git a/examples/openlayers/example3.html b/examples/openlayers/example3.html
index 16814db..a06d512 100644
--- a/examples/openlayers/example3.html
+++ b/examples/openlayers/example3.html
@@ -75,8 +75,9 @@ <h1>GSearch type-ahead</h1>
         Point
       } from '../lib/openlayers.js';  
 
-      // Set Kortforsyningen token, replace with your own token
-      var dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set projection as we are not using the default OpenLayers projections
       // You can define it yourself or you can use the proj4 library as done below
@@ -153,7 +154,7 @@ <h1>GSearch type-ahead</h1>
       const WMTSparser = new WMTSCapabilities();
 
       // Fetches 'topo_skaermkort' capabilites and adds layer to map
-      const skaermkortCapabilitesUrl = 'https://api.dataforsyningen.dk/topo_skaermkort_wmts_DAF?service=WMTS&request=GetCapabilities&token=' + dftoken
+      const skaermkortCapabilitesUrl =  `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetCapabilities`
       fetch(skaermkortCapabilitesUrl)
       .then(function (response) {
         return response.text();
@@ -178,7 +179,7 @@ <h1>GSearch type-ahead</h1>
       });
 
       // Fetches 'orto_foraar' capabilites and adds layer to map
-      const ortoCapabilitesUrl = 'https://api.dataforsyningen.dk/orto_foraar_wmts_DAF?service=WMTS&request=GetCapabilities&token=' + dftoken
+      const ortoCapabilitesUrl = `https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar_wmts/1.0.0/WMTS?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetCapabilities`
       fetch(ortoCapabilitesUrl)
       .then(function (response) {
         return response.text();
diff --git a/examples/openlayers/example4.html b/examples/openlayers/example4.html
index adf3766..576b782 100644
--- a/examples/openlayers/example4.html
+++ b/examples/openlayers/example4.html
@@ -41,8 +41,9 @@ <h1>Skift fra WMTS til WMS i det inderste zoom-niveau</h1>
         ScaleLine
       } from '../lib/openlayers.js';            
       
-      // Set Dataforsyningen token, replace with your own token
-      const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // We will define map and WMTS source later
       let map
@@ -66,7 +67,7 @@ <h1>Skift fra WMTS til WMS i det inderste zoom-niveau</h1>
       // Define WMS source
       const wmsSource = new TileWMS({
         attributions: myAttributionText,
-        url: "https://api.dataforsyningen.dk/topo_skaermkort_DAF?ignoreillegallayers=TRUE&transparent=TRUE&token=" + dftoken,
+        url: `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort/1.0.0/wms?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`,
         params: {
           'LAYERS': 'dtk_skaermkort',
           'TRANSPARENT': 'FALSE'
@@ -81,7 +82,7 @@ <h1>Skift fra WMTS til WMS i det inderste zoom-niveau</h1>
       });
 
       // Fetches 'topo_skaermkort' capabilites and adds WMTS layer to map
-      const skaermkortCapabilitesUrl = 'https://api.dataforsyningen.dk/topo_skaermkort_wmts_DAF?service=WMTS&request=GetCapabilities&token=' + dftoken
+      const skaermkortCapabilitesUrl =  `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetCapabilities`
       fetch(skaermkortCapabilitesUrl)
       .then(function (response) {
         return response.text();
diff --git a/examples/openlayers/example5.html b/examples/openlayers/example5.html
index ce65046..b32458a 100644
--- a/examples/openlayers/example5.html
+++ b/examples/openlayers/example5.html
@@ -48,8 +48,10 @@ <h1>Forvaltning2 WFS m. togstationer, jernbane og byområder</h1>
         olLoadingstrategy
       } from '../lib/openlayers.js';            
       
-      // Set Dataforsyningen token, replace with your own token
+      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
       const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set projection as we are not using the default OpenLayers projections
       // You can define it yourself or you can use the proj4 library as done below
@@ -89,7 +91,7 @@ <h1>Forvaltning2 WFS m. togstationer, jernbane og byområder</h1>
       });
 
       // Create Skærmkort base layer
-      const skaermkortServiceUrl = 'https://api.dataforsyningen.dk/topo_skaermkort_DAF?ignoreillegallayers=TRUE&transparent=TRUE&token=' + dftoken
+      const skaermkortServiceUrl = `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort/1.0.0/wms?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const skaermLayer = new TileLayer({
         title: 'Skærmkort',
         type: 'base',
@@ -106,7 +108,7 @@ <h1>Forvaltning2 WFS m. togstationer, jernbane og byområder</h1>
       baseMapLayerGroup.getLayers().push(skaermLayer)
 
       // Create ortofoto base layer
-      const ortofotoServiceUrl = 'https://api.dataforsyningen.dk/orto_foraar_DAF?ignoreillegallayers=TRUE&transparent=TRUE&token=' + dftoken
+      const ortofotoServiceUrl = `https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const ortofotoLayer = new TileLayer({
         visible: false,
         title: 'Ortofoto',
diff --git a/examples/openlayers/example6.html b/examples/openlayers/example6.html
index c1f08b3..fb8de2d 100644
--- a/examples/openlayers/example6.html
+++ b/examples/openlayers/example6.html
@@ -46,8 +46,10 @@ <h1>OGCAPI features med <a href="https://openlayers.org/">OpenLayers</a></h1>
         GeoJSON
       } from '../lib/openlayers.js';            
       
-      // Set Dataforsyningen token, replace with your own token
+      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
       const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set projection as we are not using the default OpenLayers projections
       // You can define it yourself or you can use the proj4 library as done below
@@ -112,7 +114,7 @@ <h1>OGCAPI features med <a href="https://openlayers.org/">OpenLayers</a></h1>
       const WMTSparser = new WMTSCapabilities();
 
       // Fetches 'topo_skaermkort' capabilites and adds layer to map
-      const skaermkortCapabilitesUrl = 'https://api.dataforsyningen.dk/topo_skaermkort_wmts_DAF?service=WMTS&request=GetCapabilities&token=' + dftoken
+      const skaermkortCapabilitesUrl =  `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetCapabilities`
       fetch(skaermkortCapabilitesUrl)
       .then(function (response) {
         return response.text();
@@ -137,7 +139,7 @@ <h1>OGCAPI features med <a href="https://openlayers.org/">OpenLayers</a></h1>
       });
 
       // Fetches 'orto_foraar' capabilites and adds layer to map
-      const ortoCapabilitesUrl = 'https://api.dataforsyningen.dk/orto_foraar_wmts_DAF?service=WMTS&request=GetCapabilities&token=' + dftoken
+      const ortoCapabilitesUrl = `https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar_wmts/1.0.0/WMTS?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetCapabilities`
       fetch(ortoCapabilitesUrl)
       .then(function (response) {
         return response.text();

From 7b2eb5ce19424872ed0b3dfa6b0ab83b04a54240 Mon Sep 17 00:00:00 2001
From: Frank R Thomsen <frank@sdfi.dk>
Date: Fri, 22 Nov 2024 17:04:17 +0100
Subject: [PATCH 3/4] do it

---
 examples/leaflet/example1.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/leaflet/example1.html b/examples/leaflet/example1.html
index 977712d..b7c9bf5 100644
--- a/examples/leaflet/example1.html
+++ b/examples/leaflet/example1.html
@@ -30,8 +30,10 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
 
     <script>
 
-       // Set Kortforsyningen token, replace with your own token
+      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
       const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set the attribution (the copyright statement shown in the lower right corner)
       // We do this as we want the same attributions for all layers
@@ -58,7 +60,7 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
 
       // Define layers
       // Ortofoto [WMTS:orto_foraar]
-      const ortofotowmts = L.tileLayer('https://api.dataforsyningen.dk/orto_foraar_wmts_DAF?service=WMTS&request=GetTile&version=1.3.0&Layer=orto_foraar_wmts&style=default&format=image/jpg&TileMatrixSet=KortforsyningTilingDK&TileMatrix={zoom}&TileRow={y}&TileCol={x}&token=' + dftoken, {
+      const ortofotowmts = L.tileLayer(`https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar_wmts/1.0.0/WMTS?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetTile&version=1.3.0&Layer=orto_foraar_wmts&style=default&format=image/jpg&TileMatrixSet=KortforsyningTilingDK&TileMatrix={zoom}&TileRow={y}&TileCol={x}`, {
         minZoom: 0,
         maxZoom: 13,
         attribution: myAttributionText,
@@ -69,7 +71,7 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
       }).addTo(map);
 
       // Skærmkort [WMTS:topo_skaermkort]
-      const toposkaermkortwmts = L.tileLayer('https://api.dataforsyningen.dk/topo_skaermkort_wmts_DAF?service=WMTS&request=GetTile&version=1.3.0&Layer=topo_skaermkort&style=default&format=image/png&TileMatrixSet=View1&TileMatrix={zoom}&TileRow={y}&TileCol={x}&token=' + dftoken, {
+      const toposkaermkortwmts = L.tileLayer(`https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetTile&version=1.3.0&Layer=topo_skaermkort&style=default&format=image/png&TileMatrixSet=View1&TileMatrix={zoom}&TileRow={y}&TileCol={x}`, {
         minZoom: 0,
         maxZoom: 13,
         attribution: myAttributionText,
@@ -80,10 +82,9 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
       }).addTo(map);
 
       // Matrikelskel overlay [WMS:mat]
-      const matrikel = L.tileLayer.wms('https://api.dataforsyningen.dk/MatrikelGaeldendeOgForeloebigWMS_DAF?ignoreillegallayers=TRUE', {
+      const matrikel = L.tileLayer.wms(`https://services.datafordeler.dk/MATRIKLEN2/MatGaeldendeOgForeloebigWMS/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`, {
         transparent: true,
         layers: 'MatrikelSkel_Gaeldende,Centroide_Gaeldende',
-        token: dftoken,
         format: 'image/png',
         attribution: myAttributionText,
         continuousWorld: true,
@@ -91,10 +92,9 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
       }).addTo(map); // addTo means that the layer is visible by default
 
       // Hillshade overlay [WMS:dhm]
-      const hillshade = L.tileLayer.wms('https://api.dataforsyningen.dk/dhm?ignoreillegallayers=TRUE', {
+      const hillshade = L.tileLayer.wms(`https://services.datafordeler.dk/DHMNedboer/dhm/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`, {
         transparent: true,
-        layers: 'dhm_terraen_skyggekort_transparent_overdrevet',
-        token: dftoken,
+        layers: 'dhm_terraen_skyggekort',
         format: 'image/png',
         attribution: myAttributionText,
         continuousWorld: true

From dacd5b076d9683824fcfdf0baf2084c8000473f5 Mon Sep 17 00:00:00 2001
From: Frank R Thomsen <frank@sdfi.dk>
Date: Mon, 25 Nov 2024 15:04:14 +0100
Subject: [PATCH 4/4] update examples

---
 examples/leaflet/example1.html    | 23 +++++++++----------
 examples/leaflet/example2.html    | 37 ++++++++++++++++---------------
 examples/leaflet/example3.html    | 23 ++++++++++---------
 examples/leaflet/example4.html    | 16 ++++++++-----
 examples/openlayers/example2.html |  1 -
 5 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/examples/leaflet/example1.html b/examples/leaflet/example1.html
index b7c9bf5..3668d1a 100644
--- a/examples/leaflet/example1.html
+++ b/examples/leaflet/example1.html
@@ -30,8 +30,7 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
 
     <script>
 
-      // Set Dataforsyningen token and Datafordeler username/password. Replace with your own
-      const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
       const dfUser = 'QKJBQATHVS'
       const dfPass = 'ytxCA8UGM5n0Z*zi'
 
@@ -60,7 +59,7 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
 
       // Define layers
       // Ortofoto [WMTS:orto_foraar]
-      const ortofotowmts = L.tileLayer(`https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar_wmts/1.0.0/WMTS?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetTile&version=1.3.0&Layer=orto_foraar_wmts&style=default&format=image/jpg&TileMatrixSet=KortforsyningTilingDK&TileMatrix={zoom}&TileRow={y}&TileCol={x}`, {
+      const ortofotowmts = L.tileLayer(`https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar_wmts/1.0.0/WMTS?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetTile&version=1.0.0&Layer=orto_foraar_wmts&style=default&format=image/jpg&TileMatrixSet=KortforsyningTilingDK&TileMatrix={zoom}&TileRow={y}&TileCol={x}`, {
         minZoom: 0,
         maxZoom: 13,
         attribution: myAttributionText,
@@ -71,7 +70,7 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
       }).addTo(map);
 
       // Skærmkort [WMTS:topo_skaermkort]
-      const toposkaermkortwmts = L.tileLayer(`https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetTile&version=1.3.0&Layer=topo_skaermkort&style=default&format=image/png&TileMatrixSet=View1&TileMatrix={zoom}&TileRow={y}&TileCol={x}`, {
+      const toposkaermkortwmts = L.tileLayer(`https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetTile&version=1.0.0&Layer=topo_skaermkort&style=default&format=image/png&TileMatrixSet=View1&TileMatrix={zoom}&TileRow={y}&TileCol={x}`, {
         minZoom: 0,
         maxZoom: 13,
         attribution: myAttributionText,
@@ -82,22 +81,22 @@ <h1>WMTS med <a href="https://leafletjs.com">LeafletJS</a></h1>
       }).addTo(map);
 
       // Matrikelskel overlay [WMS:mat]
-      const matrikel = L.tileLayer.wms(`https://services.datafordeler.dk/MATRIKLEN2/MatGaeldendeOgForeloebigWMS/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`, {
-        transparent: true,
-        layers: 'MatrikelSkel_Gaeldende,Centroide_Gaeldende',
+      const matrikelServiceWmsUrl = `https://services.datafordeler.dk/MATRIKLEN2/MatGaeldendeOgForeloebigWMS/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const matrikel = L.tileLayer.wms(matrikelServiceWmsUrl, {
+        transparent: 'TRUE',
+        layers: 'MatrikelSkel_Gaeldende',
         format: 'image/png',
         attribution: myAttributionText,
-        continuousWorld: true,
         minZoom: 9
       }).addTo(map); // addTo means that the layer is visible by default
 
       // Hillshade overlay [WMS:dhm]
-      const hillshade = L.tileLayer.wms(`https://services.datafordeler.dk/DHMNedboer/dhm/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`, {
-        transparent: true,
+      const hillshadeServiceWmsUrl = `https://services.datafordeler.dk/DHMNedboer/dhm/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const hillshade = L.tileLayer.wms(hillshadeServiceWmsUrl, {
+        transparent: 'TRUE',
         layers: 'dhm_terraen_skyggekort',
         format: 'image/png',
-        attribution: myAttributionText,
-        continuousWorld: true
+        attribution: myAttributionText
       });
 
       // Define layer groups for layer control
diff --git a/examples/leaflet/example2.html b/examples/leaflet/example2.html
index 237701b..20d9c85 100644
--- a/examples/leaflet/example2.html
+++ b/examples/leaflet/example2.html
@@ -30,8 +30,9 @@ <h1>WMS med <a href="https://leafletjs.com">LeafletJS</a></h1>
 
     <script>
 
-      // Set Kortforsyningen token, replace with your own token
-      const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set the attribution (the copyright statement shown in the lower right corner)
       // We do this as we want the same attributions for all layers
@@ -59,40 +60,40 @@ <h1>WMS med <a href="https://leafletjs.com">LeafletJS</a></h1>
       // Define layers
 
       // Ortofoto [WMS:orto_foraar]
-      const ortofotowms = L.tileLayer.wms('https://api.dataforsyningen.dk/orto_foraar_DAF?ignoreillegallayers=TRUE', {
+      const ortofotoServiceWmsUrl = `https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const ortofotowms = L.tileLayer.wms(ortofotoServiceWmsUrl, {
+        transparent: 'TRUE',
         layers: 'orto_foraar',
-        token: dftoken,
         format: 'image/png',
         attribution: myAttributionText
-      }).addTo(map);
+      });
 
       // Skærmkort [WMS:topo_skaermkort]
-      const toposkaermkortwms = L.tileLayer.wms('https://api.dataforsyningen.dk/topo_skaermkort_DAF?ignoreillegallayers=TRUE', {
+      const skaermkortServiceWmsUrl = `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort/1.0.0/wms?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const toposkaermkortwms = L.tileLayer.wms(skaermkortServiceWmsUrl, {
+        transparent: 'FALSE',
         layers: 'dtk_skaermkort',
-        token: dftoken,
         format: 'image/png',
         attribution: myAttributionText
       }).addTo(map);
 
       // Matrikelskel overlay [WMS:mat]
-      const matrikel = L.tileLayer.wms('https://api.dataforsyningen.dk/MatrikelGaeldendeOgForeloebigWMS_DAF?ignoreillegallayers=TRUE', {
-        transparent: true,
-        layers: 'MatrikelSkel_Gaeldende,Centroide_Gaeldende',
-        token: dftoken,
+      const matrikelServiceWmsUrl = `https://services.datafordeler.dk/MATRIKLEN2/MatGaeldendeOgForeloebigWMS/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const matrikel = L.tileLayer.wms(matrikelServiceWmsUrl, {
+        transparent: 'TRUE',
+        layers: 'MatrikelSkel_Gaeldende',
         format: 'image/png',
         attribution: myAttributionText,
-        continuousWorld: true,
         minZoom: 9
       }).addTo(map); // addTo means that the layer is visible by default
 
       // Hillshade overlay [WMS:dhm]
-      const hillshade = L.tileLayer.wms('https://api.dataforsyningen.dk/dhm?ignoreillegallayers=TRUE', {
-        transparent: true,
-        layers: 'dhm_terraen_skyggekort_transparent_overdrevet',
-        token: dftoken,
+      const hillshadeServiceWmsUrl = `https://services.datafordeler.dk/DHMNedboer/dhm/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const hillshade = L.tileLayer.wms(hillshadeServiceWmsUrl, {
+        transparent: 'TRUE',
+        layers: 'dhm_terraen_skyggekort',
         format: 'image/png',
-        attribution: myAttributionText,
-        continuousWorld: true
+        attribution: myAttributionText
       });
 
       // Define layer groups for layer control
diff --git a/examples/leaflet/example3.html b/examples/leaflet/example3.html
index 0c28b6c..94b7acc 100644
--- a/examples/leaflet/example3.html
+++ b/examples/leaflet/example3.html
@@ -52,8 +52,9 @@ <h1>GSearch type-ahead eksempel</a></h1>
 
       import { GSearchUI, translator } from '../lib/leaflet.js'
 
-      // Set Kortforsyningen token, replace with your own token
-      const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set the attribution (the copyright statement shown in the lower right corner)
       // We do this as we want the same attributions for all layers
@@ -75,21 +76,21 @@ <h1>GSearch type-ahead eksempel</a></h1>
       // Define layers
 
       // Ortofoto [WMS:orto_foraar]
-      const ortofotowms = L.tileLayer.wms('https://api.dataforsyningen.dk/orto_foraar_DAF?ignoreillegallayers=TRUE', {
+      const ortofotoServiceWmsUrl = `https://services.datafordeler.dk/GeoDanmarkOrto/orto_foraar/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const ortofotowms = L.tileLayer.wms(ortofotoServiceWmsUrl, {
+        transparent: 'TRUE',
         layers: 'orto_foraar',
-        token: dftoken,
         format: 'image/png',
-        attribution: myAttributionText,
-        maxNativeZoom: 14
+        attribution: myAttributionText
       });
 
-      // Skærmkort [WMTS:topo_skaermkort]
-      const toposkaermkortwms = L.tileLayer.wms('https://api.dataforsyningen.dk/topo_skaermkort_DAF?ignoreillegallayers=TRUE', {
+      // Skærmkort [WMS:topo_skaermkort]
+      const skaermkortServiceWmsUrl = `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort/1.0.0/wms?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const toposkaermkortwms = L.tileLayer.wms(skaermkortServiceWmsUrl, {
+        transparent: 'FALSE',
         layers: 'dtk_skaermkort',
-        token: dftoken,
         format: 'image/png',
-        attribution: myAttributionText,
-        maxNativeZoom: 14
+        attribution: myAttributionText
       }).addTo(map);
 
       // Define layer groups for layer control
diff --git a/examples/leaflet/example4.html b/examples/leaflet/example4.html
index b5da8b6..97f99a7 100644
--- a/examples/leaflet/example4.html
+++ b/examples/leaflet/example4.html
@@ -30,8 +30,9 @@ <h1>Skift fra WMTS til WMS i det inderste zoom-niveau</h1>
 
     <script>
 
-       // Set Kortforsyningen token, replace with your own token
-      const dftoken = '9ca510be3c4eca89b1333cadbaa60c36';
+      // Set Datafordeler username/password. Replace with your own
+      const dfUser = 'QKJBQATHVS'
+      const dfPass = 'ytxCA8UGM5n0Z*zi'
 
       // Set the attribution (the copyright statement shown in the lower right corner)
       // We do this as we want the same attributions for all layers
@@ -59,21 +60,24 @@ <h1>Skift fra WMTS til WMS i det inderste zoom-niveau</h1>
       // Define layers
 
       // Skærmkort [WMTS:topo_skaermkort]
-      const wmts = L.tileLayer('https://api.dataforsyningen.dk/topo_skaermkort_wmts_DAF?service=WMTS&request=GetTile&version=1.3.0&Layer=topo_skaermkort&style=default&format=image/png&TileMatrixSet=View1&TileMatrix={zoom}&TileRow={y}&TileCol={x}&token=' + dftoken, {
+      const wmts = L.tileLayer(`https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort_wmts/1.0.0/wmts?username=${ dfUser }&password=${ dfPass }&service=WMTS&request=GetTile&version=1.0.0&Layer=topo_skaermkort&style=default&format=image/png&TileMatrixSet=View1&TileMatrix={zoom}&TileRow={y}&TileCol={x}`, {
         attribution: myAttributionText,
         crossOrigin: true,
+        minzoom: 0,
+        maxzoom: 11,
         zoom: function (data) {
           return data.z;
         }
       }).addTo(map);
 
       // Skærmkort [WMS:topo_skaermkort]
-      const wms = L.tileLayer.wms('https://api.dataforsyningen.dk/topo_skaermkort_DAF?ignoreillegallayers=TRUE', {
+      const skaermkortServiceWmsUrl = `https://services.datafordeler.dk/Dkskaermkort/topo_skaermkort/1.0.0/wms?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
+      const wms = L.tileLayer.wms(skaermkortServiceWmsUrl, {
+        transparent: 'TRUE',
         layers: 'dtk_skaermkort',
-        token: dftoken,
         format: 'image/png',
         attribution: myAttributionText
-      })
+      });
 
       // Add scale line to map
       L.control.scale({imperial: false}).addTo(map); // disable feet units
diff --git a/examples/openlayers/example2.html b/examples/openlayers/example2.html
index 2ce1b14..a81a2ec 100644
--- a/examples/openlayers/example2.html
+++ b/examples/openlayers/example2.html
@@ -117,7 +117,6 @@ <h1>WMS kort med <a href="https://openlayers.org/">OpenLayers</a></h1>
       baseMapLayerGroup.getLayers().push(ortofotoLayer)
 
       // Create Matrikel overlay
-
       const matrikelServiceUrl = `https://services.datafordeler.dk/MATRIKLEN2/MatGaeldendeOgForeloebigWMS/1.0.0/WMS?username=${ dfUser }&password=${ dfPass }&ignoreillegallayers=TRUE`
       const matrikelLayer = new TileLayer({
         visible: false,