geonetwork-ui 2.2.0 → 2.3.0-dev.139106e0

package/src/libs/feature/editor/src/lib/feature-editor.module.ts

@@ -1,20 +1,20 @@
+import { CommonModule } from '@angular/common'
+import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'
 import { NgModule } from '@angular/core'
 import { MatNativeDateModule } from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
 import { MatFormFieldModule } from '@angular/material/form-field'
-import { WizardComponent } from './components/wizard/wizard.component'
-import { WizardFieldComponent } from './components/wizard-field/wizard-field.component'
 import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
-import { TranslateModule } from '@ngx-translate/core'
-import { WizardSummarizeComponent } from './components/wizard-summarize/wizard-summarize.component'
-import { CommonModule } from '@angular/common'
-import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'
-import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
-import * as fromEditor from './+state/editor.reducer'
+import { StoreModule } from '@ngrx/store'
+import { TranslateModule } from '@ngx-translate/core'
 import { EditorEffects } from './+state/editor.effects'
 import { EditorFacade } from './+state/editor.facade'
+import * as fromEditor from './+state/editor.reducer'
+import { WizardFieldComponent } from './components/wizard-field/wizard-field.component'
+import { WizardSummarizeComponent } from './components/wizard-summarize/wizard-summarize.component'
+import { WizardComponent } from './components/wizard/wizard.component'
 
 @NgModule({
   declarations: [
@@ -42,5 +42,5 @@ import { EditorFacade } from './+state/editor.facade'
   providers: [EditorFacade],
 })
 export class FeatureEditorModule {}
-export * from './services/wizard.service'
 export * from './models/index'
+export * from './services/wizard.service'

package/src/libs/feature/editor/src/lib/models/fields.model.ts

@@ -1,4 +1,4 @@
-import { FormFieldConfig } from '../../../../../../libs/ui/inputs/src'
+import { FormFieldConfig } from '../components/record-form/form-field'
 
 // Expressions should be enclosed in `${}` to be recognized as such
 // eg. ${dateNow()}

package/src/libs/feature/editor/src/lib/services/editor.service.ts

@@ -1,8 +1,11 @@
 import { Inject, Injectable, Optional } from '@angular/core'
-import { toModel, toXml } from '../../../../../../libs/api/metadata-converter/src'
+import {
+  findConverterForDocument,
+  Iso19139Converter,
+} from '../../../../../../libs/api/metadata-converter/src'
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
-import { Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
+import { from, Observable } from 'rxjs'
+import { map, switchMap } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { EditorFieldsConfig } from '../models/fields.model'
@@ -30,7 +33,11 @@ export class EditorService {
           Accept: 'application/xml',
         },
       })
-      .pipe(map((response) => toModel(response.toString())))
+      .pipe(
+        switchMap((response) =>
+          findConverterForDocument(response).readRecord(response.toString())
+        )
+      )
   }
 
   // returns the record as it was when saved
@@ -52,17 +59,21 @@ export class EditorService {
     }
 
     // TODO: use the catalog repository instead
-    return this.http
-      .put(
-        `${this.apiUrl}/records?metadataType=METADATA&uuidProcessing=OVERWRITE&transformWith=_none_&publishToAll=on`,
-        toXml(savedRecord),
-        {
-          headers: {
-            'Content-Type': 'application/xml',
-          },
-          withCredentials: true,
-        }
-      )
-      .pipe(map(() => savedRecord))
+    // TODO: use converter based on the format of the record before change
+    return from(new Iso19139Converter().writeRecord(savedRecord)).pipe(
+      switchMap((recordXml) =>
+        this.http.put(
+          `${this.apiUrl}/records?metadataType=METADATA&uuidProcessing=OVERWRITE&transformWith=_none_&publishToAll=on`,
+          recordXml,
+          {
+            headers: {
+              'Content-Type': 'application/xml',
+            },
+            withCredentials: true,
+          }
+        )
+      ),
+      map(() => savedRecord)
+    )
   }
 }

package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.ts

@@ -59,7 +59,11 @@ export class AddLayerRecordPreviewComponent extends RecordPreviewComponent {
         name: link.name,
       })
     } else if (link.accessServiceProtocol === 'wmts') {
-      return this.mapUtils.getWmtsLayerFromCapabilities(link)
+      return of({
+        url: link.url.toString(),
+        type: MapContextLayerTypeEnum.WMTS,
+        name: link.name,
+      })
     }
     return throwError(() => 'protocol not supported')
   }

package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.html

@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-2 my-2">
   <div class="flex items-center gap-4">
