geonetwork-ui 2.3.0-dev.ff2a9db7 → 2.3.0

package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts

@@ -4,6 +4,9 @@ import {
   DatasetRecord,
   ServiceRecord,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { XmlElement } from '@rgrove/parse-xml'
+import { BaseConverter } from '../base.converter'
+import { isEqual } from '../convert-utils'
 import {
   createDocument,
   createElement,
@@ -11,32 +14,6 @@ import {
   parseXmlString,
   xmlToString,
 } from '../xml-utils'
-import {
-  writeAbstract,
-  writeContacts,
-  writeContactsForResource,
-  writeDistributions,
-  writeGraphicOverviews,
-  writeKeywords,
-  writeKind,
-  writeLegalConstraints,
-  writeLicenses,
-  writeLineage,
-  writeOnlineResources,
-  writeOtherConstraints,
-  writeOwnerOrganization,
-  writeRecordUpdated,
-  writeResourceCreated,
-  writeResourcePublished,
-  writeResourceUpdated,
-  writeSecurityConstraints,
-  writeSpatialRepresentation,
-  writeStatus,
-  writeTitle,
-  writeTopics,
-  writeUniqueIdentifier,
-  writeUpdateFrequency,
-} from './write-parts'
 import {
   readAbstract,
   readContacts,
@@ -59,13 +36,38 @@ import {
   readSecurityConstraints,
   readSpatialRepresentation,
   readStatus,
+  readTemporalExtents,
   readTitle,
   readUniqueIdentifier,
   readUpdateFrequency,
 } from './read-parts'
-import { isEqual } from '../convert-utils'
-import { BaseConverter } from '../base.converter'
-import { XmlElement } from '@rgrove/parse-xml'
+import {
+  writeAbstract,
+  writeContacts,
+  writeContactsForResource,
+  writeDistributions,
+  writeGraphicOverviews,
+  writeKeywords,
+  writeKind,
+  writeLegalConstraints,
+  writeLicenses,
+  writeLineage,
+  writeOnlineResources,
+  writeOtherConstraints,
+  writeOwnerOrganization,
+  writeRecordUpdated,
+  writeResourceCreated,
+  writeResourcePublished,
+  writeResourceUpdated,
+  writeSecurityConstraints,
+  writeSpatialRepresentation,
+  writeStatus,
+  writeTemporalExtents,
+  writeTitle,
+  writeTopics,
+  writeUniqueIdentifier,
+  writeUpdateFrequency,
+} from './write-parts'
 
 export class Iso19139Converter extends BaseConverter<string> {
   protected readers: Record<
@@ -98,9 +100,9 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: readLineage,
     distributions: readDistributions,
     onlineResources: readOnlineResources,
+    temporalExtents: readTemporalExtents,
     // TODO
     spatialExtents: () => [],
-    temporalExtents: () => [],
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => [],
@@ -136,9 +138,9 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: writeLineage,
     distributions: writeDistributions,
     onlineResources: writeOnlineResources,
+    temporalExtents: writeTemporalExtents,
     // TODO
     spatialExtents: () => undefined,
-    temporalExtents: () => undefined,
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => undefined,
@@ -311,6 +313,8 @@ export class Iso19139Converter extends BaseConverter<string> {
       fieldChanged('spatialRepresentation') &&
         this.writers['spatialRepresentation'](record, rootEl)
       fieldChanged('overviews') && this.writers['overviews'](record, rootEl)
+      fieldChanged('temporalExtents') &&
+        this.writers['temporalExtents'](record, rootEl)
       fieldChanged('distributions') &&
         this.writers['distributions'](record, rootEl)
       fieldChanged('lineage') && this.writers['lineage'](record, rootEl)

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -14,18 +14,7 @@ import {
   UpdateFrequency,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { getStatusFromStatusCode } from './utils/status.mapper'
-import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
-import {
-  findChildElement,
-  findChildrenElement,
-  findNestedElement,
-  findNestedElements,
-  findParent,
-  readAttribute,
-  readText,
-  XmlElement,
-} from '../xml-utils'
+import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
 import {
   ChainableFunction,
   combine,
@@ -37,10 +26,21 @@ import {
   mapArray,
   pipe,
 } from '../function-utils'
-import { getRoleFromRoleCode } from './utils/role.mapper'
-import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
-import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
+import {
+  XmlElement,
+  findChildElement,
+  findChildrenElement,
+  findNestedElement,
+  findNestedElements,
+  findParent,
+  readAttribute,
+  readText,
+} from '../xml-utils'
 import { fullNameToParts } from './utils/individual-name'
+import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
+import { getRoleFromRoleCode } from './utils/role.mapper'
+import { getStatusFromStatusCode } from './utils/status.mapper'
+import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
 
 export function extractCharacterString(): ChainableFunction<
   XmlElement,
@@ -843,3 +843,55 @@ export function readOnlineResources(
     flattenArray()
   )(rootEl)
 }
+
+export function readTemporalExtents(rootEl: XmlElement) {
+  return pipe(
+    findIdentification(),
+    findNestedElements('gmd:extent', 'gmd:EX_Extent', 'gmd:temporalElement'),
+    mapArray(
+      combine(
+        findNestedElement(
+          'gmd:EX_TemporalExtent',
+          'gmd:extent',
+          'gml:TimePeriod'
+        ),
+        findNestedElement(
+          'gmd:EX_TemporalExtent',
+          'gmd:extent',
+          'gml:TimeInstant'
+        )
+      )
+    ),
+    mapArray(([periodEl, instantEl]) => {
+      if (periodEl) {
+        return pipe(
+          combine(
+            pipe(
+              findChildElement('gml:beginPosition', false),
+              readText(),
+              map((dateStr) => (dateStr ? new Date(dateStr) : null))
+            ),
+            pipe(
+              findChildElement('gml:endPosition', false),
+              readText(),
+              map((dateStr) => (dateStr ? new Date(dateStr) : null))
+            )
+          ),
+          map(([start, end]) => ({
+            start,
+            end,
+          }))
+        )(periodEl)
+      } else {
+        return pipe(
+          findChildElement('gml:timePosition', false),
+          readText(),
+          map((dateStr) => (dateStr ? new Date(dateStr) : null)),
+          map((date) => ({
+            start: date,
+          }))
+        )(instantEl)
+      }
+    })
+  )(rootEl)
+}

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -15,7 +15,20 @@ import {
   UpdateFrequencyCode,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import format from 'date-fns/format'
+import {
+  ChainableFunction,
+  fallback,
+  filterArray,
+  getAtIndex,
+  map,
+  mapArray,
+  noop,
+  pipe,
+  tap,
+} from '../function-utils'
 import {
+  XmlElement,
   addAttribute,
   appendChildren,
   createChild,
@@ -30,20 +43,7 @@ import {
   removeChildren,
   removeChildrenByName,
   setTextContent,
-  XmlElement,
 } from '../xml-utils'
-import {
-  ChainableFunction,
-  fallback,
-  filterArray,
-  getAtIndex,
-  map,
-  mapArray,
-  noop,
-  pipe,
-  tap,
-} from '../function-utils'
-import format from 'date-fns/format'
 import { readKind } from './read-parts'
 import { namePartsToFull } from './utils/individual-name'
 
@@ -1126,3 +1126,61 @@ export function writeOnlineResources(
     appendChildren(...record.onlineResources.map(createOnlineResource))
   )(rootEl)
 }
+
+export function writeTemporalExtents(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  pipe(
+    findOrCreateIdentification(),
+    findNestedChildOrCreate('gmd:extent', 'gmd:EX_Extent'),
+    removeChildrenByName('gmd:temporalElement'),
+    appendChildren(
+      ...record.temporalExtents.map((extent) =>
+        pipe(
+          createElement('gmd:temporalElement'),
+          createChild('gmd:EX_TemporalExtent'),
+          appendChildren(
+            'start' in extent && 'end' in extent
+              ? pipe(
+                  createElement('gmd:extent'),
+                  createChild('gml:TimePeriod'),
+                  appendChildren(
+                    pipe(
+                      createElement('gml:beginPosition'),
+                      pipe(
+                        extent.start
+                          ? setTextContent(format(extent.start, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    ),
+                    pipe(
+                      createElement('gml:endPosition'),
+                      pipe(
+                        extent.end
+                          ? setTextContent(format(extent.end, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    )
+                  )
+                )
+              : pipe(
+                  createElement('gmd:extent'),
+                  createChild('gml:TimeInstant'),
+                  appendChildren(
+                    pipe(
+                      createElement('gml:timePosition'),
+                      pipe(
+                        extent.start
+                          ? setTextContent(format(extent.start, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    )
+                  )
+                )
+          )
+        )
+      )
+    )
+  )(rootEl)
+}

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -169,12 +169,12 @@ export interface DatasetSpatialExtent {
 }
 
 /**
- * At least a start or an end date should be provided
+ * Period if both start and end are provided
+ * Instant if only start is provided
  */
 export interface DatasetTemporalExtent {
-  start?: Date
+  start: Date
   end?: Date
-  description?: string
 }
 
 export interface DatasetRecord extends BaseRecord {

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -117,6 +117,14 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
         description: 'This WFS service offers direct download capability',
         identifierInService: 'my:featuretype',
       },
+      {
+        type: 'service',
+        url: new URL('https://my-org.net/ogc'),
+        accessServiceProtocol: 'ogcFeatures',
+        name: 'my:featuretype',
+        description: 'This OGC service offers direct download capability',
+        identifierInService: 'my:featuretype',
+      },
     ],
     lineage: `This record was edited manually to test the conversion processes
 

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -3,6 +3,7 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
   OgcApiCollectionInfo,
   OgcApiEndpoint,
+  OgcApiRecord,
   WfsEndpoint,
   WfsVersion,
 } from '@camptocamp/ogc-client'
@@ -173,10 +174,23 @@ export class DataService {
   }
 
   async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
+    const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url))
+    return await endpoint.allCollections
+      .then((collections) => {
+        return endpoint.getCollectionInfo(collections[0].name)
+      })
+      .catch((error) => {
+        throw new Error(`ogc.unreachable.unknown`)
+      })
+  }
+
+  async getItemsFromOgcApi(url: string): Promise<OgcApiRecord> {
     const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url))
     return await endpoint.featureCollections
       .then((collections) => {
-        return endpoint.getCollectionInfo(collections[0])
+        return collections.length
+          ? endpoint.getCollectionItem(collections[0], '1')
+          : null
       })
       .catch((error) => {
         throw new Error(`ogc.unreachable.unknown`)

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

@@ -20,18 +20,21 @@ export interface MapContextLayerWmsModel {
   type: 'wms'
   url: string
   name: string
+  attributions?: string
 }
 
 export interface MapContextLayerWmtsModel {
   type: 'wmts'
   url: string
   name: string
+  attributions?: string
 }
 
 interface MapContextLayerWfsModel {
   type: 'wfs'
   url: string
   name: string
+  attributions?: string
 }
 
 export interface MapContextLayerOgcapiModel {
@@ -39,11 +42,13 @@ export interface MapContextLayerOgcapiModel {
   url: string
   name: string
   layerType: 'feature' | 'vectorTiles' | 'mapTiles' | 'record'
+  attributions?: string
 }
 
 interface LayerXyzModel {
   type: 'xyz'
   name?: string
+  attributions?: string
 }
 interface LayerXyzModelWithUrl extends LayerXyzModel {
   url: string
@@ -59,6 +64,7 @@ export type MapContextLayerXyzModel =
 
 interface LayerGeojson {
   type: 'geojson'
+  attributions?: string
 }
 interface LayerGeojsonWithUrl extends LayerGeojson {
   url: string

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

@@ -29,6 +29,8 @@ import OGCVectorTile from 'ol/source/OGCVectorTile.js'
 import { MVT } from 'ol/format'
 import VectorTileLayer from 'ol/layer/VectorTile'
 import OGCMapTile from 'ol/source/OGCMapTile.js'
+import ImageLayer from 'ol/layer/Image'
+import ImageWMS from 'ol/source/ImageWMS'
 
 export const DEFAULT_BASELAYER_CONTEXT: MapContextLayerXyzModel = {
   type: MapContextLayerTypeEnum.XYZ,
@@ -37,6 +39,7 @@ export const DEFAULT_BASELAYER_CONTEXT: MapContextLayerXyzModel = {
     `https://b.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
     `https://c.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
   ],
+  attributions: `<span>© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, © <a href="https://carto.com/">Carto</a></span>`,
 }
 
 export const DEFAULT_VIEW: MapContextViewModel = {
@@ -73,11 +76,13 @@ export class MapContextService {
     }
     map.setView(this.createView(mapContext.view, map))
     map.getLayers().clear()
-    mapContext.layers.forEach((layer) => map.addLayer(this.createLayer(layer)))
+    mapContext.layers.forEach((layer) =>
+      map.addLayer(this.createLayer(layer, mapConfig))
+    )
     return map
   }
 
-  createLayer(layerModel: MapContextLayerModel): Layer {
+  createLayer(layerModel: MapContextLayerModel, mapConfig?: MapConfig): Layer {
     const { type } = layerModel
     const style = this.styleService.styles.default
     switch (type) {
@@ -87,12 +92,14 @@ export class MapContextService {
             source: new OGCVectorTile({
               url: layerModel.url,
               format: new MVT(),
+              attributions: layerModel.attributions,
             }),
           })
         } else if (layerModel.layerType === 'mapTiles') {
           return new TileLayer({
             source: new OGCMapTile({
               url: layerModel.url,
+              attributions: layerModel.attributions,
             }),
           })
         } else {
@@ -100,6 +107,7 @@ export class MapContextService {
             source: new VectorSource({
               format: new GeoJSON(),
               url: layerModel.url,
+              attributions: layerModel.attributions,
             }),
             style,
           })
@@ -109,16 +117,28 @@ export class MapContextService {
           source: new XYZ({
             url: 'url' in layerModel ? layerModel.url : undefined,
             urls: 'urls' in layerModel ? layerModel.urls : undefined,
+            attributions: layerModel.attributions,
           }),
         })
       case MapContextLayerTypeEnum.WMS:
-        return new TileLayer({
-          source: new TileWMS({
-            url: layerModel.url,
-            params: { LAYERS: layerModel.name },
-            gutter: 20,
-          }),
-        })
+        if (mapConfig?.DO_NOT_TILE_WMS) {
+          return new ImageLayer({
+            source: new ImageWMS({
+              url: layerModel.url,
+              params: { LAYERS: layerModel.name },
+              attributions: layerModel.attributions,
+            }),
+          })
+        } else {
+          return new TileLayer({
+            source: new TileWMS({
+              url: layerModel.url,
+              params: { LAYERS: layerModel.name, TILED: true },
+              attributions: layerModel.attributions,
+            }),
+          })
+        }
+
       case MapContextLayerTypeEnum.WMTS: {
         // TODO: isolate this in utils service
         const olLayer = new TileLayer({})
@@ -141,6 +161,7 @@ export class MapContextService {
               tileGrid,
               projection: matrixSet.crs,
               dimensions,
+              attributions: layerModel.attributions,
             })
           )
         })
@@ -166,6 +187,7 @@ export class MapContextService {
                 })
               },
               strategy: bboxStrategy,
+              attributions: layerModel.attributions,
             })
           )
         })

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

@@ -33,6 +33,7 @@ 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'
@@ -47,7 +48,10 @@ export class MapUtilsService {
 
   createEmptyMap(): Map {
     return new Map({
-      controls: [],
+      controls: defaultControls({
+        attribution: true,
+        attributionOptions: { collapsible: false },
+      }),
       pixelRatio: 1,
     })
   }
@@ -213,7 +217,7 @@ export class MapUtilsService {
   }
 
   getRecordExtent(record: Partial<CatalogRecord>): Extent {
-    if (!('spatialExtents' in record)) {
+    if (!('spatialExtents' in record) || record.spatialExtents.length === 0) {
       return null
     }
     // transform an array of geojson geometries into a bbox

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

@@ -15,7 +15,7 @@ import {
   MapUtilsService,
 } from '../../../../../../libs/feature/map/src'
 import { getOptionalMapConfig, MapConfig } from '../../../../../../libs/util/app-config/src'
-import { getLinkLabel, ProxyService } from '../../../../../../libs/util/shared/src'
+import { getLinkLabel } from '../../../../../../libs/util/shared/src'
 import Feature from 'ol/Feature'
 import { Geometry } from 'ol/geom'
 import { StyleLike } from 'ol/style/Style'
@@ -23,10 +23,8 @@ import {
   BehaviorSubject,
   combineLatest,
   from,
-  lastValueFrom,
   Observable,
   of,
-  startWith,
   Subscription,
   throwError,
   withLatestFrom,
@@ -36,6 +34,7 @@ import {
   distinctUntilChanged,
   finalize,
   map,
+  startWith,
   switchMap,
   tap,
 } from 'rxjs/operators'
@@ -57,9 +56,11 @@ export class MapViewComponent implements OnInit, OnDestroy {
 
   compatibleMapLinks$ = combineLatest([
     this.mdViewFacade.mapApiLinks$,
-    this.mdViewFacade.geoDataLinks$,
+    this.mdViewFacade.geoDataLinksWithGeometry$,
   ]).pipe(
-    map(([mapApiLinks, geoDataLinks]) => [...mapApiLinks, ...geoDataLinks])
+    map(([mapApiLinks, geoDataLinksWithGeometry]) => {
+      return [...mapApiLinks, ...geoDataLinksWithGeometry]
+    })
   )
 
   dropdownChoices$ = this.compatibleMapLinks$.pipe(
@@ -104,8 +105,8 @@ export class MapViewComponent implements OnInit, OnDestroy {
   mapContext$ = this.currentLayers$.pipe(
     switchMap((layers) =>
       from(this.mapUtils.getLayerExtent(layers[0])).pipe(
-        catchError((error) => {
-          console.warn(error) // FIXME: report this to the user somehow
+        catchError(() => {
+          this.error = 'The layer has no extent'
           return of(undefined)
         }),
         map(
@@ -117,9 +118,15 @@ export class MapViewComponent implements OnInit, OnDestroy {
               },
             } as MapContextModel)
         ),
-        tap(() => this.resetSelection())
+        tap((res) => {
+          this.resetSelection()
+        })
       )
     ),
+    startWith({
+      layers: [],
+      view: {},
+    } as MapContextModel),
     withLatestFrom(this.mdViewFacade.metadata$),
     map(([context, metadata]) => {
       if (context.view.extent) return context