geonetwork-ui 2.4.0-dev.fe59f179 → 2.4.1-dev.1d2ade24e

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

@@ -4,31 +4,36 @@ import { Iso19139Converter } from '../iso19139'
 import { renameElements } from '../xml-utils'
 import {
   readContacts,
-  readDistributions,
+  readContactsForResource,
+  readDefaultLanguage,
   readKind,
   readLandingPage,
   readLineage,
+  readOnlineResources,
+  readOtherLanguages,
   readOwnerOrganization,
   readRecordCreated,
   readRecordPublished,
   readRecordUpdated,
-  readResourceContacts,
+  readReuseType,
   readUniqueIdentifier,
 } from './read-parts'
 import {
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
+  writeDefaultLanguage,
   writeKind,
   writeLandingPage,
   writeLineage,
-  writeOwnerOrganization,
+  writeOnlineResources,
+  writeOtherLanguages,
   writeRecordCreated,
   writeRecordPublished,
   writeRecordUpdated,
   writeResourceCreated,
   writeResourcePublished,
   writeResourceUpdated,
+  writeReuseType,
   writeSpatialRepresentation,
   writeStatus,
   writeUniqueIdentifier,
@@ -44,11 +49,14 @@ export class Iso191153Converter extends Iso19139Converter {
     this.readers['recordCreated'] = readRecordCreated
     this.readers['recordPublished'] = readRecordPublished
     this.readers['contacts'] = readContacts
-    this.readers['contactsForResource'] = readResourceContacts
+    this.readers['contactsForResource'] = readContactsForResource
     this.readers['ownerOrganization'] = readOwnerOrganization
     this.readers['landingPage'] = readLandingPage
     this.readers['lineage'] = readLineage
-    this.readers['distributions'] = readDistributions
+    this.readers['onlineResources'] = readOnlineResources
+    this.readers['defaultLanguage'] = readDefaultLanguage
+    this.readers['otherLanguages'] = readOtherLanguages
+    this.readers['reuseType'] = readReuseType
 
     this.writers['uniqueIdentifier'] = writeUniqueIdentifier
     this.writers['kind'] = writeKind
@@ -58,14 +66,17 @@ export class Iso191153Converter extends Iso19139Converter {
     this.writers['resourceUpdated'] = writeResourceUpdated
     this.writers['resourceCreated'] = writeResourceCreated
     this.writers['resourcePublished'] = writeResourcePublished
+    this.writers['reuseType'] = writeReuseType
     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
+    this.writers['defaultLanguage'] = writeDefaultLanguage
+    this.writers['otherLanguages'] = writeOtherLanguages
   }
 
   beforeDocumentCreation(rootEl: XmlElement) {
@@ -82,7 +93,7 @@ export class Iso191153Converter extends Iso19139Converter {
 
       // languages
       'gmd:PT_Locale': 'lan:PT_Locale',
-      'gmd:languageCode': 'lan:languageCode',
+      'gmd:PT_FreeText': 'lan:PT_FreeText',
       'gmd:LanguageCode': 'lan:LanguageCode',
 
       // status

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

@@ -19,21 +19,30 @@ import {
 } from '../function-utils'
 import {
   extractCharacterString,
-  extractDatasetDistributions,
+  extractDatasetOnlineResources,
   extractDateTime,
+  extractLocalizedCharacterString,
   extractRole,
+  extractServiceOnlineResources,
+  extractReuseOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
 import {
-  DatasetDistribution,
   Individual,
+  LanguageCode,
+  OnlineResource,
   Organization,
+  OrganizationTranslations,
   RecordKind,
+  RecordTranslations,
+  ReuseType,
   Role,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchMimeType } from '../common/distribution.mapper'
 import { fullNameToParts } from '../iso19139/utils/individual-name'
+import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function readKind(rootEl: XmlElement): RecordKind {
   return pipe(
@@ -44,10 +53,7 @@ export function readKind(rootEl: XmlElement): RecordKind {
       'mcc:MD_ScopeCode'
     ),
     readAttribute('codeListValue'),
-    map(
-      (scopeCode): RecordKind =>
-        scopeCode === 'service' ? 'service' : 'dataset'
-    )
+    map((scopeCode): RecordKind => getResourceType(scopeCode))
   )(rootEl)
 }
 
@@ -73,12 +79,16 @@ export function extractOrganization(): ChainableFunction<
   )
   return pipe(
     combine(
-      pipe(findChildElement('cit:name', false), extractCharacterString()),
+      pipe(
+        findChildElement('cit:name', false),
+        extractLocalizedCharacterString<OrganizationTranslations>('name')
+      ),
       getUrl
     ),
-    map(([name, website]) => ({
+    map(([[name, translations], website]) => ({
       name,
       ...(website && { website }),
+      translations,
     }))
   )
 }
@@ -131,6 +141,7 @@ export function extractIndividual(
   )
   const defaultOrg: Organization = {
     name: 'Missing Organization',
+    translations: {},
   }
 
   let defaultIndividual: Partial<Individual> = {}
@@ -195,13 +206,11 @@ export function extractIndividuals(): ChainableFunction<
   const getRole = pipe(findChildElement('cit:role'), extractRole())
   const getIndividuals = pipe(
     combine(getRole, findNestedElements('cit:party', 'cit:CI_Individual')),
-    ([role, els]) => els.map((el) => extractIndividual(role)(el))
+    ([role, els]) => els.map(extractIndividual(role))
   )
   const getOrgIndividuals = pipe(
     combine(getRole, findNestedElements('cit:party', 'cit:CI_Organisation')),
-    map(([role, els]) =>
-      els.map((el) => extractOrganizationIndividuals(role)(el))
-    ),
+    map(([role, els]) => els.map(extractOrganizationIndividuals(role))),
     flattenArray()
   )
 
@@ -221,10 +230,11 @@ export function readUniqueIdentifier(rootEl: XmlElement): string {
 
 export function readOwnerOrganization(rootEl: XmlElement): Organization {
   const contacts = readContacts(rootEl)
+  const contactsForResource = readContactsForResource(rootEl)
   const pointOfContact = contacts.filter(
     (c) => c.role === 'point_of_contact'
   )[0]
-  return (pointOfContact || contacts[0]).organization
+  return (pointOfContact || contacts[0] || contactsForResource[0]).organization
 }
 
 export function readContacts(rootEl: XmlElement): Individual[] {
@@ -235,7 +245,7 @@ export function readContacts(rootEl: XmlElement): Individual[] {
   )(rootEl)
 }
 
-export function readResourceContacts(rootEl: XmlElement): Individual[] {
+export function readContactsForResource(rootEl: XmlElement): Individual[] {
   return pipe(
     combine(
       pipe(
@@ -270,10 +280,14 @@ export function readLandingPage(rootEl: XmlElement): URL {
   )(rootEl)
 }
 
-export function readLineage(rootEl: XmlElement): string {
+export function readLineage(
+  rootEl: XmlElement,
+  translations: RecordTranslations
+): string {
   return pipe(
     findNestedElement('mdb:resourceLineage', 'mrl:LI_Lineage', 'mrl:statement'),
-    extractCharacterString()
+    extractLocalizedCharacterString('lineage', translations),
+    map(([lineage]) => lineage)
   )(rootEl)
 }
 
@@ -307,6 +321,19 @@ export function readRecordPublished(rootEl: XmlElement): Date {
   return extractDateInfo('publication')(rootEl)
 }
 
+export function readReuseType(rootEl: XmlElement): ReuseType {
+  return pipe(
+    findNestedElement(
+      'mdb:metadataScope',
+      'mdb:MD_MetadataScope',
+      'mdb:resourceScope',
+      'mcc:MD_ScopeCode'
+    ),
+    readAttribute('codeListValue'),
+    map((scopeCode): ReuseType => getReuseType(scopeCode))
+  )(rootEl)
+}
+
 const getMimeType = pipe(
   findParent('mrd:MD_Distribution'),
   findNestedElement(
@@ -320,10 +347,40 @@ const getMimeType = pipe(
   map(matchMimeType)
 )
 
-export function readDistributions(rootEl: XmlElement): DatasetDistribution[] {
+export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
+  let getOnlineResources: ChainableFunction<XmlElement, OnlineResource[]>
+  if (readKind(rootEl) === 'dataset') {
+    getOnlineResources = extractDatasetOnlineResources(getMimeType)
+  } else if (readKind(rootEl) === 'service') {
+    getOnlineResources = extractServiceOnlineResources()
+  } else {
+    getOnlineResources = extractReuseOnlineResources()
+  }
   return pipe(
     findNestedElements('mrd:distributionInfo', 'mrd:MD_Distribution'),
-    mapArray(extractDatasetDistributions(getMimeType)),
+    mapArray(getOnlineResources),
     flattenArray()
   )(rootEl)
 }
+
+function readLocaleElement(): ChainableFunction<XmlElement, LanguageCode> {
+  return pipe(
+    findChildElement('lan:LanguageCode'),
+    readAttribute('codeListValue'),
+    map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
+  )
+}
+
+export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
+  return pipe(
+    findChildElement('mdb:defaultLocale', false),
+    readLocaleElement()
+  )(rootEl)
+}
+
+export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
+  return pipe(
+    findChildrenElement('mdb:otherLocale', false),
+    mapArray(readLocaleElement())
+  )(rootEl)
+}

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

@@ -2,10 +2,9 @@ import {
   CatalogRecord,
   DatasetRecord,
   Individual,
-  ServiceOnlineResource,
+  LanguageCode,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
-  addAttribute,
   allChildrenElement,
   appendChildren,
   appendChildTree,
@@ -18,10 +17,10 @@ import {
   findNestedElement,
   findNestedElements,
   readAttribute,
-  removeAllChildren,
   removeChildren,
   removeChildrenByName,
   setTextContent,
+  writeAttribute,
   XmlElement,
 } from '../xml-utils'
 import {
@@ -34,35 +33,41 @@ import {
   pipe,
 } from '../function-utils'
 import {
-  appendDistribution,
   appendKeywords,
+  appendOnlineResource,
+  appendServiceOnlineResources,
   createDistributionInfo,
   findOrCreateDistribution,
   findOrCreateIdentification,
   getProgressCode,
   getRoleCode,
-  getServiceEndpointProtocol,
   removeKeywords,
   writeCharacterString,
   writeDateTime,
   writeLinkage,
+  writeLocalizedCharacterString,
 } from '../iso19139/write-parts'
 import { findIdentification } from '../iso19139/read-parts'
 import { namePartsToFull } from '../iso19139/utils/individual-name'
+import { LANG_2_TO_3_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { kindToCodeListValue } from '../common/resource-types'
 
 export function writeUniqueIdentifier(
   record: CatalogRecord,
   rootEl: XmlElement
 ) {
   pipe(
-    findChildOrCreate('mdb:metadataIdentifier'),
-    findChildOrCreate('mcc:MD_Identifier'),
-    findChildOrCreate('mcc:code'),
+    findNestedChildOrCreate(
+      'mdb:metadataIdentifier',
+      'mcc:MD_Identifier',
+      'mcc:code'
+    ),
     writeCharacterString(record.uniqueIdentifier)
   )(rootEl)
 }
 
 export function writeKind(record: CatalogRecord, rootEl: XmlElement) {
+  const kind = kindToCodeListValue(record)
   pipe(
     findNestedChildOrCreate(
       'mdb:metadataScope',
@@ -70,12 +75,12 @@ export function writeKind(record: CatalogRecord, rootEl: XmlElement) {
       'mdb:resourceScope',
       'mcc:MD_ScopeCode'
     ),
-    addAttribute(
+    writeAttribute(
       'codeList',
       'https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ScopeCode'
     ),
-    addAttribute('codeListValue', record.kind),
-    setTextContent(record.kind)
+    writeAttribute('codeListValue', kind),
+    setTextContent(kind)
   )(rootEl)
 }
 
@@ -107,11 +112,11 @@ function appendRecordDate(
         pipe(
           createElement('cit:dateType'),
           createChild('cit:CI_DateTypeCode'),
-          addAttribute(
+          writeAttribute(
             'codeList',
             'https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode'
           ),
-          addAttribute('codeListValue', type),
+          writeAttribute('codeListValue', type),
           setTextContent(type)
         )
       )
@@ -126,7 +131,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 +140,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),
@@ -174,11 +179,11 @@ function appendResourceDate(
           pipe(
             createElement('cit:dateType'),
             createChild('cit:CI_DateTypeCode'),
-            addAttribute(
+            writeAttribute(
               'codeList',
               'https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode'
             ),
-            addAttribute('codeListValue', type),
+            writeAttribute('codeListValue', type),
             setTextContent(type)
           )
         )
@@ -192,7 +197,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 +206,7 @@ export function writeResourceCreated(
   rootEl: XmlElement
 ) {
   removeResourceDate('creation')(rootEl)
-  if (!('resourceCreated' in record)) return
+  if (!record.resourceCreated) return
   appendResourceDate(record.resourceCreated, 'creation')(rootEl)
 }
 
@@ -210,38 +215,18 @@ 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 writeReuseType(record: CatalogRecord, rootEl: XmlElement) {
+  writeKind(record, rootEl)
 }
 
-export function appendResponsibleParty(contact: Individual) {
+export function appendResponsibleParty(
+  contact: Individual,
+  defaultLanguage: LanguageCode
+) {
   const fullName = namePartsToFull(contact.firstName, contact.lastName)
 
   const createIndividual = pipe(
@@ -310,11 +295,11 @@ export function appendResponsibleParty(contact: Individual) {
   const createRole = pipe(
     createElement('cit:role'),
     createChild('cit:CI_RoleCode'),
-    addAttribute(
+    writeAttribute(
       'codeList',
       'https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode'
     ),
-    addAttribute('codeListValue', getRoleCode(contact.role)),
+    writeAttribute('codeListValue', getRoleCode(contact.role)),
     setTextContent(getRoleCode(contact.role))
   )
 
@@ -325,7 +310,11 @@ export function appendResponsibleParty(contact: Individual) {
       ? appendChildren(
           pipe(
             createElement('cit:name'),
-            writeCharacterString(contact.organization?.name)
+            writeLocalizedCharacterString(
+              contact.organization?.name,
+              contact.organization?.translations?.name,
+              defaultLanguage
+            )
           )
         )
       : noop,
@@ -345,7 +334,10 @@ export function writeContacts(record: CatalogRecord, rootEl: XmlElement) {
     removeChildrenByName('mdb:contact'),
     appendChildren(
       ...record.contacts.map((contact) =>
-        pipe(createElement('gmd:contact'), appendResponsibleParty(contact))
+        pipe(
+          createElement('gmd:contact'),
+          appendResponsibleParty(contact, record.defaultLanguage)
+        )
       )
     )
   )(rootEl)
@@ -368,7 +360,7 @@ export function writeContactsForResource(
       ...withoutDistributors.map((contact) =>
         pipe(
           createElement('mri:pointOfContact'),
-          appendResponsibleParty(contact)
+          appendResponsibleParty(contact, record.defaultLanguage)
         )
       )
     )
@@ -383,7 +375,7 @@ export function writeContactsForResource(
       ...distributors.map((contact) =>
         pipe(
           createElement('mrd:distributorContact'),
-          appendResponsibleParty(contact)
+          appendResponsibleParty(contact, record.defaultLanguage)
         )
       )
     )
@@ -394,7 +386,7 @@ export function writeKeywords(record: CatalogRecord, rootEl: XmlElement) {
   pipe(
     findOrCreateIdentification(),
     removeKeywords(),
-    appendKeywords(record.keywords)
+    appendKeywords(record.keywords, record.defaultLanguage)
   )(rootEl)
 }
 
@@ -416,7 +408,11 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
       'mrl:LI_Lineage',
       'mrl:statement'
     ),
-    writeCharacterString(record.lineage)
+    writeLocalizedCharacterString(
+      record.lineage,
+      record.translations?.lineage,
+      record.defaultLanguage
+    )
   )(rootEl)
 }
 
@@ -425,11 +421,11 @@ export function writeStatus(record: DatasetRecord, rootEl: XmlElement) {
   pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate('mri:status', 'mcc:MD_ProgressCode'),
-    addAttribute(
+    writeAttribute(
       'codeList',
       'https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ProgressCode'
     ),
-    addAttribute('codeListValue', progressCode),
+    writeAttribute('codeListValue', progressCode),
     setTextContent(progressCode)
   )(rootEl)
 }
@@ -438,17 +434,24 @@ export function writeSpatialRepresentation(
   record: DatasetRecord,
   rootEl: XmlElement
 ) {
+  if (!record.spatialRepresentation) {
+    pipe(
+      findOrCreateIdentification(),
+      removeChildrenByName('mri:spatialRepresentationType')
+    )(rootEl)
+    return
+  }
   pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate(
       'mri:spatialRepresentationType',
       'mcc:MD_SpatialRepresentationTypeCode'
     ),
-    addAttribute(
+    writeAttribute(
       'codeList',
       'https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_SpatialRepresentationTypeCode'
     ),
-    addAttribute('codeListValue', record.spatialRepresentation),
+    writeAttribute('codeListValue', record.spatialRepresentation),
     setTextContent(record.spatialRepresentation)
   )(rootEl)
 }
@@ -481,7 +484,7 @@ function removeTransferOptions(rootEl: XmlElement) {
   )(rootEl)
 }
 
-function appendDistributionFormat(mimeType: string) {
+function appendOnlineResourceFormat(mimeType: string) {
   return appendChildren(
     pipe(
       createElement('mrd:distributionFormat'),
@@ -494,11 +497,19 @@ 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)
+    return
+  }
+
+  // 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 +518,49 @@ export function writeDistributions(record: DatasetRecord, rootEl: XmlElement) {
         ),
         appendChildTree(createDistributionInfo())
       ),
-      appendDistribution(distribution, appendDistributionFormat)
+      appendOnlineResource(
+        onlineResource,
+        appendOnlineResourceFormat,
+        record.translations,
+        record.defaultLanguage
+      )
     )(rootEl)
   })
 }
+
+function writeLocaleElement(language: LanguageCode) {
+  const lang3 = LANG_2_TO_3_MAPPER[language.toLowerCase()]
+  return pipe(
+    findChildOrCreate('lan:PT_Locale'),
+    writeAttribute('id', language.toUpperCase()),
+    findNestedChildOrCreate('lan:language', 'gmd:LanguageCode'),
+    writeAttribute('codeList', 'http://www.loc.gov/standards/iso639-2/'),
+    writeAttribute('codeListValue', lang3)
+  )
+}
+
+export function writeDefaultLanguage(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  pipe(
+    findChildOrCreate('mdb:defaultLocale'),
+    writeLocaleElement(record.defaultLanguage)
+  )(rootEl)
+}
+
+export function writeOtherLanguages(record: DatasetRecord, rootEl: XmlElement) {
+  // clear existing
+  removeChildrenByName('mdb:otherLocale')(rootEl)
+
+  // do not write down languages if there is nothing else than the default one
+  if (!record.otherLanguages?.length) {
+    return
+  }
+
+  appendChildren(
+    ...record.otherLanguages.map((lang: LanguageCode) =>
+      pipe(createElement('mdb:otherLocale'), writeLocaleElement(lang))
+    )
+  )(rootEl)
+}