From e3fcdbcf3f90ee01ddaff003a9297d74bffe3c32 Mon Sep 17 00:00:00 2001
From: Sergej Orlov <wladimirych@gmail.com>
Date: Tue, 13 Aug 2024 20:24:51 +0200
Subject: [PATCH 1/3] layers: set min zoom 1 for Spain topo

---
 src/layers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layers.js b/src/layers.js
index 6ee391fb..495864d1 100644
--- a/src/layers.js
+++ b/src/layers.js
@@ -1009,6 +1009,7 @@ class LayerGroupWithOptions extends L.LayerGroup {
                                 scaleDependent: true,
                                 shortName: 'spain_topo',
                                 isOverlayTransparent: false,
+                                minZoom: 1,
                                 bounds: [[35.9024, -9.51828], [43.8375, 4.50439]],
                                 noCors: false,
                                 cutline: getCutline('spain'),

From 48f5bc0366b3f3bfcd897ea3735c833c116a182b Mon Sep 17 00:00:00 2001
From: Sergej Orlov <wladimirych@gmail.com>
Date: Tue, 13 Aug 2024 20:33:19 +0200
Subject: [PATCH 2/3] layers: limit maxZoom for OpenTopo to 15

---
 src/layers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layers.js b/src/layers.js
index 495864d1..e3dd58e6 100644
--- a/src/layers.js
+++ b/src/layers.js
@@ -462,7 +462,7 @@ class LayerGroupWithOptions extends L.LayerGroup {
                         {
                             code: 'Otm',
                             isOverlay: false,
-                            maxNativeZoom: 16,
+                            maxNativeZoom: 15,
                             scaleDependent: true,
                             print: true,
                             jnx: true,

From ed60f63c547bf043f0508cf47c282be9f2f8f40e Mon Sep 17 00:00:00 2001
From: Sergej Orlov <wladimirych@gmail.com>
Date: Tue, 13 Aug 2024 20:58:17 +0200
Subject: [PATCH 3/3] layers: replace URLs for Norway topo maps

---
 src/layers.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/layers.js b/src/layers.js
index e3dd58e6..42652055 100644
--- a/src/layers.js
+++ b/src/layers.js
@@ -788,12 +788,11 @@ class LayerGroupWithOptions extends L.LayerGroup {
                     title: 'Norway paper map',
                     isDefault: false,
                     layer: new L.TileLayer(
-                        'https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=toporaster4&zoom={z}&x={x}&y={y}', // eslint-disable-line max-len
+                        'https://cache.kartverket.no/v1/wmts/1.0.0/toporaster/default/webmercator/{z}/{y}/{x}.png',
                         {
                             code: 'Np',
                             isOverlay: true,
                             isOverlayTransparent: false,
-                            maxNativeZoom: 16,
                             tms: false,
                             print: true,
                             jnx: true,
@@ -801,8 +800,7 @@ class LayerGroupWithOptions extends L.LayerGroup {
                             noCors: false,
                             shortName: 'norway_paper',
                             bounds: [[57.81324, 4.19674], [71.27961, 31.56094]],
-                            attribution: '<a href="https://www.geonorge.no/aktuelt/om-geonorge/brukerveiledning' +
-                                '/#!#se_paa_kart">Geonorge</a>',
+                            attribution: '<a href="https://kartverket.no/til-lands/kart/turkart">Kartverket</a>',
                         }
                     )
                 },
@@ -810,7 +808,7 @@ class LayerGroupWithOptions extends L.LayerGroup {
                     title: 'Norway topo',
                     isDefault: false,
                     layer: new L.TileLayer(
-                        'https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo4&zoom={z}&x={x}&y={y}',
+                        'https://cache.kartverket.no/v1/wmts/1.0.0/topo/default/webmercator/{z}/{y}/{x}.png',
                         {
                             code: 'Nm',
                             isOverlay: true,
@@ -822,8 +820,7 @@ class LayerGroupWithOptions extends L.LayerGroup {
                             noCors: false,
                             shortName: 'norway_topo',
                             bounds: [[57.81324, 4.19674], [71.27961, 31.56094]],
-                            attribution: '<a href="https://www.geonorge.no/aktuelt/om-geonorge/brukerveiledning' +
-                                '/#!#se_paa_kart">Geonorge</a>',
+                            attribution: '<a href="https://kartverket.no/til-lands/kart/turkart">Kartverket</a>',
                         }
                     )
                 },