Merge pull request #853 from geoadmin/develop

New Release v1.18.0 - #minor

cypress.config.mjs

@@ -11,6 +11,7 @@ export default defineConfig({
     defaultCommandTimeout: 5000,
     requestTimeout: 5000,
     numTestsKeptInMemory: 2,
+    watchForFileChanges: false, // Prevent auto run on file changes
 
     retries: {
         runMode: 3,

package.json

@@ -39,7 +39,7 @@
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/vue-fontawesome": "^3.0.6",
         "@geoblocks/cesium-compass": "^0.5.0",
-        "@geoblocks/mapfishprint": "^0.2.13",
+        "@geoblocks/mapfishprint": "^0.2.14",
         "@geoblocks/ol-maplibre-layer": "^0.1.3",
         "@ivanv/vue-collapse-transition": "^1.0.2",
         "@mapbox/togeojson": "^0.16.2",
@@ -68,6 +68,7 @@
         "hammerjs": "^2.0.8",
         "jquery": "^3.7.1",
         "liang-barsky": "^1.0.5",
+        "lodash": "^4.17.21",
         "maplibre-gl": "^4.1.2",
         "ol": "^9.1.0",
         "pako": "^2.1.0",
@@ -79,7 +80,7 @@
         "vue": "^3.4.21",
         "vue-chartjs": "^5.3.0",
         "vue-i18n": "^9.11.0",
-        "vue-router": "^4.3.0",
+        "vue-router": "^4.3.2",
         "vue3-social-sharing": "^1.0.3",
         "vuex": "^4.1.0"
     },

src/api/layers/AbstractLayer.class.js

@@ -69,6 +69,8 @@ export default class AbstractLayer {
      *   is from another (external) source. Default is `false`
      * @param {boolean} [layerData.isLoading=false] Set to true if some parts of the layer (e.g.
      *   metadata) are still loading. Default is `false`
+     * @param {LayerTimeConfig | null} [layerData.timeConfig=null] Time series config (if
+     *   available). Default is `null`
      * @throws InvalidLayerDataError if no `layerData` is given, or if `layerData.name` or
      *   `layerData.type` or `layer.baseUrl` aren't valid
      */
@@ -90,6 +92,7 @@ export default class AbstractLayer {
             hasLegend = false,
             isExternal = false,
             isLoading = false,
+            timeConfig = null,
         } = layerData
         if (name === null) {
             throw new InvalidLayerDataError('Missing layer name', layerData)
@@ -120,6 +123,8 @@ export default class AbstractLayer {
         this.hasLegend = hasLegend
         this.errorKey = null
         this.hasError = false
+        this.timeConfig = timeConfig
+        this.hasMultipleTimestamps = this.timeConfig?.timeEntries?.length > 1
     }
 
     clone() {

src/api/layers/ExternalLayer.class.js

@@ -94,6 +94,11 @@ export default class ExternalLayer extends AbstractLayer {
      * @param {ExternalLayerGetFeatureInfoCapability | null} [externalLayerData.getFeatureInfoCapability=null]
      *   Configuration describing how to request this layer's server to get feature information.
      *   Default is `null`
+     * @param {LayerTimeConfig | null} [externalLayerData.timeConfig=null] Time series config (if
+     *   available). Default is `null`
+     * @param {Number} [externalWmtsData.currentYear=null] Current year of the time series config to
+     *   use. This parameter is needed as it is set in the URL while the timeConfig parameter is not
+     *   yet available and parse later on from the GetCapabilities. Default is `null`
      * @throws InvalidLayerDataError if no `externalLayerData` is given or if it is invalid
      */
     constructor(externalLayerData) {
@@ -115,6 +120,8 @@ export default class ExternalLayer extends AbstractLayer {
             availableProjections = [],
             hasTooltip = false,
             getFeatureInfoCapability = null,
+            timeConfig = null,
+            currentYear = null,
         } = externalLayerData
         // keeping this checks, even though it will be checked again by the super constructor, because we use the baseUrl
         // to build our call to the super constructor (with a URL construction, which could raise an error if baseUrl is
@@ -135,6 +142,7 @@ export default class ExternalLayer extends AbstractLayer {
             isLoading,
             hasDescription: abstract?.length > 0 || legends?.length > 0,
             hasLegend: legends?.length > 0,
+            timeConfig,
         })
         this.abstract = abstract
         this.extent = extent
@@ -148,5 +156,9 @@ export default class ExternalLayer extends AbstractLayer {
             this.availableProjections.push(WGS84)
         }
         this.getFeatureInfoCapability = getFeatureInfoCapability
+        this.currentYear = currentYear
+        if (currentYear && this.timeConfig) {
+            this.timeConfig.updateCurrentTimeEntry(this.timeConfig.getTimeEntryForYear(currentYear))
+        }
     }
 }

src/api/layers/ExternalWMTSLayer.class.js

@@ -2,6 +2,57 @@ import ExternalLayer from '@/api/layers/ExternalLayer.class'
 import { InvalidLayerDataError } from '@/api/layers/InvalidLayerData.error'
 import LayerTypes from '@/api/layers/LayerTypes.enum'
 
+/**
+ * @readonly
+ * @enum {String}
+ */
+export const WMTSEncodingTypes = {
+    KVP: 'KVP',
+    REST: 'REST',
+}
+
+/**
+ * WMTS TileMatrixSet
+ *
+ * @class
+ */
+export class TileMatrixSet {
+    /**
+     * @param {String} id Identifier of the tile matrix set (see WMTS OGC spec)
+     * @param {CoordinateSystem} projection Coordinate system supported by the Tile Matrix Set
+     * @param {any} tileMatrix TileMatrix from GetCapabilities (see WMTS OGC spec)
+     */
+    constructor(id, projection, tileMatrix) {
+        this.id = id
+        this.projection = projection
+        this.tileMatrix = tileMatrix
+    }
+}
+
+/**
+ * A WMTS Layer dimension
+ *
+ * See WMTS OGC Spec
+ *
+ * @class
+ */
+export class WMTSDimension {
+    /**
+     * @param {String} id Dimension identifier
+     * @param {String} dft Dimension default value
+     * @param {[String]} values All dimension values
+     * @param {Boolean} [optionals.current] Boolean flag if the dimension support current (see WMTS
+     *   OGC spec)
+     */
+    constructor(id, dft, values, optionals = {}) {
+        const { current = false } = optionals
+        this.id = id
+        this.default = dft
+        this.values = values
+        this.current = current
+    }
+}
+
 /**
  * Metadata for an external WMTS layer, that will be defined through a GetCapabilities.xml endpoint
  * (and a layer ID)
@@ -37,6 +88,20 @@ export default class ExternalWMTSLayer extends ExternalLayer {
      * @param {CoordinateSystem[]} [externalWmtsData.availableProjections=[]] All projection that
      *   can be used to request this layer. Default is `[]`
      * @param {ol/WMTS/Options} [externalWmtsData.options] WMTS Get Capabilities options
+     * @param {String} [externalWmtsData.getTileEncoding=REST] WMTS Get Tile encoding (KVP or REST).
+     *   Default is `REST`
+     * @param {String | null} [externalWmtsData.urlTemplate=''] WMTS Get Tile url template for REST
+     *   encoding. Default is `''`
+     * @param {String} [externalWmtsData.style='default'] WMTS layer style. Default is `'default'`
+     * @param {[TileMatrixSet]} [externalWmtsData.tileMatrixSets=[]] WMTS tile matrix sets
+     *   identifiers. Default is `[]`
+     * @param {[WMTSDimension]} [externalWmtsData.dimensions=[]] WMTS tile dimensions. Default is
+     *   `[]`
+     * @param {LayerTimeConfig | null} [externalLayerData.timeConfig=null] Time series config (if
+     *   available). Default is `null`
+     * @param {Number} [externalWmtsData.currentYear=null] Current year of the time series config to
+     *   use. This parameter is needed as it is set in the URL while the timeConfig parameter is not
+     *   yet available and parse later on from the GetCapabilities. Default is `null`
      * @throws InvalidLayerDataError if no `externalWmtsData` is given or if it is invalid
      */
     constructor(externalWmtsData) {
@@ -56,6 +121,13 @@ export default class ExternalWMTSLayer extends ExternalLayer {
             isLoading = true,
             availableProjections = [],
             options = null,
+            getTileEncoding = WMTSEncodingTypes.REST,
+            urlTemplate = '',
+            style = 'default',
+            tileMatrixSets = [],
+            dimensions = [],
+            timeConfig = null,
+            currentYear = null,
         } = externalWmtsData
         super({
             name,
@@ -71,7 +143,14 @@ export default class ExternalWMTSLayer extends ExternalLayer {
             legends,
             isLoading,
             availableProjections,
+            timeConfig,
+            currentYear,
         })
         this.options = options
+        this.getTileEncoding = getTileEncoding
+        this.urlTemplate = urlTemplate
+        this.style = style
+        this.tileMatrixSets = tileMatrixSets
+        this.dimensions = dimensions
     }
 }

src/api/layers/GeoAdminLayer.class.js

@@ -113,14 +113,13 @@ export default class GeoAdminLayer extends AbstractLayer {
             isLoading,
             hasDescription,
             hasLegend,
+            timeConfig,
         })
         this.technicalName = technicalName
         this.isBackground = isBackground
         this.isHighlightable = isHighlightable
         this.topics = topics
         this.isSpecificFor3D = id.toLowerCase().endsWith('_3d')
-        this.timeConfig = timeConfig
-        this.hasMultipleTimestamps = this.timeConfig?.timeEntries?.length > 1
         this.searchable = searchable
     }
 

src/api/layers/LayerTimeConfig.class.js

@@ -98,15 +98,15 @@ export default class LayerTimeConfig {
      * @returns {LayerTimeConfigEntry | null}
      */
     getTimeEntryForYear(year) {
-        return this.timeEntries.find((entry) => entry.year === year)
+        return this.timeEntries.find((entry) => entry.year === year) ?? null
     }
 
     /**
      * @param {String} timestamp
      * @returns {LayerTimeConfigEntry | null}
      */
     getTimeEntryForTimestamp(timestamp) {
-        return this.timeEntries.find((entry) => entry.timestamp === timestamp)
+        return this.timeEntries.find((entry) => entry.timestamp === timestamp) ?? null
     }
 
     clone() {

src/api/layers/LayerTimeConfigEntry.class.js

@@ -1,3 +1,5 @@
+import { isTimestampYYYYMMDD } from '@/utils/numberUtils'
+
 /**
  * Year we are using to describe the timestamp "all data" for WMS (and also for WMTS as there is no
  * equivalent for that in the norm)
@@ -34,7 +36,7 @@ export const CURRENT_YEAR_WMTS_TIMESTAMP = 'current'
  * to Vue reactivity engine.
  */
 export default class LayerTimeConfigEntry {
-    /** @param {String} timestamp A full timestamp as YYYYYMMDD */
+    /** @param {String} timestamp A full timestamp as YYYYYMMDD or ISO 8601 format */
     constructor(timestamp) {
         this.timestamp = timestamp
         if (
@@ -43,7 +45,16 @@ export default class LayerTimeConfigEntry {
         ) {
             this.year = YEAR_TO_DESCRIBE_ALL_OR_CURRENT_DATA
         } else {
-            this.year = parseInt(timestamp.substring(0, 4))
+            if (isTimestampYYYYMMDD(timestamp)) {
+                this.year = parseInt(timestamp.substring(0, 4))
+            } else {
+                const date = new Date(timestamp)
+                if (!isNaN(date)) {
+                    this.year = date.getFullYear()
+                } else {
+                    this.year = null
+                }
+            }
         }
     }
 }