geonetwork-ui 2.4.0-dev.5cc37149 → 2.4.0-dev.614b0d9f

package/src/libs/api/metadata-converter/src/lib/fixtures/opendataswiss.records.ts

@@ -0,0 +1,110 @@
+import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+export const OPENDATASWISS_DATASET_RECORD: DatasetRecord = {
+  uniqueIdentifier:
+    '393940cd-6a67-4190-8b91-378669cdea1d@bundesamt-fur-energie-bfe',
+  title: 'Energy cities',
+  contacts: [],
+  contactsForResource: [
+    {
+      email: 'geoinformation@bfe.admin.ch',
+      role: 'point_of_contact',
+      firstName: 'geoinformation@bfe.admin.ch',
+    },
+  ],
+  landingPage: new URL('https://www.bfe.admin.ch/energiestaedte'),
+  onlineResources: [
+    {
+      description: 'GeoPackage',
+      name: 'GeoPackage',
+      type: 'download',
+      url: new URL(
+        'https://data.geo.admin.ch/ch.bfe.energiestaedte/gpkg/2056/ch.bfe.energiestaedte.zip'
+      ),
+    },
+    {
+      description: 'swisstopo REST API',
+      name: 'swisstopo REST API',
+      type: 'link',
+      url: new URL(
+        'https://api3.geo.admin.ch/rest/services/api/MapServer/ch.bfe.energiestaedte'
+      ),
+    },
+    {
+      description: 'Thematic geoportal - map.geo.admin.ch',
+      name: 'Map (Preview) Thematic geoportal - map.geo.admin.ch',
+      type: 'link',
+      url: new URL(
+        'https://map.geo.admin.ch/?topic=energie&lang=de&layers=ch.bfe.energiestaedte'
+      ),
+    },
+    {
+      description: 'INTERLIS',
+      name: 'INTERLIS',
+      type: 'download',
+      url: new URL(
+        'https://data.geo.admin.ch/ch.bfe.energiestaedte/xtf/2056/ch.bfe.energiestaedte.zip'
+      ),
+    },
+    {
+      description: 'Web Map Services WMS',
+      name: 'ch.bfe.energiestaedte',
+      type: 'link',
+      url: new URL(
+        'http://wms.geo.admin.ch/?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&lang=de'
+      ),
+    },
+  ],
+  keywords: [
+    {
+      label: 'ifdg-linfrastructure-federale-de-donnees-geographiques',
+      type: 'theme',
+    },
+    {
+      label: 'ifdg-infrastruttura-federale-dei-dati-geografici',
+      type: 'theme',
+    },
+    {
+      label: 'bgdi-bundesgeodaten-infrastruktur',
+      type: 'theme',
+    },
+    {
+      label: 'fsdi-federal-spatial-data-infrastructure',
+      type: 'theme',
+    },
+  ],
+  kind: 'dataset',
+  languages: [],
+  legalConstraints: [],
+  licenses: [],
+  otherConstraints: [],
+  overviews: [],
+  securityConstraints: [],
+  spatialExtents: [
+    {
+      description: 'Schweiz',
+    },
+  ],
+  temporalExtents: [],
+  topics: [
+    'http://publications.europa.eu/resource/authority/data-theme/ENVI',
+    'http://dcat-ap.ch/vocabulary/themes/energy',
+    'http://publications.europa.eu/resource/authority/data-theme/ENER',
+    'http://dcat-ap.ch/vocabulary/themes/territory',
+    'http://publications.europa.eu/resource/authority/data-theme/REGI',
+    'http://dcat-ap.ch/vocabulary/themes/culture',
+    'http://publications.europa.eu/resource/authority/data-theme/EDUC',
+    'http://dcat-ap.ch/vocabulary/themes/geography',
+  ],
+  abstract: `The Energy City label is used for certifying municipalities that develop and implement a sustainable energy policy. Municipalities that have been awarded this label promote renewable energy and ecological mobility, and focus on the efficient use of resources. In order to qualify for the label, a municipality must have realised or adopted at least 50 percent of its scope for action in the area of energy policy. Here the calculation is based on the Energy Cities catalogue. The European Energy Award®GOLD is the highest level of certification. This label is awarded to municipalities that have implemented at least 75 percent of the measures listed in the catalogue at the time of certification. Municipalities that qualify for this award demonstrate the highest level of commitment towards a sustainable energy future. The label is based on an assessment of municipal energy policy in the areas of development and spatial planning, municipal buildings and installations, supply and disposal, mobility, internal organisation, communication and cooperation.`,
+  lineage: '',
+  ownerOrganization: {
+    name: 'Bundesamt für Energie',
+  },
+  recordCreated: new Date('2022-06-03T08:24:30.000Z'),
+  recordUpdated: new Date('2022-06-16T20:06:22.000Z'),
+  resourceCreated: new Date('2014-06-30T00:00:00.000'),
+  resourceUpdated: new Date('2022-06-15T00:00:00.000'),
+  status: 'completed',
+  updateFrequency: 'unknown',
+}

