geonetwork-ui 2.4.0-dev.42a43a29 → 2.4.0-dev.4892c308

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

@@ -1,42 +1,8 @@
-import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import type { FeatureCollection } from 'geojson'
-import { extend, Extent, isEmpty } from 'ol/extent'
-import Feature from 'ol/Feature'
+import { extend, Extent } from 'ol/extent'
 import GeoJSON from 'ol/format/GeoJSON'
-import { Geometry } from 'ol/geom'
-import Layer from 'ol/layer/Layer'
-import Map from 'ol/Map'
 import { transformExtent } from 'ol/proj'
-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 { defaults, DragPan, Interaction, MouseWheelZoom } from 'ol/interaction'
-import {
-  mouseOnly,
-  noModifierKeys,
-  platformModifierKeyOnly,
-  primaryAction,
-} from 'ol/events/condition'
-import { Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
-import {
-  MapContextLayerModel,
-  MapContextLayerWmsModel,
-} from '../map-context/map-context.model'
-import Collection from 'ol/Collection'
-import MapBrowserEvent from 'ol/MapBrowserEvent'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { ProxyService } from '../../../../../../libs/util/shared/src'
-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'
-import { defaults as defaultControls } from 'ol/control/defaults'
-
-const FEATURE_PROJECTION = 'EPSG:3857'
-const DATA_PROJECTION = 'EPSG:4326'
 
 const GEOJSON = new GeoJSON()
 
@@ -44,212 +10,22 @@ const GEOJSON = new GeoJSON()
   providedIn: 'root',
 })
 export class MapUtilsService {
-  constructor(private http: HttpClient, private proxy: ProxyService) {}
-
-  createEmptyMap(): Map {
-    return new Map({
-      controls: defaultControls({
-        attribution: true,
-        attributionOptions: { collapsible: false },
-      }),
-      pixelRatio: 1,
-    })
-  }
-
-  readFeatureCollection = (
-    featureCollection: FeatureCollection,
-    featureProjection = FEATURE_PROJECTION,
-    dataProjection = DATA_PROJECTION
-  ): Feature<Geometry>[] => {
-    return GEOJSON.readFeatures(featureCollection, {
-      featureProjection,
-      dataProjection,
-    }) as Feature<Geometry>[]
-  }
-
-  isWMSLayer(layer: Layer<Source>): boolean {
-    return (
-      layer.getSource() instanceof TileWMS ||
-      layer.getSource() instanceof ImageWMS
-    )
-  }
-
-  getGFIUrl(layer, map, coordinate): string {
-    const view = map.getView()
-    const projection = view.getProjection()
-    const resolution = view.getResolution()
-    const source = layer.getSource()
-    const params = {
-      ...source.getParams(),
-      INFO_FORMAT: 'application/json',
-    }
-    return source.getFeatureInfoUrl(coordinate, resolution, projection, params)
-  }
-
-  getVectorFeaturesFromClick(olMap, event): Feature<Geometry>[] {
-    const features = []
-    const hit = olMap.forEachFeatureAtPixel(
-      event.pixel,
-      (feature: Feature<Geometry>) => {
-        return feature
-      },
-      { layerFilter: (layer) => layer.getSource() instanceof VectorSource }
-    )
-    if (hit) {
-      features.push(hit)
-    }
-    return features
-  }
-
-  getGFIFeaturesObservablesFromClick(
-    olMap: Map,
-    event: MapBrowserEvent<PointerEvent>
-  ): Observable<Feature<Geometry>[]>[] {
-    const wmsLayers = olMap.getLayers().getArray().filter(this.isWMSLayer)
-
-    if (wmsLayers.length > 0) {
-      const { coordinate } = event
-      const gfiUrls = wmsLayers.reduce(
-        (urls, layer) => [...urls, this.getGFIUrl(layer, olMap, coordinate)],
-
-        []
-      )
-      return gfiUrls.map((url) =>
-        this.http
-          .get<FeatureCollection>(url)
-          .pipe(map((collection) => this.readFeatureCollection(collection)))
-      )
-    } else {
-      return []
-    }
-  }
-
-  /**
-   * Will emit `null` if no extent could be computed
-   */
-  async getLayerExtent(layer: MapContextLayerModel): Promise<Extent | null> {
-    let latLonExtent: Extent
-    if (
-      layer &&
-      layer.type === 'geojson' &&
-      'data' in layer &&
-      typeof layer.data === 'object' &&
-      layer.data.features[0] &&
-      layer.data.features[0].geometry
-    ) {
-      latLonExtent = new GeoJSON()
-        .readFeatures(layer.data)
-        .map((feature) => feature.getGeometry())
-        .filter((geom) => !!geom)
-        .reduce(
-          (prev, curr) =>
-            prev ? extend(prev, curr.getExtent()) : curr.getExtent(),
-          null as Extent
-        )
-    } else if (layer && layer.type === 'wms') {
-      latLonExtent = await this.getWmsLayerExtent(layer)
-    } else if (layer && layer.type === 'wmts') {
-      // 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
-    }
-    if (!latLonExtent || isEmpty(latLonExtent)) {
-      return null
-    }
-    return transformExtent(latLonExtent, 'EPSG:4326', 'EPSG:3857')
-  }
-
-  async getWmsLayerExtent(
-    layer: MapContextLayerWmsModel
-  ): Promise<Extent | null> {
-    const endpoint = await new WmsEndpoint(
-      this.proxy.getProxiedUrl(layer.url)
-    ).isReady()
-    const { boundingBoxes } = endpoint.getLayerByName(layer.name)
-    if (!Object.keys(boundingBoxes).length) {
-      return null
-    }
-    const lonLatCRS = Object.keys(boundingBoxes)?.find((crs) =>
-      LONLAT_CRS_CODES.includes(crs)
-    )
-    if (lonLatCRS) {
-      return boundingBoxes[lonLatCRS]
-    } else {
-      const availableEPSGCode = Object.keys(boundingBoxes)[0]
-      register(proj4)
-      const proj = await fromEPSGCode(availableEPSGCode)
-      return transformExtent(
-        boundingBoxes[availableEPSGCode],
-        proj,
-        'EPSG:4326'
-      )
-    }
-  }
-
-  prioritizePageScroll(interactions: Collection<Interaction>) {
-    interactions.clear()
-    interactions.extend(
-      defaults({
-        // remove rotate interactions
-        altShiftDragRotate: false,
-        pinchRotate: false,
-        // replace drag and zoom interactions
-        dragPan: false,
-        mouseWheelZoom: false,
-      })
-        .extend([
-          new DragPan({
-            condition: dragPanCondition,
-          }),
-          new MouseWheelZoom({
-            condition: mouseWheelZoomCondition,
-          }),
-        ])
-        .getArray()
-    )
-  }
-
   getRecordExtent(record: Partial<CatalogRecord>): Extent {
     if (!('spatialExtents' in record) || record.spatialExtents.length === 0) {
       return null
     }
-    // transform an array of geojson geometries into a bbox
+    // extend all the spatial extents into an including bbox
     const totalExtent = record.spatialExtents.reduce(
       (prev, curr) => {
-        const geom = GEOJSON.readGeometry(curr.geometry)
-        return extend(prev, geom.getExtent())
+        if ('bbox' in curr) return extend(prev, curr.bbox)
+        else if ('geometry' in curr) {
+          const geom = GEOJSON.readGeometry(curr.geometry)
+          return extend(prev, geom.getExtent())
+        }
+        return prev
       },
       [Infinity, Infinity, -Infinity, -Infinity]
     )
     return transformExtent(totalExtent, 'EPSG:4326', 'EPSG:3857')
   }
 }
