geonetwork-ui 2.4.0-dev.6c8dcba0 → 2.4.0-dev.6f312e64

package/src/libs/feature/editor/src/lib/models/editor-config.model.ts

@@ -0,0 +1,62 @@
+import { CatalogRecordKeys } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+// Expressions should be enclosed in `${}` to be recognized as such
+// eg. ${dateNow()}
+export type EditorFieldExpression = `$\{${string}}`
+
+export type EditorFieldValue = string | number | boolean | unknown
+
+export interface FormFieldConfig {
+  labelKey?: string
+  hintKey?: string
+  tooltipKey?: string
+  required?: boolean
+  locked?: boolean
+  invalid?: boolean
+  invalidHintKey?: string
+}
+
+// Specifiers let us use specific components
+// This is used for instance to target only certain online resources in a field
+type OnlineLinkResourceSpecifier = `onlineResourceType:link`
+type DatasetDistributionsSpecifier = `onlineResourceType:!link`
+export type FieldModelSpecifier =
+  | OnlineLinkResourceSpecifier
+  | DatasetDistributionsSpecifier
+
+export interface EditorField {
+  // configuration of the form field used as presentation
+  formFieldConfig: FormFieldConfig
+
+  // name of the target field in the record; will not change the record directly if not defined
+  model?: CatalogRecordKeys
+  modelSpecifier?: FieldModelSpecifier
+
+  // a hidden field won't show but can still be used to modify the record
+  // FIXME: currently this is redundant with an absence of formFieldConfig but necessary for clarity
+  hidden?: boolean
+
+  // the result of this expression will replace the field value on save
+  onSaveProcess?: EditorFieldExpression
+}
+
+export interface EditorSection {
+  labelKey?: string
+  descriptionKey?: string
+  hidden: boolean
+  fields: EditorField[]
+}
+
+export interface EditorFieldPage {
+  labelKey?: string
+  sections: EditorSection[]
+}
+
+export interface EditorConfig {
+  pages: EditorFieldPage[]
+}
+
+export interface EditorFieldState {
+  model: string
+  value: EditorFieldValue
+}

package/src/libs/feature/editor/src/lib/models/index.ts

@@ -1,2 +1,3 @@
 export * from './wizard-field.model'
 export * from './wizard-field.type'