package/src/libs/api/metadata-converter/src/lib/fixtures/sextant.records.ts

@@ -0,0 +1,85 @@
+import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+export const SEXTANT_BATHYMETRY_DATASET_RECORD: DatasetRecord = {
+  uniqueIdentifier: '370ab490-e8b4-11df-b733-005056987263',
+  title:
+    'MNT de Bathymétrie de la zone du Golo - Campagne Sigolo (réalisé en 2008, résolution 25m)',
+  contacts: [],
+  contactsForResource: [
+    {
+      role: 'custodian',
+      email: 'gmcarto@ifremer.fr',
+      firstName: 'Ifremer',
+      lastName: '- Géosciences Marines',
+    },
+    {
+      email: 'gmcarto@ifremer.fr',
+      firstName: 'Ifremer',
+      lastName: '- Géosciences Marines',
+      role: 'processor',
+    },
+    {
+      email: 'gmcarto@ifremer.fr',
+      firstName: 'Ifremer',
+      lastName: '- Géosciences Marines',
+      role: 'processor',
+    },
+  ],
+  landingPage: new URL(
+    'https://sextant.ifremer.fr/geonetwork/api/collections/main/items/370ab490-e8b4-11df-b733-005056987263'
+  ),
+  onlineResources: [
+    {
+      description: 'Cartographie - Géosciences Marines Ifremer',
+      name: '',
+      type: 'link',
+      url: new URL('http://wwz.ifremer.fr/drogm/Cartographie'),
+    },
+  ],
+  keywords: [],
+  kind: 'dataset',
+  languages: [],
+  legalConstraints: [],
+  licenses: [],
+  otherConstraints: [],
+  overviews: [],
+  securityConstraints: [],
+  spatialExtents: [
+    {
+      geometry: {
+        coordinates: [
+          [
+            [9.449999, 42.283333],
+            [10.033471, 42.283333],
+            [10.033471, 42.86684],
+            [9.449999, 42.86684],
+            [9.449999, 42.283333],
+          ],
+        ],
+        type: 'Polygon',
+      },
+    },
+  ],
+  temporalExtents: [],
+  topics: [
+    '/Milieu physique/Bathymétrie/MNT',
+    'Altitude',
+    'fond marin',
+    'morphologie sous-marine',
+    'Bathymétrie',
+    'Modèle Numérique de Terrain',
+    'Corse',
+    'Méditerranée',
+    'France',
+    'Géophysique',
+  ],
+  abstract: `Modèle bathymétrique (MNT) d'une partie de l'édifice sédimentaire sous-marin du Golo, à l'Est du Cap Corse. Les données ont été acquises lors de la campagne océanographique Sigolo en 2008, avec les sondeurs multifaisceaux EM300 et EM1000.
+                Le pas de la grille est de 25m.
+                Produit interne Ifremer.`,
+  lineage: '',
+  ownerOrganization: null,
+  recordUpdated: new Date('2020-06-03T22:34:05.000Z'),
+  resourceUpdated: new Date('2020-06-03T22:34:05.000Z'),
+  status: 'completed',
+  updateFrequency: 'unknown',
+}

package/src/libs/api/metadata-converter/src/lib/fixtures/vlaanderen.dcat-ap.records.ts

