Merge branch 'updateWMSSource-VIPSUTV-719' into 'development'

Update WMS source for background map (Norway)

See merge request !4

src/components/CommonUtil.vue

@@ -68,7 +68,7 @@
 
 		CONST_URL_STATIC_IMAGE_PATH: '/static/images/observations/',
 
-		CONST_GPS_URL_NORWAY_MAP: 'https://opencache.statkart.no/gatekeeper/gk/gk.open_wmts?Version=1.0.0&service=wmts&request=getcapabilities',
+		CONST_GPS_URL_NORWAY_MAP: 'https://cache.kartverket.no/v1/wmts/1.0.0/WMTSCapabilities.xml',
 		CONST_GPS_DEFAULT_LATITUDE_NORWAY: 16,
 		CONST_GPS_DEFAULT_LONGITUDE_NORWAY: 63,
 

src/components/MapObservation.vue

@@ -226,12 +226,10 @@ export default {
           let result = parser.read(text);
 
           let options = optionsFromCapabilities(result, {
-            layer: 'topo4',
-            matrixSet: 'EPSG:3857',
+            layer: 'topo',
+            matrixSet: 'webmercator',
           });
           //CommonUtil.logInfo(options);
-          // Need to force https on the tiles URL (bug in the service?)
-          options.urls[0] = options.urls[0].replace("http", "https");
 
           This.myMap = new Map({
             layers: [

src/components/MapObservationTimeSeries.vue

@@ -147,10 +147,9 @@ export default {
             let result = parser.read(text);
 
             let options = optionsFromCapabilities(result, {
-              layer: 'topo4',
-              matrixSet: 'EPSG:3857',
+              layer: 'topo',
+              matrixSet: 'webmercator',
             });
-            options.urls[0] = options.urls[0].replace("http","https");
 
             This.myMap = new Map({
               layers: [

src/components/MapPOI.vue

@@ -416,13 +416,10 @@
 						let parser = new WMTSCapabilities();
 						var result = parser.read(text);
 						var options = optionsFromCapabilities(result, {
-							layer: 'topo4',
-							matrixSet: 'EPSG:3857',
+							layer: 'topo',
+							matrixSet: 'webmercator',
 						});
 
-						// Need to force https on the tiles URL (bug in the service?)
-						options.urls[0] = options.urls[0].replace("http","https");
-
 						This.map = new Map({
 							layers: [
 								new TileLayer({