geonetwork-ui 2.3.0-dev.376e0e90 → 2.3.0-dev.3d65a13b

package/src/libs/feature/map/src/lib/utils/map-utils.service.ts

@@ -12,7 +12,6 @@ import Source from 'ol/source/Source'
 import ImageWMS from 'ol/source/ImageWMS'
 import TileWMS from 'ol/source/TileWMS'
 import VectorSource from 'ol/source/Vector'
-import { optionsFromCapabilities } from 'ol/source/WMTS'
 import { defaults, DragPan, Interaction, MouseWheelZoom } from 'ol/interaction'
 import {
   mouseOnly,
@@ -20,23 +19,17 @@ import {
   platformModifierKeyOnly,
   primaryAction,
 } from 'ol/events/condition'
-import WMTSCapabilities from 'ol/format/WMTSCapabilities'
-import { from, Observable } from 'rxjs'
+import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import {
   MapContextLayerModel,
-  MapContextLayerTypeEnum,
   MapContextLayerWmsModel,
-  MapContextLayerWmtsModel,
 } from '../map-context/map-context.model'
 import Collection from 'ol/Collection'
 import MapBrowserEvent from 'ol/MapBrowserEvent'
-import {
-  CatalogRecord,
-  DatasetDistribution,
-} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { ProxyService } from '../../../../../../libs/util/shared/src'
-import { WmsEndpoint } from '@camptocamp/ogc-client'
+import { WmsEndpoint, WmtsEndpoint } from '@camptocamp/ogc-client'
 import { LONLAT_CRS_CODES } from '../constant/projections'
 import { fromEPSGCode, register } from 'ol/proj/proj4'
 import proj4 from 'proj4/dist/proj4'
@@ -152,11 +145,14 @@ export class MapUtilsService {
     } else if (layer && layer.type === 'wms') {
       latLonExtent = await this.getWmsLayerExtent(layer)
     } else if (layer && layer.type === 'wmts') {
-      if (layer.extent) {
-        latLonExtent = layer.extent
-      } else {
-        return layer.options.tileGrid.getExtent()
-      }
+      // TODO: isolate this in utils service
+      latLonExtent = await new WmtsEndpoint(layer.url)
+        .isReady()
+        .then((endpoint) => {
+          const layerName = endpoint.getSingleLayerName() ?? layer.name
+          const wmtsLayer = endpoint.getLayerByName(layerName)
+          return wmtsLayer.latLonBoundingBox
+        })
     } else {
       return null
     }
@@ -180,59 +176,19 @@ export class MapUtilsService {
       LONLAT_CRS_CODES.includes(crs)
     )
     if (lonLatCRS) {
-      return boundingBoxes[lonLatCRS].map(parseFloat)
+      return boundingBoxes[lonLatCRS]
     } else {
       const availableEPSGCode = Object.keys(boundingBoxes)[0]
       register(proj4)
       const proj = await fromEPSGCode(availableEPSGCode)
-      const bboxWithFiniteNumbers =
-        boundingBoxes[availableEPSGCode].map(parseFloat)
-      return transformExtent(bboxWithFiniteNumbers, proj, 'EPSG:4326')
+      return transformExtent(
+        boundingBoxes[availableEPSGCode],
+        proj,
+        'EPSG:4326'
+      )
     }
   }
 