@@ -0,0 +1,73 @@
+import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+export const VLAANDEREN_DATASET_RECORD: DatasetRecord = {
+  uniqueIdentifier: 'f3bd3e9b-cec1-38de-bb16-d063edace486',
+  title: 'Fish damage at pump stations',
+  abstract: `Fish damage at pump stations is a sampling event dataset published by the Research Institute for Nature and Forest (INBO). It contains 7319 occurrences, recorded during 120 events as well as lengths and weights of the fish that were recorded. Issues with the dataset can be reported at https://github.com/inbo/data-publication/issues
+                    We have released this dataset to the public domain under a Creative Commons Zero waiver. We would appreciate it if you follow the INBO norms for data use (https://www.inbo.be/en/norms-data-use) when using the data. If you have any questions regarding this dataset, don't hesitate to contact us via the contact information provided in the metadata or via opendata@inbo.be.`,
+  contacts: [],
+  contactsForResource: [
+    {
+      firstName: 'David',
+      lastName: 'Buysse',
+      email: 'david.buysse@inbo.be',
+      role: 'point_of_contact',
+    },
+  ],
+  ownerOrganization: {
+    name: 'Research Institute for Nature and Forest (INBO)',
+  },
+  landingPage: new URL('https://ipt.inbo.be/resource?r=visschade-occurrences'),
+  onlineResources: [
+    {
+      description: 'Darwin Core Archive',
+      name: 'Darwin Core Archive of Fish damage at pump stations',
+      type: 'download',
+      url: new URL('https://ipt.inbo.be/archive.do?r=visschade-occurrences'),
+    },
+  ],
+  keywords: [
+    { label: 'fish', type: 'theme' },
+    { label: 'pumping station', type: 'theme' },
+    { label: 'migration', type: 'theme' },
+    { label: 'Samplingevent', type: 'theme' },
+    { label: 'mortality', type: 'theme' },
+  ],
+  kind: 'dataset',
+  languages: [],
+  legalConstraints: [],
+  licenses: [
+    {
+      text: 'Creative Commons CC-0',
+      url: new URL(
+        'https://creativecommons.org/publicdomain/zero/1.0/legalcode'
+      ),
+    },
+  ],
+  otherConstraints: [],
+  overviews: [],
+  securityConstraints: [],
+  spatialExtents: [
+    {
+      geometry: {
+        type: 'Polygon',
+        coordinates: [
+          [
+            [3.768, 51.072],
+            [3.768, 51.31],
+            [4.202, 51.31],
+            [4.202, 51.072],
+            [3.768, 51.072],
+          ],
+        ],
+      },
+    },
+  ],
+  temporalExtents: [],
+  topics: ['biodiversity'],
+  lineage: '',
+  recordUpdated: new Date('2024-09-19T01:15:09.732Z'),
+  resourceUpdated: new Date('2021-04-14T11:15+02:00'),
+  status: 'completed',
+  updateFrequency: 'unknown',
+}

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -20,12 +20,9 @@ import { getUpdateFrequencyFromFrequencyCode } from '../iso19139/utils/update-fr
 import {
   CatalogRecord,
   Constraint,
-  DatasetDistribution,
-  DatasetDistributionType,
-  DatasetDownloadDistribution,
-  DatasetServiceDistribution,
   DatasetSpatialExtent,
-  OnlineLinkResource,
+  OnlineResource,
+  OnlineResourceType,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchProtocol } from '../common/distribution.mapper'
 import { Thesaurus } from './types'