-    <div class="flex-grow rounded-md border-2 border-gray-200">
+    <div class="grow rounded-md border-2 border-gray-200">
       <gn-ui-drag-and-drop-file-input
         (fileChange)="handleFileChange($event)"
         [accept]="acceptedMimeType.join(',')"

package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.html

@@ -0,0 +1,36 @@
+<div class="flex items-center mb-5">
+  <gn-ui-text-input
+    [(value)]="ogcUrl"
+    (valueChange)="urlChange.next($event)"
+    [hint]="'map.ogc.urlInput.hint' | translate"
+    class="w-96"
+  >
+  </gn-ui-text-input>
+</div>
+
+<div *ngIf="errorMessage" class="text-red-500 mt-2">
+  {{ errorMessage }}
+</div>
+
+<div *ngIf="loading">
+  <p class="loading-message" translate>map.loading.service</p>
+</div>
+
+<div *ngIf="!loading && layers.length > 0">
+  <h2 class="font-bold" translate>map.layers.available</h2>
+  <ng-container *ngFor="let layer of layers">
+    <div class="flex items-center justify-between my-2 layer-item-tree">
+      <p class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap">
+        {{ layer }}
+      </p>
+      <gn-ui-button
+        class="layer-add-btn"
+        type="primary"
+        (buttonClick)="addLayer(layer)"
+        extraClass="text-sm !px-2 !py-1"
+        translate
+        ><span translate> map.layer.add </span></gn-ui-button
+      >
+    </div>
+  </ng-container>
+</div>

package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.ts

@@ -0,0 +1,80 @@
+import {
+  Component,
+  OnInit,
+  Output,
+  EventEmitter,
+  ChangeDetectionStrategy,
+  Input,
+  ChangeDetectorRef,
+} from '@angular/core'
+import { OgcApiEndpoint } from '@camptocamp/ogc-client'
+import { Subject, debounceTime } from 'rxjs'
+import {
+  MapContextLayerModel,
+  MapContextLayerTypeEnum,
+} from '../map-context/map-context.model'
+import { TranslateModule } from '@ngx-translate/core'
+import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
+import { CommonModule } from '@angular/common'
+import { MapLayer } from '../+state/map.models'
+
+@Component({
+  selector: 'gn-ui-add-layer-from-ogc-api',
+  templateUrl: './add-layer-from-ogc-api.component.html',
+  styleUrls: ['./add-layer-from-ogc-api.component.css'],
+  standalone: true,
+  imports: [CommonModule, TranslateModule, UiInputsModule],
+})
+export class AddLayerFromOgcApiComponent implements OnInit {
+  @Input() ogcUrl: string
+  @Output() layerAdded = new EventEmitter<MapLayer>()
+
+  urlChange = new Subject<string>()
+  layerUrl = ''
+  loading = false
+  layers: string[] = []
+  ogcEndpoint: OgcApiEndpoint = null
+  errorMessage: string | null = null
+
+  constructor(private changeDetectorRef: ChangeDetectorRef) {}
+
+  ngOnInit() {
+    this.urlChange.pipe(debounceTime(700)).subscribe(() => {
+      this.loadLayers()
+      this.changeDetectorRef.detectChanges() // manually trigger change detection
+    })
+  }
+
+  async loadLayers() {
+    this.errorMessage = null
+    try {
+      this.loading = true
+      if (this.ogcUrl.trim() === '') {
+        this.layers = []
+        return
+      }
+      this.ogcEndpoint = await new OgcApiEndpoint(this.ogcUrl)
+
+      // Currently only supports feature collections
+      this.layers = await this.ogcEndpoint.featureCollections
+    } catch (error) {
+      const err = error as Error
+      this.layers = []
+      this.errorMessage = 'Error loading layers: ' + err.message
+    } finally {
+      this.loading = false
+      this.changeDetectorRef.markForCheck()
+    }
+  }
+
+  async addLayer(layer: string) {
+    this.layerUrl = await this.ogcEndpoint.getCollectionItemsUrl(layer)
+
+    const layerToAdd: MapContextLayerModel = {
+      name: layer,
+      url: this.layerUrl,
+      type: MapContextLayerTypeEnum.OGCAPI,
+    }
+    this.layerAdded.emit({ ...layerToAdd, title: layer })
+  }
+}

package/src/libs/feature/map/src/lib/feature-map.module.ts

@@ -25,6 +25,7 @@ import { AddLayerFromFileComponent } from './add-layer-from-file/add-layer-from-
 import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wfs.component'
 import { GeocodingComponent } from './geocoding/geocoding.component'
 import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
