Do not allow to push it.only() tests

.eslintrc.js

@@ -7,7 +7,7 @@ module.exports = {
     },
     root: true,
     ignorePatterns: ['node_modules', '.github', 'dist'],
-    plugins: ['simple-import-sort'],
+    plugins: ['simple-import-sort', 'mocha'],
     extends: [
         'eslint:recommended',
         'plugin:vue/vue3-recommended',
@@ -28,6 +28,7 @@ module.exports = {
         ],
         'simple-import-sort/imports': 'error',
         'simple-import-sort/exports': 'error',
+        'mocha/no-exclusive-tests': 'error', // Do not allow it.only() tests
     },
     globals: {
         VITE_ENVIRONMENT: true,

.nvmrc

@@ -1 +1 @@
-v14
+v18

package.json

@@ -92,6 +92,7 @@
         "eslint": "^8.55.0",
         "eslint-plugin-cypress": "^2.15.1",
         "eslint-plugin-markdownlint": "^0.5.0",
+        "eslint-plugin-mocha": "^10.2.0",
         "eslint-plugin-prettier-vue": "^5.0.0",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-vue": "^9.19.2",

src/api/layers/WMSCapabilitiesParser.class.js

@@ -34,7 +34,7 @@ export default class WMSCapabilitiesParser {
             throw new Error(`Failed to parse WMTS Capabilities: invalid content: ${error}`)
         }
 
-        this.originUrl = new URL(originUrl)
+        this.originUrl = originUrl
     }
 
     /**
@@ -65,7 +65,7 @@ export default class WMSCapabilitiesParser {
     getExternalLayerObject(layerId, projection, opacity = 1, visible = true, ignoreError = true) {
         const { layer, parents } = this.findLayer(layerId)
         if (!layer) {
-            const msg = `No WMS layer ${layerId} found in Capabilities ${this.originUrl.toString()}`
+            const msg = `No WMS layer ${layerId} found in Capabilities ${this.originUrl}`
             log.error(msg)
             if (ignoreError) {
                 return null
@@ -164,7 +164,7 @@ export default class WMSCapabilitiesParser {
         }
         if (!layerId) {
             // Without layerID we cannot use the layer in our viewer
-            const msg = `No layerId found in WMS capabilities for layer in ${this.originUrl.toString()}`
+            const msg = `No layerId found in WMS capabilities for layer in ${this.originUrl}`
             log.error(msg, layer)
             if (ignoreError) {
                 return {}
@@ -175,9 +175,9 @@ export default class WMSCapabilitiesParser {
         if (!this.version || !WMS_SUPPORTED_VERSIONS.includes(this.version)) {
             let msg = ''
             if (!this.version) {
-                msg = `No WMS version found in Capabilities of ${this.originUrl.toString()}`
+                msg = `No WMS version found in Capabilities of ${this.originUrl}`
             } else {
-                msg = `WMS version ${this.version} of ${this.originUrl.toString()} not supported`
+                msg = `WMS version ${this.version} of ${this.originUrl} not supported`
             }
             log.error(msg, layer)
             if (ignoreError) {
@@ -189,9 +189,7 @@ export default class WMSCapabilitiesParser {
         return {
             layerId: layerId,
             title: layer.Title,
-            url:
-                this.Capability?.Request?.GetMap?.DCPType[0]?.HTTP?.Get?.OnlineResource ||
-                this.originUrl.toString(),
+            url: this.originUrl,
             version: this.version,
             abstract: layer.Abstract,
             attributions: this._getLayerAttribution(layerId, layer, ignoreError),
@@ -248,7 +246,7 @@ export default class WMSCapabilitiesParser {
         }
 
         if (!layerExtent) {
-            const msg = `No layer extent found for ${layerId} in ${this.originUrl.toString()}`
+            const msg = `No layer extent found for ${layerId} in ${this.originUrl}`
             log.error(msg, layer, parents)
             if (!ignoreError) {
                 throw Error(msg)

src/api/layers/WMTSCapabilitiesParser.class.js

@@ -37,7 +37,7 @@ export default class WMTSCapabilitiesParser {
             throw new Error(`Failed to parse WMTS Capabilities: invalid content`)
         }
         Object.assign(this, capabilities)
-        this.originUrl = new URL(originUrl)
+        this.originUrl = originUrl
     }
 
     /**
@@ -64,7 +64,7 @@ export default class WMTSCapabilitiesParser {
     getExternalLayerObject(layerId, projection, opacity = 1, visible = true, ignoreError = true) {
         const layer = this.findLayer(layerId)
         if (!layer) {
-            const msg = `No WMTS layer ${layerId} found in Capabilities ${this.originUrl.toString()}`
+            const msg = `No WMTS layer ${layerId} found in Capabilities ${this.originUrl}`
             log.error(msg)
             if (!ignoreError) {
                 throw new Error(msg)
@@ -117,23 +117,18 @@ export default class WMTSCapabilitiesParser {
             layerId = layer.Title
         }
         if (!layerId) {
-            const msg = `No layer identifier found in Capabilities ${this.originUrl.toString()}`
+            const msg = `No layer identifier found in Capabilities ${this.originUrl}`
             log.error(msg, layer)
             if (ignoreError) {
                 return {}
             }
             throw new Error(msg)
         }
-        const title = layer.Title || layerId
-
-        const getCapUrl =
-            this.OperationsMetadata?.GetCapabilities?.DCP?.HTTP?.Get[0]?.href ||
-            this.originUrl.toString()
 
         return {
             layerId: layerId,
-            title: title,
-            url: getCapUrl,
+            title: layer.Title || layerId,
+            url: this.originUrl,
             version: this.version,
             abstract: layer.Abstract,
             attributions: this._getLayerAttribution(layerId),
@@ -235,7 +230,7 @@ export default class WMTSCapabilitiesParser {
         if (!title) {
             const msg = `No attribution title for layer ${layerId}`
             log.error(msg)
-            title = this.originUrl.hostname
+            title = new URL(this.originUrl).hostname
         }
         return [new LayerAttribution(title, url)]
     }

src/api/layers/__tests__/WMSCapabitliesParser.class.spec.js

@@ -27,23 +27,22 @@ describe('WMSCapabilitiesParser of wms-geoadmin-sample.xml', () => {
         expect(capabilities.version).toBe('1.3.0')
         expect(capabilities.Capability).toBeTypeOf('object')
         expect(capabilities.Service).toBeTypeOf('object')
-        expect(capabilities.originUrl).toBeInstanceOf(URL)
-        expect(capabilities.originUrl.toString()).toBe('https://wms.geo.admin.ch/')
+        expect(capabilities.originUrl).toBe('https://wms.geo.admin.ch')
     })
     it('Parse layer attributes', () => {
         // General layer
         let layer = capabilities.getExternalLayerObject('ch.swisstopo-vd.official-survey', WGS84)
         expect(layer.externalLayerId).toBe('ch.swisstopo-vd.official-survey')
         expect(layer.name).toBe('OpenData-AV')
         expect(layer.abstract).toBe('The official survey (AV).')
-        expect(layer.baseURL).toBe('https://wms.geo.admin.ch/?')
+        expect(layer.baseURL).toBe('https://wms.geo.admin.ch')
 
         // Layer without .Name
         layer = capabilities.getExternalLayerObject('Periodic-Tracking', WGS84)
         expect(layer.externalLayerId).toBe('Periodic-Tracking')
         expect(layer.name).toBe('Periodic-Tracking')
         expect(layer.abstract).toBe('Layer without Name element should use the Title')
-        expect(layer.baseURL).toBe('https://wms.geo.admin.ch/?')
+        expect(layer.baseURL).toBe('https://wms.geo.admin.ch')
     })
     it('Parse layer attribution', () => {
         // Attribution in root layer
@@ -109,7 +108,7 @@ describe('WMSCapabilitiesParser - layer attributes', () => {
         `
         let capabilities = new WMSCapabilitiesParser(content, 'https://wms.geo.admin.ch')
         let layer = capabilities.getExternalLayerObject('ch.swisstopo-vd.official-survey', WGS84)
-        expect(layer.baseURL).toBe('https://wms.geo.admin.ch/')
+        expect(layer.baseURL).toBe('https://wms.geo.admin.ch')
 
         // URL from Capability
         content = `<?xml version='1.0' encoding="UTF-8" standalone="no"?>
@@ -140,7 +139,7 @@ describe('WMSCapabilitiesParser - layer attributes', () => {
         `
         capabilities = new WMSCapabilitiesParser(content, 'https://wms.geo.admin.ch')
         layer = capabilities.getExternalLayerObject('ch.swisstopo-vd.official-survey', WGS84)
-        expect(layer.baseURL).toBe('https://wms.geo.admin.ch/map?')
+        expect(layer.baseURL).toBe('https://wms.geo.admin.ch')
     })
 })
 

src/api/layers/__tests__/WMTSCapabitliesParser.class.spec.js

@@ -24,23 +24,22 @@ describe('WMTSCapabilitiesParser of wmts-ogc-sample.xml', () => {
         expect(capabilities.OperationsMetadata).toBeTypeOf('object')
         expect(capabilities.ServiceIdentification).toBeTypeOf('object')
         expect(capabilities.ServiceProvider).toBeTypeOf('object')
-        expect(capabilities.originUrl).toBeInstanceOf(URL)
-        expect(capabilities.originUrl.toString()).toBe('https://example.com/')
+        expect(capabilities.originUrl).toBe('https://example.com')
     })
     it('Parse layer attributes', () => {
         // General layer
         let layer = capabilities.getExternalLayerObject('BlueMarbleSecondGenerationAG', WGS84)
         expect(layer.externalLayerId).toBe('BlueMarbleSecondGenerationAG')
         expect(layer.name).toBe('Blue Marble Second Generation - AG')
         expect(layer.abstract).toBe('Blue Marble Second Generation Canton Aargau Product')
-        expect(layer.baseURL).toBe('http://maps.example.com/cgi-bin/map.cgi?')
+        expect(layer.baseURL).toBe('https://example.com')
 
         // Layer without .Identifier
         layer = capabilities.getExternalLayerObject('BlueMarbleThirdGenerationZH', WGS84)
         expect(layer.externalLayerId).toBe('BlueMarbleThirdGenerationZH')
         expect(layer.name).toBe('BlueMarbleThirdGenerationZH')
         expect(layer.abstract).toBe('Blue Marble Third Generation Canton Zürich Product')
-        expect(layer.baseURL).toBe('http://maps.example.com/cgi-bin/map.cgi?')
+        expect(layer.baseURL).toBe('https://example.com')
     })
     it('Parse layer attribution', () => {
         // General layer

src/store/modules/layers.store.js

@@ -422,7 +422,14 @@ const mutations = {
         state.activeLayers.push(layer)
     },
     updateLayer(state, layer) {
-        Object.assign(getActiveLayerById(state, layer.getID()), layer)
+        const layer2Update = getActiveLayerById(state, layer.getID())
+        if (layer2Update) {
+            Object.assign(layer2Update, layer)
+        } else {
+            throw new Error(
+                `Failed to update layer ${layer.getID()}: layer not found in active layers`
+            )
+        }
     },
     removeLayerWithId(state, layerId) {
         state.activeLayers = removeActiveLayerById(state, layerId)

src/store/plugins/external-layers.plugin.js

@@ -52,7 +52,7 @@ async function updateExternalLayer(store, externalLayer, projection) {
         updatedExternalLayer.isLoading = false
         store.dispatch('updateLayer', updatedExternalLayer)
     } catch (error) {
-        log.error(`Failed to update external layer: ${error}`)
+        log.error(`Failed to update external layer: `, error)
     }
 }