diff --git a/src/components/CommonUtil.vue b/src/components/CommonUtil.vue index 8162f245b984aeaf8aa314b937061090287bd4d6..90b7e77b799fa1e4793470fc98e6b2b609befc43 100644 --- a/src/components/CommonUtil.vue +++ b/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, diff --git a/src/components/MapObservation.vue b/src/components/MapObservation.vue index 08bd87f1bcff95511d8a1f7d4912efb287a0210c..0ef31a49c59d8501540be985872f999ca08a9072 100644 --- a/src/components/MapObservation.vue +++ b/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: [ diff --git a/src/components/MapObservationTimeSeries.vue b/src/components/MapObservationTimeSeries.vue index 15f044f2d50153cf93d040a9cfa80c6d8c7f590b..d061bb18cf8b7520655c33b83b8ea48a7fbb8fd0 100644 --- a/src/components/MapObservationTimeSeries.vue +++ b/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: [ diff --git a/src/components/MapPOI.vue b/src/components/MapPOI.vue index 1d4b3560bed059703d06c87611d83a29aa5cdbae..699442d54930dc6048b5a4e9e0d96925bd16cbf8 100644 --- a/src/components/MapPOI.vue +++ b/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({