geonetwork-ui 2.4.0-dev.d000fb89 → 2.4.0-dev.d3529f01

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

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

@@ -18,7 +18,6 @@ import {
   readAbstract,
   readContacts,
   readContactsForResource,
-  readDistributions,
   readIsoTopics,
   readKeywords,
   readKind,
@@ -46,7 +45,6 @@ import {
   writeAbstract,
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
   writeGraphicOverviews,
   writeKeywords,
   writeKind,
@@ -55,7 +53,6 @@ import {
   writeLineage,
   writeOnlineResources,
   writeOtherConstraints,
-  writeOwnerOrganization,
   writeRecordUpdated,
   writeResourceCreated,
   writeResourcePublished,
@@ -100,7 +97,6 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: readSpatialRepresentation,
     overviews: readOverviews,
     lineage: readLineage,
-    distributions: readDistributions,
     onlineResources: readOnlineResources,
     temporalExtents: readTemporalExtents,
     spatialExtents: readSpatialExtents,
@@ -116,7 +112,7 @@ export class Iso19139Converter extends BaseConverter<string> {
   > = {
     uniqueIdentifier: writeUniqueIdentifier,
     kind: writeKind,
-    ownerOrganization: writeOwnerOrganization,
+    ownerOrganization: () => undefined, // fixme: find a way to store this value properly
     recordUpdated: writeRecordUpdated,
     recordCreated: () => undefined, // not supported in ISO19139
     recordPublished: () => undefined, // not supported in ISO19139
@@ -138,7 +134,6 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: writeSpatialRepresentation,
     overviews: writeGraphicOverviews,
     lineage: writeLineage,
-    distributions: writeDistributions,
     onlineResources: writeOnlineResources,
     temporalExtents: writeTemporalExtents,
     spatialExtents: writeSpatialExtents,
@@ -177,6 +172,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     const licenses = this.readers['licenses'](rootEl)
     const overviews = this.readers['overviews'](rootEl)
     const landingPage = this.readers['landingPage'](rootEl)
+    const onlineResources = this.readers['onlineResources'](rootEl)
 
     if (kind === 'dataset') {
       const status = this.readers['status'](rootEl)
@@ -185,7 +181,6 @@ export class Iso19139Converter extends BaseConverter<string> {
       const spatialExtents = this.readers['spatialExtents'](rootEl)
       const temporalExtents = this.readers['temporalExtents'](rootEl)
       const lineage = this.readers['lineage'](rootEl)
-      const distributions = this.readers['distributions'](rootEl)
       const updateFrequency = this.readers['updateFrequency'](rootEl)
 
       return {
@@ -215,12 +210,11 @@ export class Iso19139Converter extends BaseConverter<string> {
         overviews,
         spatialExtents,
         temporalExtents,
-        distributions,
+        onlineResources,
         updateFrequency,
         ...(landingPage && { landingPage }),
       } as DatasetRecord
     } else {
-      const onlineResources = this.readers['onlineResources'](rootEl)
       return {
         uniqueIdentifier,
         kind,
@@ -307,6 +301,8 @@ export class Iso19139Converter extends BaseConverter<string> {
     fieldChanged('licenses') && this.writers['licenses'](record, rootEl)
     fieldChanged('otherConstraints') &&
       this.writers['otherConstraints'](record, rootEl)
+    fieldChanged('onlineResources') &&
+      this.writers['onlineResources'](record, rootEl)
 
     if (record.kind === 'dataset') {
       fieldChanged('status') && this.writers['status'](record, rootEl)
@@ -319,12 +315,7 @@ export class Iso19139Converter extends BaseConverter<string> {
         this.writers['temporalExtents'](record, rootEl)
       fieldChanged('spatialExtents') &&
         this.writers['spatialExtents'](record, rootEl)
-      fieldChanged('distributions') &&
-        this.writers['distributions'](record, rootEl)
       fieldChanged('lineage') && this.writers['lineage'](record, rootEl)
-    } else {
-      fieldChanged('onlineResources') &&
-        this.writers['onlineResources'](record, rootEl)
     }
 
     this.beforeDocumentCreation(rootEl)

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

@@ -1,9 +1,10 @@
 import {
   Constraint,
-  DatasetDistribution,
+  DatasetOnlineResource,
   GraphicOverview,
   Individual,
   Keyword,
+  OnlineResource,
   Organization,
   RecordKind,
   RecordStatus,
@@ -326,12 +327,12 @@ const getMimeType = pipe(
 )
 
 /**
- * Extract distributions from a MD_Distribution element
+ * Extract online resources from an MD_Distribution element
  * @param getMimeTypeFn This function starts from a gmd:transferOptions element
  */
-export function extractDatasetDistributions(
+export function extractDatasetOnlineResources(
   getMimeTypeFn: ChainableFunction<XmlElement, string>
-): ChainableFunction<XmlElement, DatasetDistribution[]> {
+): ChainableFunction<XmlElement, DatasetOnlineResource[]> {
   const getUrl = pipe(findChildElement('gmd:linkage'), extractMandatoryUrl())
   const getProtocolStr = pipe(
     findChildElement('gmd:protocol'),
@@ -774,14 +775,6 @@ export function readLineage(rootEl: XmlElement): string {
   )(rootEl)
 }
 
-export function readDistributions(rootEl: XmlElement): DatasetDistribution[] {
-  return pipe(
-    findNestedElements('gmd:distributionInfo', 'gmd:MD_Distribution'),
-    mapArray(extractDatasetDistributions(getMimeType)),
-    flattenArray()
-  )(rootEl)
-}
-
 export function readUpdateFrequency(rootEl: XmlElement): UpdateFrequency {
   return pipe(
     findIdentification(),
@@ -845,9 +838,14 @@ export function extractServiceOnlineResources(): ChainableFunction<
   )
 }
 
-export function readOnlineResources(
-  rootEl: XmlElement
-): ServiceOnlineResource[] {
+export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
+  if (readKind(rootEl) === 'dataset') {
+    return pipe(
+      findNestedElements('gmd:distributionInfo', 'gmd:MD_Distribution'),
+      mapArray(extractDatasetOnlineResources(getMimeType)),
+      flattenArray()
+    )(rootEl)
+  }
   return pipe(
     findNestedElements('gmd:distributionInfo', 'gmd:MD_Distribution'),
     mapArray(extractServiceOnlineResources()),