-
-export function dragPanCondition(
-  this: DragPan,
-  event: MapBrowserEvent<PointerEvent>
-) {
-  const dragPanCondition = this.getPointerCount() === 2 || mouseOnly(event)
-  if (!dragPanCondition) {
-    this.getMap().dispatchEvent('mapmuted')
-  }
-  // combine the condition with the default DragPan conditions
-  return dragPanCondition && noModifierKeys(event) && primaryAction(event)
-}
-
-export function mouseWheelZoomCondition(
-  this: MouseWheelZoom,
-  event: MapBrowserEvent<UIEvent>
-) {
-  if (!platformModifierKeyOnly(event) && event.type === 'wheel') {
-    this.getMap().dispatchEvent('mapmuted')
-  }
-  return platformModifierKeyOnly(event)
-}

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

@@ -9,7 +9,7 @@ import { BehaviorSubject, combineLatest } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { MdViewFacade } from '../state'
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-data-view',
@@ -43,7 +43,7 @@ export class DataViewComponent {
       }))
     )
   )
-  selectedLink$ = new BehaviorSubject<DatasetDistribution>(null)
+  selectedLink$ = new BehaviorSubject<DatasetOnlineResource>(null)
 
   constructor(private mdViewFacade: MdViewFacade) {}
 