@@ -158,13 +155,13 @@ export class Gn4FieldMapper {
       const rawLinks = getAsArray(
         selectField<SourceWithUnknownProps[]>(source, 'link')
       )
-      const distributions = rawLinks
+      const onlineResources = rawLinks
         .map((link) => this.mapLink(link))
         .filter((v) => v !== null)
       return {
         ...output,
-        distributions,
-      }
+        onlineResources,
+      } as CatalogRecord
     },
     contact: (output, source) => ({
       ...output,
@@ -287,7 +284,7 @@ export class Gn4FieldMapper {
       return {
         ...output,
         kind,
-      }
+      } as CatalogRecord
     },
     geom: (output, source) => {
       const geoms = getAsArray(selectField(source, 'geom'))
@@ -387,7 +384,7 @@ export class Gn4FieldMapper {
     return fieldName in this.fields ? this.fields[fieldName] : this.genericField
   }
 
-  getLinkType(url: string, protocol?: string): DatasetDistributionType {
+  getLinkType(url: string, protocol?: string): OnlineResourceType {
     if (!protocol) {
       return 'link'
     }
@@ -406,9 +403,7 @@ export class Gn4FieldMapper {
     return 'link'
   }
 
-  mapLink = (
-    sourceLink: SourceWithUnknownProps
-  ): DatasetDistribution | null => {
+  mapLink = (sourceLink: SourceWithUnknownProps): OnlineResource | null => {
     const url = getAsUrl(
       selectFallback(
         selectTranslatedField<string>(sourceLink, 'urlObject', this.lang3),
@@ -452,20 +447,27 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
-        } as DatasetServiceDistribution
+        }
       case 'link':
         return {
           ...distribution,
           type,
           url: url,
-        } as OnlineLinkResource
+        }
       case 'download':
         return {
           ...distribution,
           type,
           url: url,
           ...(mimeType && { mimeType }),
-        } as DatasetDownloadDistribution
+        }
+      case 'endpoint':
+        return {
+          ...distribution,
+          type,
+          endpointUrl: url,
+          protocol: accessServiceProtocol,
+        }
     }
   }
 

package/src/libs/api/metadata-converter/src/lib/gn4/types/keywords.model.ts

@@ -1,10 +1,6 @@
 export interface KeywordApiResponse {
-  values?: {
-    eng: string
-  }
-  definitions?: {
-    eng: string
-  }
+  values?: Record<string, string>
+  definitions?: Record<string, string>
   coordEast?: string
   coordWest?: string
   coordSouth?: string

package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts

@@ -4,10 +4,10 @@ import { Iso19139Converter } from '../iso19139'
 import { renameElements } from '../xml-utils'
 import {
   readContacts,
-  readDistributions,
   readKind,
   readLandingPage,
   readLineage,
+  readOnlineResources,
   readOwnerOrganization,
   readRecordCreated,
   readRecordPublished,
@@ -18,11 +18,10 @@ import {
 import {
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
   writeKind,
   writeLandingPage,
   writeLineage,
-  writeOwnerOrganization,
+  writeOnlineResources,
   writeRecordCreated,
   writeRecordPublished,
   writeRecordUpdated,
@@ -48,7 +47,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.readers['ownerOrganization'] = readOwnerOrganization
     this.readers['landingPage'] = readLandingPage
     this.readers['lineage'] = readLineage
-    this.readers['distributions'] = readDistributions
+    this.readers['onlineResources'] = readOnlineResources
 
     this.writers['uniqueIdentifier'] = writeUniqueIdentifier
     this.writers['kind'] = writeKind
@@ -60,10 +59,10 @@ export class Iso191153Converter extends Iso19139Converter {
     this.writers['resourcePublished'] = writeResourcePublished
     this.writers['contacts'] = writeContacts
     this.writers['contactsForResource'] = writeContactsForResource
-    this.writers['ownerOrganization'] = writeOwnerOrganization
+    this.writers['ownerOrganization'] = () => undefined // fixme: find a way to store this value properly
     this.writers['landingPage'] = writeLandingPage
     this.writers['lineage'] = writeLineage
-    this.writers['distributions'] = writeDistributions
+    this.writers['onlineResources'] = writeOnlineResources
     this.writers['status'] = writeStatus
     this.writers['spatialRepresentation'] = writeSpatialRepresentation
   }

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

@@ -19,15 +19,16 @@ import {
 } from '../function-utils'
 import {
   extractCharacterString,
-  extractDatasetDistributions,
+  extractDatasetOnlineResources,
   extractDateTime,
   extractRole,
+  extractServiceOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
 import {
-  DatasetDistribution,
   Individual,
+  OnlineResource,
   Organization,
   RecordKind,
   Role,
@@ -320,10 +321,17 @@ const getMimeType = pipe(
   map(matchMimeType)
 )
 
-export function readDistributions(rootEl: XmlElement): DatasetDistribution[] {
+export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
+  if (readKind(rootEl) === 'dataset') {
+    return pipe(
+      findNestedElements('mrd:distributionInfo', 'mrd:MD_Distribution'),
+      mapArray(extractDatasetOnlineResources(getMimeType)),
+      flattenArray()
+    )(rootEl)
+  }
   return pipe(
     findNestedElements('mrd:distributionInfo', 'mrd:MD_Distribution'),
-    mapArray(extractDatasetDistributions(getMimeType)),
+    mapArray(extractServiceOnlineResources()),
     flattenArray()
   )(rootEl)
 }

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

@@ -2,7 +2,6 @@ import {
   CatalogRecord,
   DatasetRecord,
   Individual,
-  ServiceOnlineResource,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   addAttribute,
@@ -18,7 +17,6 @@ import {
   findNestedElement,
   findNestedElements,
   readAttribute,
-  removeAllChildren,
   removeChildren,
   removeChildrenByName,
   setTextContent,
@@ -34,14 +32,14 @@ import {
   pipe,
 } from '../function-utils'
 import {
-  appendDistribution,
   appendKeywords,
+  appendOnlineResource,
+  appendServiceOnlineResources,
   createDistributionInfo,
   findOrCreateDistribution,
   findOrCreateIdentification,
   getProgressCode,
   getRoleCode,
-  getServiceEndpointProtocol,
   removeKeywords,
   writeCharacterString,
   writeDateTime,
@@ -126,7 +124,7 @@ export function writeRecordUpdated(record: CatalogRecord, rootEl: XmlElement) {
 
 export function writeRecordCreated(record: CatalogRecord, rootEl: XmlElement) {
   removeRecordDate('creation')(rootEl)
-  if (!('recordCreated' in record)) return
+  if (!record.recordCreated) return
   appendRecordDate(record.recordCreated, 'creation')(rootEl)
 }
 
@@ -135,14 +133,14 @@ export function writeRecordPublished(
   rootEl: XmlElement
 ) {
   removeRecordDate('publication')(rootEl)
-  if (!('recordPublished' in record)) return
+  if (!record.recordPublished) return
   appendRecordDate(record.recordPublished, 'publication')(rootEl)
 }
 
 function removeResourceDate(type: 'revision' | 'creation' | 'publication') {
   return pipe(
-    findIdentification(),
-    findNestedElement('mri:citation', 'cit:CI_Citation'),
+    findOrCreateIdentification(),
+    findNestedChildOrCreate('mri:citation', 'cit:CI_Citation'),
     removeChildren(
       pipe(
         findChildrenElement('cit:date', false),
@@ -192,7 +190,7 @@ export function writeResourceUpdated(
   rootEl: XmlElement
 ) {
   removeResourceDate('revision')(rootEl)
-  if (!('resourceUpdated' in record)) return
+  if (!record.resourceUpdated) return
   appendResourceDate(record.resourceUpdated, 'revision')(rootEl)
 }
 
@@ -201,7 +199,7 @@ export function writeResourceCreated(
   rootEl: XmlElement
 ) {
   removeResourceDate('creation')(rootEl)
-  if (!('resourceCreated' in record)) return
+  if (!record.resourceCreated) return
   appendResourceDate(record.resourceCreated, 'creation')(rootEl)
 }
 
@@ -210,37 +208,10 @@ export function writeResourcePublished(
   rootEl: XmlElement
 ) {
   removeResourceDate('publication')(rootEl)
-  if (!('resourcePublished' in record)) return
+  if (!record.resourcePublished) return
   appendResourceDate(record.resourcePublished, 'publication')(rootEl)
 }
 
-export function writeOwnerOrganization(
-  record: CatalogRecord,
-  rootEl: XmlElement
-) {
-  // if no contact matches the owner org, create an empty one
-  const ownerContact: Individual = record.contacts.find(
-    (contact) => contact.organization.name === record.ownerOrganization.name
-  )
-  pipe(
-    findChildOrCreate('mdb:contact'),
-    removeAllChildren(),
-    appendResponsibleParty(
-      ownerContact
-        ? {
-            ...ownerContact,
-            // owner responsible party is always point of contact
-            role: 'point_of_contact',
-          }
-        : {
-            organization: record.ownerOrganization,
-            email: 'missing@missing.com',
-            role: 'point_of_contact',
-          }
-    )
-  )(rootEl)
-}
-
 export function appendResponsibleParty(contact: Individual) {
   const fullName = namePartsToFull(contact.firstName, contact.lastName)
 
@@ -481,7 +452,7 @@ function removeTransferOptions(rootEl: XmlElement) {
   )(rootEl)
 }
 
-function appendDistributionFormat(mimeType: string) {
+function appendOnlineResourceFormat(mimeType: string) {
   return appendChildren(
     pipe(
       createElement('mrd:distributionFormat'),
@@ -494,11 +465,18 @@ function appendDistributionFormat(mimeType: string) {
   )
 }
 
-export function writeDistributions(record: DatasetRecord, rootEl: XmlElement) {
+export function writeOnlineResources(
+  record: CatalogRecord,
+  rootEl: XmlElement
+) {
   removeTransferOptions(rootEl)
 
-  // for each distribution, either find an existing distribution info or create a new one
-  record.distributions.forEach((distribution, index) => {
+  if (record.kind === 'service') {
+    appendServiceOnlineResources(record, rootEl)
+  }
+
+  // for each online resource, either find an existing distribution info or create a new one
+  record.onlineResources.forEach((onlineResource, index) => {
     pipe(
       fallback(
         pipe(
@@ -507,7 +485,7 @@ export function writeDistributions(record: DatasetRecord, rootEl: XmlElement) {
         ),
         appendChildTree(createDistributionInfo())
       ),
-      appendDistribution(distribution, appendDistributionFormat)
+      appendOnlineResource(onlineResource, appendOnlineResourceFormat)
     )(rootEl)
   })
 }