+import { AddLayerFromOgcApiComponent } from './add-layer-from-ogc-api/add-layer-from-ogc-api.component'
 
 @NgModule({
   declarations: [
@@ -59,6 +60,7 @@ import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
     EffectsModule.forFeature([MapEffects]),
     UiElementsModule,
     UiInputsModule,
+    AddLayerFromOgcApiComponent,
   ],
   providers: [
     {

package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.html

@@ -40,6 +40,14 @@
           <gn-ui-add-layer-from-wfs></gn-ui-add-layer-from-wfs>
         </div>
       </mat-tab>
+      <mat-tab [label]="'map.add.layer.ogc.api' | translate" bodyClass="h-full">
+        <div class="p-3">
+          <gn-ui-add-layer-from-ogc-api
+            [ogcUrl]="ogcUrl"
+            (layerAdded)="addLayer($event)"
+          ></gn-ui-add-layer-from-ogc-api>
+        </div>
+      </mat-tab>
       <mat-tab [label]="'map.add.layer.file' | translate" bodyClass="h-full">
         <div class="p-3">
           <gn-ui-add-layer-from-file></gn-ui-add-layer-from-file>

package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.ts

@@ -9,9 +9,14 @@ import { MapFacade } from '../+state/map.facade'
 })
 export class LayersPanelComponent {
   layers$ = this.mapFacade.layers$
+  ogcUrl = ''
   constructor(private mapFacade: MapFacade) {}
 
   deleteLayer(index: number) {
     this.mapFacade.removeLayer(index)
   }
+
+  addLayer(layer) {
+    this.mapFacade.addLayer(layer)
+  }
 }

package/src/libs/feature/map/src/lib/map-context/map-context.model.ts

@@ -1,7 +1,6 @@
 import type { FeatureCollection } from 'geojson'
 import { Coordinate } from 'ol/coordinate'
 import type { Extent } from 'ol/extent'
-import { Options } from 'ol/source/WMTS'
 
 export enum MapContextLayerTypeEnum {
   XYZ = 'xyz',
@@ -9,6 +8,7 @@ export enum MapContextLayerTypeEnum {
   WMTS = 'wmts',
   WFS = 'wfs',
   GEOJSON = 'geojson',
+  OGCAPI = 'ogcapi',
 }
 
 export interface MapContextModel {
@@ -24,8 +24,8 @@ export interface MapContextLayerWmsModel {
 
 export interface MapContextLayerWmtsModel {
   type: 'wmts'
-  options: Options
-  extent?: Extent
+  url: string
+  name: string
 }
 
 interface MapContextLayerWfsModel {
@@ -34,6 +34,12 @@ interface MapContextLayerWfsModel {
   name: string
 }
 
+export interface MapContextLayerOgcapiModel {
+  type: 'ogcapi'
+  url: string
+  name: string
+}
+
 interface LayerXyzModel {
   type: 'xyz'
   name?: string
@@ -71,6 +77,7 @@ export type MapContextLayerModel =
   | MapContextLayerWfsModel
   | MapContextLayerXyzModel
   | MapContextLayerGeojsonModel
+  | MapContextLayerOgcapiModel
 
 export interface MapContextViewModel {
   center?: Coordinate // expressed in long/lat (EPSG:4326)

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

@@ -22,9 +22,9 @@ import { LayerConfig, MapConfig } from '../../../../../../libs/util/app-config/s
 import { FeatureCollection } from 'geojson'
 import { fromLonLat } from 'ol/proj'
 import WMTS from 'ol/source/WMTS'
-import { removeSearchParams } from '../../../../../../libs/util/shared/src'
 import { Geometry } from 'ol/geom'
 import Feature from 'ol/Feature'
+import { WfsEndpoint, WmtsEndpoint } from '@camptocamp/ogc-client'
 
 export const DEFAULT_BASELAYER_CONTEXT: MapContextLayerXyzModel = {
   type: MapContextLayerTypeEnum.XYZ,
@@ -77,6 +77,15 @@ export class MapContextService {
     const { type } = layerModel
     const style = this.styleService.styles.default
     switch (type) {
+      case MapContextLayerTypeEnum.OGCAPI:
+        return new VectorLayer({
+          source: new VectorSource({
+            format: new GeoJSON(),
+            url: layerModel.url,
+          }),
+          style,
+        })
+
       case MapContextLayerTypeEnum.XYZ:
         return new TileLayer({
           source: new XYZ({
@@ -87,44 +96,63 @@ export class MapContextService {
       case MapContextLayerTypeEnum.WMS:
         return new TileLayer({
           source: new TileWMS({
-            url: removeSearchParams(layerModel.url, ['request', 'service']),
+            url: layerModel.url,
             params: { LAYERS: layerModel.name },
             gutter: 20,
           }),
         })
-      case MapContextLayerTypeEnum.WMTS:
-        return new TileLayer({
-          source: new WMTS(layerModel.options),
+      case MapContextLayerTypeEnum.WMTS: {
+        // TODO: isolate this in utils service
+        const olLayer = new TileLayer({})
+        const endpoint = new WmtsEndpoint(layerModel.url)
+        endpoint.isReady().then(async (endpoint) => {
+          const layerName = endpoint.getSingleLayerName() ?? layerModel.name
+          const layer = endpoint.getLayerByName(layerName)
+          const matrixSet = layer.matrixSets[0]
+          const tileGrid = await endpoint.getOpenLayersTileGrid(layer.name)
+          const resourceUrl = layer.resourceLinks[0]
+          const dimensions = endpoint.getDefaultDimensions(layer.name)
+          olLayer.setSource(
+            new WMTS({
+              layer: layer.name,
+              style: layer.defaultStyle,
+              matrixSet: matrixSet.identifier,
+              format: resourceUrl.format,
+              url: resourceUrl.url,
+              requestEncoding: resourceUrl.encoding,
+              tileGrid,
+              projection: matrixSet.crs,
+              dimensions,
+            })
+          )
         })
-      case MapContextLayerTypeEnum.WFS:
-        return new VectorLayer({
-          source: new VectorSource({
-            format: new GeoJSON(),
-            url: function (extent) {
-              const urlObj = new URL(
-                removeSearchParams(layerModel.url, [
-                  'service',
-                  'version',
-                  'request',
-                ])
-              )
-              urlObj.searchParams.set('service', 'WFS')
-              urlObj.searchParams.set('version', '1.1.0')
-              urlObj.searchParams.set('request', 'GetFeature')
-              urlObj.searchParams.set('outputFormat', 'application/json')
-              urlObj.searchParams.set('typename', layerModel.name)
-              urlObj.searchParams.set('srsname', 'EPSG:3857')
-              urlObj.searchParams.set('bbox', `${extent.join(',')},EPSG:3857`)
-              urlObj.searchParams.set(
-                'maxFeatures',
-                WFS_MAX_FEATURES.toString()
-              )
-              return urlObj.toString()
-            },
-            strategy: bboxStrategy,
-          }),
+        return olLayer
+      }
+      case MapContextLayerTypeEnum.WFS: {
+        const olLayer = new VectorLayer({
           style,
         })
+        new WfsEndpoint(layerModel.url).isReady().then((endpoint) => {
+          const featureType =
+            endpoint.getSingleFeatureTypeName() ?? layerModel.name
+          olLayer.setSource(
+            new VectorSource({
+              format: new GeoJSON(),
+              url: function (extent: [number, number, number, number]) {
+                return endpoint.getFeatureUrl(featureType, {
+                  maxFeatures: WFS_MAX_FEATURES,
+                  asJson: true,
+                  outputCrs: 'EPSG:3857',
+                  extent,
+                  extentCrs: 'EPSG:3857',
+                })
+              },
+              strategy: bboxStrategy,
+            })
+          )
+        })
+        return olLayer
+      }
       case MapContextLayerTypeEnum.GEOJSON: {
         if ('url' in layerModel) {
           return new VectorLayer({

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/notifications/src/index.ts

@@ -0,0 +1,3 @@
+export * from './lib/feature-notifications.module'
+export * from './lib/notifications.service'
+export * from './lib/notifications-container/notifications-container.component'

package/src/libs/feature/notifications/src/lib/feature-notifications.module.ts

@@ -0,0 +1,10 @@
+import { NotificationsService } from './notifications.service'
+import { NgModule } from '@angular/core'
+
+@NgModule({
+  declarations: [],
+  exports: [],
+  imports: [],
+  providers: [NotificationsService],
+})
+export class FeatureNotificationsModule {}

package/src/libs/feature/notifications/src/lib/notification.model.ts

@@ -0,0 +1,6 @@
+export interface NotificationContent {
+  type: 'info' | 'warning' | 'error' | 'success'
+  title: string
+  text: string
+  closeMessage?: string
+}

package/src/libs/feature/notifications/src/lib/notifications-container/notifications-container.component.html

@@ -0,0 +1,17 @@
+<div class="flex flex-col gap-6 p-6 items-start pointer-events-none">
+  <gn-ui-notification
+    *ngFor="
+      let notification of notificationsService.notifications$ | async;
+      trackBy: trackById
+    "
+    class="max-w-full pointer-events-auto"
+    [text]="notification.text"
+    [type]="notification.type"
+    [title]="notification.title"
+    [closeMessage]="notification.closeMessage"
+    (notificationClose)="
+      notificationsService.removeNotificationById(notification.id)
+    "
+    [@enterExit]
+  ></gn-ui-notification>
+</div>