@@ -52,7 +52,7 @@ export class DataViewComponent {
   }
 
   selectLink(linkAsString: string) {
-    const link: DatasetDistribution = JSON.parse(linkAsString)
+    const link: DatasetOnlineResource = JSON.parse(linkAsString)
     link.url = new URL(link.url)
     this.selectedLink$.next(link)
   }

package/src/libs/feature/record/src/lib/external-viewer-button/external-viewer-button.component.ts

@@ -1,12 +1,26 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { MapConfig } from '../../../../../../libs/util/app-config/src'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  InjectionToken,
+  Input,
+  Optional,
+} from '@angular/core'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { TranslateService } from '@ngx-translate/core'
 import { getFileFormat } from '../../../../../../libs/util/shared/src'
 
 marker('externalviewer.dataset.unnamed')
 
+export const EXTERNAL_VIEWER_URL_TEMPLATE = new InjectionToken<string>(
+  'externalViewerUrlTemplate'
+)
+export const EXTERNAL_VIEWER_OPEN_NEW_TAB = new InjectionToken<boolean>(
+  'externalViewerOpenNewTab',
+  { factory: () => false }
+)
+
 @Component({
   selector: 'gn-ui-external-viewer-button',
   templateUrl: './external-viewer-button.component.html',
@@ -14,17 +28,10 @@ marker('externalviewer.dataset.unnamed')
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ExternalViewerButtonComponent {
-  @Input() link: DatasetDistribution
-  @Input() mapConfig: MapConfig
+  @Input() link: DatasetOnlineResource
 
   get externalViewer() {
-    if (this.link && this.mapConfig) {
-      return (
-        !!this.mapConfig.EXTERNAL_VIEWER_URL_TEMPLATE &&
-        !!this.supportedLinkLayerType
-      )
-    }
-    return false
+    return !!this.urlTemplate && !!this.supportedLinkLayerType
   }
 
   get supportedLinkLayerType() {
@@ -45,10 +52,17 @@ export class ExternalViewerButtonComponent {
     return null
   }
 
-  constructor(private translateService: TranslateService) {}
+  constructor(
+    private translateService: TranslateService,
+    @Inject(EXTERNAL_VIEWER_URL_TEMPLATE)
+    @Optional()
+    private urlTemplate: string,
+    @Inject(EXTERNAL_VIEWER_OPEN_NEW_TAB)
+    private openinNewTab: boolean
+  ) {}
 
   openInExternalViewer() {
-    const templateUrl = this.mapConfig.EXTERNAL_VIEWER_URL_TEMPLATE
+    const templateUrl = this.urlTemplate
     const layerName = this.link.name
       ? this.link.name
       : this.translateService.instant('externalviewer.dataset.unnamed')
@@ -59,11 +73,6 @@ export class ExternalViewerButtonComponent {
         `${encodeURIComponent(this.link.url.toString())}`
       )
       .replace('${service_type}', `${this.supportedLinkLayerType}`)
-    window
-      .open(
-        url,
-        this.mapConfig.EXTERNAL_VIEWER_OPEN_NEW_TAB ? '_blank' : '_self'
-      )
-      .focus()
+    window.open(url, this.openinNewTab ? '_blank' : '_self').focus()
   }
 }

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

@@ -1,10 +1,16 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { UiMapModule } from '../../../../../libs/ui/map/src'
+import {
+  FeatureDetailComponent,
+  MapContainerComponent,
+} from '../../../../../libs/ui/map/src'
 import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
 import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
-import { FeatureMapModule } from '../../../../../libs/feature/map/src'
+import {
+  FeatureMapModule,
+  MapStateContainerComponent,
+} from '../../../../../libs/feature/map/src'
 import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { UiElementsModule } from '../../../../../libs/ui/elements/src'
 import { MdViewFacade } from './state'
@@ -43,7 +49,6 @@ import { DataViewShareComponent } from './data-view-share/data-view-share.compon
     UiLayoutModule,
     FeatureMapModule,
     FeatureCatalogModule,
-    UiMapModule,
     UiInputsModule,
     UiElementsModule,
     MatTabsModule,
@@ -53,6 +58,9 @@ import { DataViewShareComponent } from './data-view-share/data-view-share.compon
     TableComponent,
     FeatureDatavizModule,
     PopupAlertComponent,
+    FeatureDetailComponent,
+    MapStateContainerComponent,
+    MapContainerComponent,
   ],
   providers: [MdViewFacade],
   exports: [

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

@@ -10,17 +10,17 @@
     <gn-ui-external-viewer-button
       class="shrink-0 py-1 place-self-end"
       [link]="selectedLink$ | async"
-      [mapConfig]="mapConfig"
     >
     </gn-ui-external-viewer-button>
   </div>
   <div
     class="relative w-full h-full bg-white border border-gray-300 rounded-lg overflow-hidden"
   >
-    <gn-ui-map-context
+    <gn-ui-map-container
+      #mapContainer
       [context]="mapContext$ | async"
-      [mapConfig]="mapConfig"
-    ></gn-ui-map-context>
+      (featuresClick)="onMapFeatureSelect($event)"
+    ></gn-ui-map-container>
     <div
       class="top-[1em] right-[1em] p-3 bg-white absolute overflow-y-auto overflow-x-hidden max-h-72 w-56"
       [class.hidden]="!selection"

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

@@ -1,31 +1,19 @@
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
-  OnDestroy,
-  OnInit,
+  ViewChild,
 } from '@angular/core'
-import {
-  FeatureInfoService,
-  MapContextLayerModel,
-  MapContextLayerTypeEnum,
-  MapContextModel,
-  MapManagerService,
-  MapStyleService,
-  MapUtilsService,
-} from '../../../../../../libs/feature/map/src'
-import { getOptionalMapConfig, MapConfig } from '../../../../../../libs/util/app-config/src'
+import { MapUtilsService } from '../../../../../../libs/feature/map/src'
 import { getLinkLabel } from '../../../../../../libs/util/shared/src'
-import Feature from 'ol/Feature'
-import { Geometry } from 'ol/geom'
-import { StyleLike } from 'ol/style/Style'
 import {
   BehaviorSubject,
   combineLatest,
   from,
   Observable,
   of,
-  Subscription,
+  startWith,
   throwError,
   withLatestFrom,
 } from 'rxjs'
@@ -34,13 +22,22 @@ import {
   distinctUntilChanged,
   finalize,
   map,
-  startWith,
   switchMap,
   tap,
 } from 'rxjs/operators'
 import { MdViewFacade } from '../state/mdview.facade'
 import { DataService } from '../../../../../../libs/feature/dataviz/src'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  createViewFromLayer,
+  MapContext,
+  MapContextLayer,
+} from '@geospatial-sdk/core'
+import {
+  MapContainerComponent,
+  prioritizePageScroll,
+} from '../../../../../../libs/ui/map/src'
+import { Feature } from 'geojson'
 
 @Component({
   selector: 'gn-ui-map-view',
@@ -48,11 +45,10 @@ import { DatasetDistribution } from '../../../../../../libs/common/domain/src/li
   styleUrls: ['./map-view.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MapViewComponent implements OnInit, OnDestroy {
-  mapConfig: MapConfig = getOptionalMapConfig()
-  selection: Feature<Geometry>
-  private subscription = new Subscription()
-  private selectionStyle: StyleLike
+export class MapViewComponent implements AfterViewInit {
+  @ViewChild('mapContainer') mapContainer: MapContainerComponent
+
+  selection: Feature
 
   compatibleMapLinks$ = combineLatest([
     this.mdViewFacade.mapApiLinks$,
@@ -102,93 +98,70 @@ export class MapViewComponent implements OnInit, OnDestroy {
     })
   )
 
-  mapContext$ = this.currentLayers$.pipe(
+  mapContext$: Observable<MapContext> = this.currentLayers$.pipe(
     switchMap((layers) =>
-      from(this.mapUtils.getLayerExtent(layers[0])).pipe(
-        catchError(() => {
-          this.error = 'The layer has no extent'
-          return of(undefined)
-        }),
-        map(
-          (extent) =>
-            ({
-              layers,
-              view: {
-                extent,
-              },
-            } as MapContextModel)
-        ),
-        tap((res) => {
+      from(createViewFromLayer(layers[0])).pipe(
+        catchError(() => of(null)), // could not zoom on the layer: use the record extent
+        map((view) => ({
+          layers,
+          view,
+        })),
+        tap(() => {
           this.resetSelection()
         })
       )
     ),
     startWith({
       layers: [],
-      view: {},
-    } as MapContextModel),
+      view: null,
+    }),
     withLatestFrom(this.mdViewFacade.metadata$),
     map(([context, metadata]) => {
-      if (context.view.extent) return context
+      if (context.view) return context
       const extent = this.mapUtils.getRecordExtent(metadata)
+      const view = extent ? { extent } : null
       return {
         ...context,
-        view: {
-          ...context.view,
-          extent,
-        },
+        view,
       }
     })
   )
 
   constructor(
     private mdViewFacade: MdViewFacade,
-    private mapManager: MapManagerService,
     private mapUtils: MapUtilsService,
     private dataService: DataService,
-    private featureInfo: FeatureInfoService,
-    private changeRef: ChangeDetectorRef,
-    private styleService: MapStyleService
+    private changeRef: ChangeDetectorRef
   ) {}
 
-  ngOnDestroy(): void {
-    this.subscription.unsubscribe()
-  }
-
-  ngOnInit(): void {
-    this.mapUtils.prioritizePageScroll(this.mapManager.map.getInteractions())
-    this.selectionStyle = this.styleService.styles.defaultHL
-    this.featureInfo.handleFeatureInfo()
-    this.subscription.add(
-      this.featureInfo.features$.subscribe((features) => {
-        this.onMapFeatureSelect(features)
-      })
-    )
+  async ngAfterViewInit() {
+    const map = await this.mapContainer.openlayersMap
+    prioritizePageScroll(map.getInteractions())
   }
 
-  onMapFeatureSelect(features: Feature<Geometry>[]): void {
+  onMapFeatureSelect(features: Feature[]): void {
     this.resetSelection()
     this.selection = features?.length > 0 && features[0]
     if (this.selection) {
-      this.selection.setStyle(this.selectionStyle)
+      // FIXME: restore styling of selected feature
+      // this.selection.setStyle(this.selectionStyle)
     }
     this.changeRef.detectChanges()
   }
 
   resetSelection(): void {
     if (this.selection) {
-      this.selection.setStyle(null)
+      // FIXME: restore styling of selected feature
+      // this.selection.setStyle(null)
     }
     this.selection = null
   }
 
-  getLayerFromLink(
-    link: DatasetDistribution
-  ): Observable<MapContextLayerModel> {
+  getLayerFromLink(link: DatasetOnlineResource): Observable<MapContextLayer> {
     if (link.type === 'service' && link.accessServiceProtocol === 'wms') {
       return of({
         url: link.url.toString(),
-        type: MapContextLayerTypeEnum.WMS,
+        type: 'wms',
         name: link.name,
       })
     } else if (
@@ -197,7 +170,7 @@ export class MapViewComponent implements OnInit, OnDestroy {
     ) {
       return of({
         url: link.url.toString(),
-        type: MapContextLayerTypeEnum.WMTS,
+        type: 'wmts',
         name: link.name,
       })
     } else if (
@@ -209,7 +182,7 @@ export class MapViewComponent implements OnInit, OnDestroy {
     ) {
       return this.dataService.readAsGeoJson(link).pipe(
         map((data) => ({
-          type: MapContextLayerTypeEnum.GEOJSON,
+          type: 'geojson',
           data,
         }))
       )

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -63,7 +63,11 @@ export class MdViewFacade {
   chartConfig$ = this.store.pipe(select(MdViewSelectors.getChartConfig))
 
   allLinks$ = this.metadata$.pipe(
-    map((record) => ('distributions' in record ? record.distributions : []))
+    map((record) =>
+      record.kind === 'dataset' && 'onlineResources' in record
+        ? record.onlineResources
+        : []
+    )
   )
 
   apiLinks$ = this.allLinks$.pipe(

package/src/libs/feature/router/src/lib/default/state/router.facade.ts

@@ -3,7 +3,7 @@ import { MdViewActions } from '../../../../../../../libs/feature/record/src'
 import { RouterService } from '../router.service'
 import { RouterReducerState } from '@ngrx/router-store'
 import { select, Store } from '@ngrx/store'
-import { distinctUntilChanged, filter, map, take, tap } from 'rxjs/operators'
+import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'
 import {
   ROUTER_ROUTE_DATASET,
   ROUTER_ROUTE_SEARCH,

package/src/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.html

@@ -6,6 +6,7 @@
   (inputSubmitted)="handleInputSubmission($event)"
   (inputCleared)="handleInputCleared()"
   [value]="searchInputValue$ | async"
-  [clearOnSelection]="true"
+  [preventCompleteOnSelection]="true"
   [autoFocus]="autoFocus"
+  [allowSubmit]="true"
 ></gn-ui-autocomplete>