+export * from './editor-config.model'

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

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core'
-import { Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
+import { Observable, switchMap } from 'rxjs'
+import { map, tap } from 'rxjs/operators'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { EditorFieldsConfig } from '../models/fields.model'
+import { EditorConfig } from '../models/'
 import { evaluate } from '../expressions'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
@@ -15,23 +15,41 @@ export class EditorService {
   // returns the record as it was when saved, alongside its source
   saveRecord(
     record: CatalogRecord,
-    fieldsConfig: EditorFieldsConfig
+    fieldsConfig: EditorConfig,
+    generateNewUniqueIdentifier = false
   ): Observable<[CatalogRecord, string]> {
     const savedRecord = { ...record }
 
+    const fields = fieldsConfig.pages.flatMap((page) =>
+      page.sections.flatMap((section) => section.fields)
+    )
+
     // run onSave processes
-    for (const field of fieldsConfig) {
+    for (const field of fields) {
       if (field.onSaveProcess && field.model) {
         const evaluator = evaluate(field.onSaveProcess)
         savedRecord[field.model] = evaluator({
-          config: field,
+          model: field.model,
           value: record[field.model],
         })
       }
     }
-    return this.recordsRepository
-      .saveRecord(savedRecord)
-      .pipe(map((recordSource) => [savedRecord, recordSource]))
+
+    // if we want a new unique identifier, clear the existing one
+    if (generateNewUniqueIdentifier) {
+      savedRecord.uniqueIdentifier = null
+    }
+
+    return this.recordsRepository.saveRecord(savedRecord).pipe(
+      switchMap((uniqueIdentifier) =>
+        this.recordsRepository.openRecordForEdition(uniqueIdentifier)
+      ),
+      tap(() => {
+        // if saving was successful, the original draft can be discarded
+        this.recordsRepository.clearRecordDraft(record.uniqueIdentifier)
+      }),
+      map(([record, recordSource]) => [record, recordSource])
+    )
   }
 
   // emits and completes once saving is done
@@ -41,4 +59,11 @@ export class EditorService {
       .saveRecordAsDraft(record)
       .pipe(map(() => undefined))
   }
+
+  undoRecordDraft(
+    record: CatalogRecord
+  ): Observable<[CatalogRecord, string, boolean]> {
+    this.recordsRepository.clearRecordDraft(record.uniqueIdentifier)
+    return this.recordsRepository.openRecordForEdition(record.uniqueIdentifier)
+  }
 }

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

@@ -1,5 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'
 import {
+  FeatureSearchModule,
   FIELDS_BRIEF,
   SearchFacade,
   SearchService,
@@ -15,6 +16,7 @@ import { AddLayerRecordPreviewComponent } from './add-layer-record-preview/add-l
   templateUrl: './add-layer-from-catalog.component.html',
   styleUrls: ['./add-layer-from-catalog.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
   providers: [
     SearchFacade,
     SearchService,
@@ -30,6 +32,7 @@ import { AddLayerRecordPreviewComponent } from './add-layer-record-preview/add-l
       },
     },
   ],
+  imports: [FeatureSearchModule],
 })
 export class AddLayerFromCatalogComponent implements OnInit {
   constructor(private searchFacade: SearchFacade) {}

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

@@ -6,7 +6,6 @@ import {
   LinkUsage,
 } from '../../../../../../../libs/util/shared/src'
 import { Observable, of, throwError } from 'rxjs'
-import { map } from 'rxjs/operators'
 import { MapUtilsService } from '../../utils'
 import { MapFacade } from '../../+state/map.facade'
 import {
@@ -14,21 +13,26 @@ import {
   MapContextLayerTypeEnum,
 } from '../../map-context/map-context.model'
 import {
-  DatasetDistribution,
+  DatasetOnlineResource,
   DatasetRecord,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { ThumbnailComponent } from '../../../../../../../libs/ui/elements/src'
+import { ButtonComponent } from '../../../../../../../libs/ui/inputs/src'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-add-layer-record-preview',
   templateUrl: './add-layer-record-preview.component.html',
   styleUrls: ['./add-layer-record-preview.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [ThumbnailComponent, ButtonComponent, CommonModule],
 })
 export class AddLayerRecordPreviewComponent extends RecordPreviewComponent {
-  get mapLinks(): DatasetDistribution[] {
-    return (this.record as DatasetRecord).distributions.filter((link) =>
+  get mapLinks(): DatasetOnlineResource[] {
+    return (this.record as DatasetRecord).onlineResources.filter((link) =>
       this.linkClassifier.hasUsage(link, LinkUsage.MAP_API)
-    ) as DatasetDistribution[]
+    ) as DatasetOnlineResource[]
   }
 
   constructor(
@@ -40,13 +44,13 @@ export class AddLayerRecordPreviewComponent extends RecordPreviewComponent {
     super(elementRef)
   }
 
-  async handleLinkClick(link: DatasetDistribution) {
+  async handleLinkClick(link: DatasetOnlineResource) {
     const layer = await this.getLayerFromLink(link).toPromise()
     this.mapFacade.addLayer({ ...layer, title: this.record.title })
   }
 
   getLayerFromLink(
-    link: DatasetDistribution
+    link: DatasetOnlineResource
   ): Observable<MapContextLayerModel> {
     if (link.type !== 'service')
       return throwError(
@@ -68,7 +72,7 @@ export class AddLayerRecordPreviewComponent extends RecordPreviewComponent {
     return throwError(() => 'protocol not supported')
   }
 
-  getLinkLabel(link: DatasetDistribution) {
+  getLinkLabel(link: DatasetOnlineResource) {
     return getLinkLabel(link)
   }
 }

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

@@ -1,6 +1,9 @@
 import { ChangeDetectorRef, Component } from '@angular/core'
 import { MapContextLayerModel } from '../map-context/map-context.model'
 import { MapFacade } from '../+state/map.facade'
+import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
+import { TranslateModule } from '@ngx-translate/core'
+import { CommonModule } from '@angular/common'
 
 const INVALID_FILE_FORMAT_ERROR_MESSAGE = 'Invalid file format'
 
@@ -8,6 +11,8 @@ const INVALID_FILE_FORMAT_ERROR_MESSAGE = 'Invalid file format'
   selector: 'gn-ui-add-layer-from-file',
   templateUrl: './add-layer-from-file.component.html',
   styleUrls: ['./add-layer-from-file.component.css'],
+  standalone: true,
+  imports: [UiInputsModule, TranslateModule, CommonModule],
 })
 export class AddLayerFromFileComponent {
   errorMessage: string | null = null

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

@@ -2,7 +2,7 @@
   <gn-ui-text-input
     [(value)]="ogcUrl"
     (valueChange)="urlChange.next($event)"
-    [hint]="'map.ogc.urlInput.hint' | translate"
+    [placeholder]="'map.ogc.urlInput.hint' | translate"
     class="w-96"
   ></gn-ui-text-input>
 </div>

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

@@ -1,20 +1,23 @@
 import {
+  ChangeDetectorRef,
   Component,
-  OnInit,
-  Output,
   EventEmitter,
-  ChangeDetectionStrategy,
   Input,
-  ChangeDetectorRef,
+  OnInit,
+  Output,
 } from '@angular/core'
 import { OgcApiEndpoint } from '@camptocamp/ogc-client'
-import { Subject, debounceTime } from 'rxjs'
+import { debounceTime, Subject } from 'rxjs'
 import {
   MapContextLayerModel,
   MapContextLayerTypeEnum,
 } from '../map-context/map-context.model'
 import { TranslateModule } from '@ngx-translate/core'
-import { DropdownChoice, UiInputsModule } from '../../../../../../libs/ui/inputs/src'
+import {
+  DropdownChoice,
+  TextInputComponent,
+  UiInputsModule,
+} from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { MapLayer } from '../+state/map.models'
 
@@ -23,7 +26,7 @@ import { MapLayer } from '../+state/map.models'
   templateUrl: './add-layer-from-ogc-api.component.html',
   styleUrls: ['./add-layer-from-ogc-api.component.css'],
   standalone: true,
-  imports: [CommonModule, TranslateModule, UiInputsModule],
+  imports: [CommonModule, TranslateModule, UiInputsModule, TextInputComponent],
 })
 export class AddLayerFromOgcApiComponent implements OnInit {
   @Input() ogcUrl: string

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

@@ -2,7 +2,7 @@
   <gn-ui-text-input
     [(value)]="wfsUrl"
     (valueChange)="urlChange.next($event)"
-    [hint]="'map.wfs.urlInput.hint' | translate"
+    [placeholder]="'map.wfs.urlInput.hint' | translate"
     class="w-96"
   >
   </gn-ui-text-input>

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

@@ -7,11 +7,16 @@ import {
 } from '../map-context/map-context.model'
 import { MapFacade } from '../+state/map.facade'
 import { debounceTime } from 'rxjs/operators'
+import { ButtonComponent, TextInputComponent } from '../../../../../../libs/ui/inputs/src'
+import { TranslateModule } from '@ngx-translate/core'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-add-layer-from-wfs',
   templateUrl: './add-layer-from-wfs.component.html',
   styleUrls: ['./add-layer-from-wfs.component.css'],
+  standalone: true,
+  imports: [TextInputComponent, ButtonComponent, TranslateModule, CommonModule],
 })
 export class AddLayerFromWfsComponent implements OnInit {
   wfsUrl = ''

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

@@ -2,7 +2,7 @@
   <gn-ui-text-input
     [(value)]="wmsUrl"
     (valueChange)="urlChange.next($event)"
-    [hint]="'map.wms.urlInput.hint' | translate"
+    [placeholder]="'map.wms.urlInput.hint' | translate"
     class="w-96"
   >
   </gn-ui-text-input>

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

@@ -1,4 +1,4 @@
-import { Component, ChangeDetectorRef, OnInit } from '@angular/core'
+import { ChangeDetectorRef, Component, OnInit } from '@angular/core'
 import { WmsEndpoint, WmsLayerSummary } from '@camptocamp/ogc-client'
 import { MapFacade } from '../+state/map.facade'
 import {
@@ -7,11 +7,16 @@ import {
 } from '../map-context/map-context.model'
 import { Subject } from 'rxjs'
 import { debounceTime } from 'rxjs/operators'
+import { ButtonComponent, TextInputComponent } from '../../../../../../libs/ui/inputs/src'
+import { CommonModule } from '@angular/common'
+import { TranslateModule } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-add-layer-from-wms',
   templateUrl: './add-layer-from-wms.component.html',
   styleUrls: ['./add-layer-from-wms.component.css'],
+  standalone: true,
+  imports: [TextInputComponent, CommonModule, TranslateModule, ButtonComponent],
 })
 export class AddLayerFromWmsComponent implements OnInit {
   wmsUrl = ''

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

@@ -4,12 +4,10 @@ import { UiMapModule } from '../../../../../libs/ui/map/src'
 import { defaultMapOptions, FEATURE_MAP_OPTIONS } from './constant'
 import { MapInstanceDirective } from './manager/map-instance.directive'
 import { MapContextComponent } from './map-context/component/map-context.component'
-import { LayersPanelComponent } from './layers-panel/layers-panel.component'
 import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
 import { MatIconModule } from '@angular/material/icon'
 import { MatTabsModule } from '@angular/material/tabs'
 import { TranslateModule } from '@ngx-translate/core'
-import { AddLayerFromCatalogComponent } from './add-layer-from-catalog/add-layer-from-catalog.component'
 import { FeatureSearchModule } from '../../../../../libs/feature/search/src'
 import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
@@ -17,12 +15,8 @@ import * as fromMap from './+state/map.reducer'
 import { MapEffects } from './+state/map.effects'
 import { MapFacade } from './+state/map.facade'
 import { MapContainerComponent } from './map-container/map-container.component'
-import { AddLayerRecordPreviewComponent } from './add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component'
 import { UiElementsModule } from '../../../../../libs/ui/elements/src'
-import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
-import { AddLayerFromWmsComponent } from './add-layer-from-wms/add-layer-from-wms.component'
-import { AddLayerFromFileComponent } from './add-layer-from-file/add-layer-from-file.component'
-import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wfs.component'
+import { TextInputComponent, UiInputsModule } from '../../../../../libs/ui/inputs/src'
 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'
@@ -31,20 +25,12 @@ import { AddLayerFromOgcApiComponent } from './add-layer-from-ogc-api/add-layer-
   declarations: [
     MapContextComponent,
     MapInstanceDirective,
-    LayersPanelComponent,
-    AddLayerFromCatalogComponent,
     MapContainerComponent,
-    AddLayerRecordPreviewComponent,
-    AddLayerFromWmsComponent,
-    AddLayerFromFileComponent,
-    AddLayerFromWfsComponent,
     GeocodingComponent,
   ],
   exports: [
     MapContextComponent,
     MapInstanceDirective,
-    LayersPanelComponent,
-    AddLayerFromCatalogComponent,
     MapContainerComponent,
     GeocodingComponent,
   ],
@@ -61,6 +47,7 @@ import { AddLayerFromOgcApiComponent } from './add-layer-from-ogc-api/add-layer-
     UiElementsModule,
     UiInputsModule,
     AddLayerFromOgcApiComponent,
+    TextInputComponent,
   ],
   providers: [
     {

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

@@ -1,11 +1,34 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { MapFacade } from '../+state/map.facade'
+import { MatIconModule } from '@angular/material/icon'
+import { UiLayoutModule } from '../../../../../../libs/ui/layout/src'
+import { MatTabsModule } from '@angular/material/tabs'
+import { AddLayerFromOgcApiComponent } from '../add-layer-from-ogc-api/add-layer-from-ogc-api.component'
+import { AddLayerFromWfsComponent } from '../add-layer-from-wfs/add-layer-from-wfs.component'
+import { AddLayerFromWmsComponent } from '../add-layer-from-wms/add-layer-from-wms.component'
+import { AddLayerFromCatalogComponent } from '../add-layer-from-catalog/add-layer-from-catalog.component'
+import { AddLayerFromFileComponent } from '../add-layer-from-file/add-layer-from-file.component'
+import { TranslateModule } from '@ngx-translate/core'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-layers-panel',
   templateUrl: './layers-panel.component.html',
   styleUrls: ['./layers-panel.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    MatIconModule,
+    UiLayoutModule,
+    MatTabsModule,
+    AddLayerFromOgcApiComponent,
+    AddLayerFromWfsComponent,
+    AddLayerFromWmsComponent,
+    AddLayerFromCatalogComponent,
+    AddLayerFromFileComponent,
+    TranslateModule,
+    CommonModule,
+  ],
 })
 export class LayersPanelComponent {
   layers$ = this.mapFacade.layers$

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

@@ -1,4 +1,4 @@
-import { FEATURE_COLLECTION_POLYGON_FIXTURE_4326 } from '../../../../../../libs/common/fixtures/src'
+import { polygonFeatureCollectionFixture } from '../../../../../../libs/common/fixtures/src'
 import { Extent } from 'ol/extent'
 import {
   MapContextLayerGeojsonModel,
@@ -8,44 +8,48 @@ import {
   MapContextViewModel,
 } from '../map-context/map-context.model'
 
-export const MAP_CTX_LAYER_XYZ_FIXTURE: MapContextLayerModel = {
+export const mapCtxLayerXyzFixture = (): MapContextLayerModel => ({
   type: MapContextLayerTypeEnum.XYZ,
   url: 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-}
-export const MAP_CTX_LAYER_WMS_FIXTURE: MapContextLayerModel = {
+})
+
+export const mapCtxLayerWmsFixture = (): MapContextLayerModel => ({
   type: MapContextLayerTypeEnum.WMS,
   url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WMS',
   name: 'commune_actuelle_3857',
-}
-export const MAP_CTX_LAYER_WFS_FIXTURE: MapContextLayerModel = {
+})
+
+export const mapCtxLayerWfsFixture = (): MapContextLayerModel => ({
   type: MapContextLayerTypeEnum.WFS,
   url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WFS&VERSION=1.1.0',
   name: 'ms:commune_actuelle_3857',
-}
-export const MAP_CTX_LAYER_GEOJSON_FIXTURE: MapContextLayerGeojsonModel = {
+})
+
+export const mapCtxLayerGeojsonFixture = (): MapContextLayerGeojsonModel => ({
   type: MapContextLayerTypeEnum.GEOJSON,
-  data: FEATURE_COLLECTION_POLYGON_FIXTURE_4326,
-}
-export const MAP_CTX_LAYER_GEOJSON_REMOTE_FIXTURE: MapContextLayerGeojsonModel =
-  {
+  data: polygonFeatureCollectionFixture(),
+})
+
+export const mapCtxLayerGeojsonRemoteFixture =
+  (): MapContextLayerGeojsonModel => ({
     type: MapContextLayerTypeEnum.GEOJSON,
     url: 'https://my.host.com/data/regions.json',
-  }
+  })
 
-export const MAP_CTX_VIEW_FIXTURE: MapContextViewModel = {
+export const mapCtxViewFixture = (): MapContextViewModel => ({
   center: [7.75, 48.6],
   zoom: 9,
-}
+})
 
-export const MAP_CTX_FIXTURE: MapContextModel = {
+export const mapCtxFixture = (): MapContextModel => ({
   layers: [
-    MAP_CTX_LAYER_XYZ_FIXTURE,
-    MAP_CTX_LAYER_WMS_FIXTURE,
-    MAP_CTX_LAYER_GEOJSON_FIXTURE,
+    mapCtxLayerXyzFixture(),
+    mapCtxLayerWmsFixture(),
+    mapCtxLayerGeojsonFixture(),
   ],
-  view: MAP_CTX_VIEW_FIXTURE,
-}
+  view: mapCtxViewFixture(),
+})
 
-export const MAP_CTX_EXTENT_FIXTURE: Extent = [
+export const mapCtxExtentFixture = (): Extent => [
   171083.69713494915, 6246047.945419401, 476970.39956295764, 6631079.362882684,
 ]

package/src/libs/feature/map/src/lib/style/map-style.fixtures.ts

@@ -4,42 +4,44 @@ const colorPrimary = 'blue'
 const colorSecondary = 'red'
 const colorStroke = 'white'
 
-export const DEFAULT_STYLE_FIXTURE = new Style({
-  image: new Circle({
+export const defaultMapStyleFixture = (): Style =>
+  new Style({
+    image: new Circle({
+      fill: new Fill({
+        color: colorPrimary,
+      }),
+      stroke: new Stroke({
+        color: colorStroke,
+        width: 2,
+      }),
+      radius: 5,
+    }),
     fill: new Fill({
-      color: colorPrimary,
+      color: 'rgba(0,0,255,0.25)',
     }),
     stroke: new Stroke({
       color: colorStroke,
       width: 2,
     }),
-    radius: 5,
-  }),
-  fill: new Fill({
-    color: 'rgba(0,0,255,0.25)',
-  }),
-  stroke: new Stroke({
-    color: colorStroke,
-    width: 2,
-  }),
-})
+  })
 
-export const DEFAULT_STYLE_HL_FIXTURE = new Style({
-  image: new Circle({
+export const defaultMapStyleHlFixture = (): Style =>
+  new Style({
+    image: new Circle({
+      fill: new Fill({
+        color: colorSecondary,
+      }),
+      stroke: new Stroke({
+        color: colorStroke,
+        width: 3,
+      }),
+      radius: 6,
+    }),
     fill: new Fill({
-      color: colorSecondary,
+      color: 'rgba(255,0,0,0.25)',
     }),
     stroke: new Stroke({
-      color: colorStroke,
+      color: colorSecondary,
       width: 3,
     }),
-    radius: 6,
-  }),
-  fill: new Fill({
-    color: 'rgba(255,0,0,0.25)',
-  }),
-  stroke: new Stroke({
-    color: colorSecondary,
-    width: 3,
-  }),
-})
+  })

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

@@ -32,7 +32,7 @@ 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 proj4 from 'proj4'
 import { defaults as defaultControls } from 'ol/control/defaults'
 
 const FEATURE_PROJECTION = 'EPSG:3857'
@@ -220,11 +220,15 @@ export class MapUtilsService {
     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]
     )

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)
   }