-  getWmtsLayerFromCapabilities(
-    link: DatasetDistribution
-  ): Observable<MapContextLayerWmtsModel> {
-    const getCapabilitiesUrl = new URL(link.url, window.location.toString())
-    getCapabilitiesUrl.searchParams.set('SERVICE', 'WMTS')
-    getCapabilitiesUrl.searchParams.set('REQUEST', 'GetCapabilities')
-    return from(
-      fetch(getCapabilitiesUrl.toString())
-        .then(async function (response) {
-          if (!response.ok) {
-            throw new Error(`WMTS GetCapabilities HTTP request failed with code ${
-              response.status
-            } and body:
-${await response.text()}`)
-          }
-          return response.text()
-        })
-        .then(function (text) {
-          try {
-            const result = new WMTSCapabilities().read(text)
-            const options = optionsFromCapabilities(result, {
-              layer: link.name,
-              matrixSet: 'EPSG:3857',
-            })
-            const layerCap = result?.Contents?.Layer.find(
-              (layer) => layer.Identifier === link.name
-            )
-            return {
-              options,
-              type: MapContextLayerTypeEnum.WMTS as 'wmts',
-              ...(layerCap?.WGS84BoundingBox
-                ? { extent: layerCap.WGS84BoundingBox }
-                : {}),
-            }
-          } catch (e: any) {
-            throw new Error(`WMTS GetCapabilities parsing failed:
-${e.stack || e.message || e}`)
-          }
-        })
-    )
-  }
-
   prioritizePageScroll(interactions: Collection<Interaction>) {
     interactions.clear()
     interactions.extend(

package/src/libs/feature/record/src/lib/map-view/map-view.component.ts

@@ -188,7 +188,11 @@ export class MapViewComponent implements OnInit, OnDestroy {
       link.type === 'service' &&
       link.accessServiceProtocol === 'wmts'
     ) {
-      return this.mapUtils.getWmtsLayerFromCapabilities(link)
+      return of({
+        url: link.url.toString(),
+        type: MapContextLayerTypeEnum.WMTS,
+        name: link.name,
+      })
     } else if (
       (link.type === 'service' &&
         (link.accessServiceProtocol === 'wfs' ||

package/translations/de.json

@@ -177,6 +177,7 @@
   "map.add.layer": "Eine Ebene hinzufügen",
   "map.add.layer.catalog": "Aus dem Katalog",
   "map.add.layer.file": "Aus einer Datei",
+  "map.add.layer.ogc.api": "",
   "map.add.layer.wfs": "Aus WFS",
   "map.add.layer.wms": "Aus WMS",
   "map.addFromFile.placeholder": "Klicke hier oder ziehe eine Datei herein",
@@ -188,6 +189,7 @@
   "map.loading.data": "Kartendaten werden geladen...",
   "map.loading.service": "Dienst wird geladen...",
   "map.navigation.message": "Bitte verwenden Sie STRG + Maus (oder zwei Finger auf einem Mobilgerät), um die Karte zu navigieren",
+  "map.ogc.urlInput.hint": "",
   "map.select.layer": "Datenquelle",
   "map.wfs.urlInput.hint": "Geben Sie die WFS URL ein",
   "map.wms.urlInput.hint": "Geben Sie die WMS URL ein",

package/translations/en.json

@@ -177,6 +177,7 @@
   "map.add.layer": "Add a layer",
   "map.add.layer.catalog": "From the catalog",
   "map.add.layer.file": "From a file",
+  "map.add.layer.ogc.api": "From OGC API",
   "map.add.layer.wfs": "From WFS",
   "map.add.layer.wms": "From WMS",
   "map.addFromFile.placeholder": "Click or drop a file here",
@@ -188,6 +189,7 @@
   "map.loading.data": "Loading map data...",
   "map.loading.service": "Loading service...",
   "map.navigation.message": "Please use CTRL + mouse (or two fingers on mobile) to navigate the map",
+  "map.ogc.urlInput.hint": "Enter OGC API service URL",
   "map.select.layer": "Data source",
   "map.wfs.urlInput.hint": "Enter WFS service URL",
   "map.wms.urlInput.hint": "Enter WMS service URL",

package/translations/es.json

@@ -177,6 +177,7 @@
   "map.add.layer": "",
   "map.add.layer.catalog": "",
   "map.add.layer.file": "",
+  "map.add.layer.ogc.api": "",
   "map.add.layer.wfs": "",
   "map.add.layer.wms": "",
   "map.addFromFile.placeholder": "",
@@ -188,6 +189,7 @@
   "map.loading.data": "",
   "map.loading.service": "",
   "map.navigation.message": "",
+  "map.ogc.urlInput.hint": "",
   "map.select.layer": "",
   "map.wfs.urlInput.hint": "",
   "map.wms.urlInput.hint": "",

package/translations/fr.json

@@ -177,6 +177,7 @@
   "map.add.layer": "Ajouter une couche",
   "map.add.layer.catalog": "Du catalogue",
   "map.add.layer.file": "À partir d'un fichier",
+  "map.add.layer.ogc.api": "",
   "map.add.layer.wfs": "Depuis un service WFS",
   "map.add.layer.wms": "Depuis un service WMS",
   "map.addFromFile.placeholder": "Cliquez ou déposez un fichier ici",
@@ -188,6 +189,7 @@
   "map.loading.data": "Chargement des données...",
   "map.loading.service": "Chargement du service...",
   "map.navigation.message": "Veuillez utiliser CTRL + souris (ou deux doigts sur mobile) pour naviguer sur la carte",
+  "map.ogc.urlInput.hint": "",
   "map.select.layer": "Source de données",
   "map.wfs.urlInput.hint": "Entrez l'URL du service WFS",
   "map.wms.urlInput.hint": "Entrez l'URL du service WMS",

package/translations/it.json

@@ -177,6 +177,7 @@
   "map.add.layer": "Aggiungere un layer",
   "map.add.layer.catalog": "Dal catalogo",
   "map.add.layer.file": "Da un file",
+  "map.add.layer.ogc.api": "",
   "map.add.layer.wfs": "Da un WFS",
   "map.add.layer.wms": "Da un WMS",
   "map.addFromFile.placeholder": "Clicca o trascina un file qui",
@@ -188,6 +189,7 @@
   "map.loading.data": "Caricamento dati...",
   "map.loading.service": "Caricamento del servizio...",
   "map.navigation.message": "Si prega di utilizzare CTRL + mouse (o due dita su mobile) per navigare sulla mappa",
+  "map.ogc.urlInput.hint": "",
   "map.select.layer": "Sorgente dati",
   "map.wfs.urlInput.hint": "Inserisci URL del servizio WFS",
   "map.wms.urlInput.hint": "Inserisci URL del servizio WMS",

package/translations/nl.json

@@ -177,6 +177,7 @@
   "map.add.layer": "",
   "map.add.layer.catalog": "",
   "map.add.layer.file": "",
+  "map.add.layer.ogc.api": "",
   "map.add.layer.wfs": "",
   "map.add.layer.wms": "",
   "map.addFromFile.placeholder": "",
@@ -188,6 +189,7 @@
   "map.loading.data": "",
   "map.loading.service": "",
   "map.navigation.message": "",
+  "map.ogc.urlInput.hint": "",
   "map.select.layer": "",
   "map.wfs.urlInput.hint": "",
   "map.wms.urlInput.hint": "",

package/translations/pt.json

@@ -177,6 +177,7 @@
   "map.add.layer": "",
   "map.add.layer.catalog": "",
   "map.add.layer.file": "",
+  "map.add.layer.ogc.api": "",
   "map.add.layer.wfs": "",
   "map.add.layer.wms": "",
   "map.addFromFile.placeholder": "",
@@ -188,6 +189,7 @@
   "map.loading.data": "",
   "map.loading.service": "",
   "map.navigation.message": "",
+  "map.ogc.urlInput.hint": "",
   "map.select.layer": "",
   "map.wfs.urlInput.hint": "",
   "map.wms.urlInput.hint": "",

package/translations/sk.json

@@ -177,6 +177,7 @@
   "map.add.layer": "Pridať vrstvu",
   "map.add.layer.catalog": "Z katalógu",
   "map.add.layer.file": "Zo súboru",
+  "map.add.layer.ogc.api": "",
   "map.add.layer.wfs": "Z WFS",
   "map.add.layer.wms": "Z WMS",
   "map.addFromFile.placeholder": "Kliknite na tlačidlo alebo sem vložte súbor",
@@ -188,6 +189,7 @@
   "map.loading.data": "Načítavanie dát mapy...",
   "map.loading.service": "Načítavanie služieb...",
   "map.navigation.message": "Použite prosím CTRL + myš (alebo dva prsty na mobilnom zariadení) na navigáciu po mape",
+  "map.ogc.urlInput.hint": "",
   "map.select.layer": "Zdroj dát",
   "map.wfs.urlInput.hint": "Zadajte URL adresu služby WFS",
   "map.wms.urlInput.hint": "Zadajte URL adresu služby WMS",