geonetwork-ui 2.3.2 → 2.4.0-alpha.1.2ade9018

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'
@@ -149,22 +146,34 @@ export class Gn4FieldMapper {
         selectField<string>(source, 'resourceLanguage')
       )
       const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null // set the first language as main one as fallback
+      const otherLanguages = languages.filter(
+        (lang) => lang !== defaultLanguage
+      )
       return {
         ...output,
-        languages,
+        defaultLanguage,
+        otherLanguages,
+      }
+    },
+    mainLanguage: (output, source) => {
+      const language = selectField<string>(source, 'mainLanguage')
+      return {
+        ...output,
+        defaultLanguage: language ? LANG_3_TO_2_MAPPER[language] : null,
       }
     },
     link: (output, source) => {
       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,
@@ -249,7 +258,6 @@ export class Gn4FieldMapper {
       ...output,
       lineage: selectTranslatedField(source, 'lineageObject', this.lang3),
     }),
-    mainLanguage: (output) => output,
     userSavedCount: (output, source) =>
       this.addExtra(
         {
@@ -287,7 +295,7 @@ export class Gn4FieldMapper {
       return {
         ...output,
         kind,
-      }
+      } as CatalogRecord
     },
     geom: (output, source) => {
       const geoms = getAsArray(selectField(source, 'geom'))
@@ -387,7 +395,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 +414,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 +458,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/index.ts

@@ -1,3 +1,4 @@
 export * from './elasticsearch.model'
 export * from './search.model'
 export * from './metadata.model'
+export * from './keywords.model'

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

@@ -0,0 +1,27 @@
+export interface KeywordApiResponse {
+  values?: Record<string, string>
+  definitions?: Record<string, string>
+  coordEast?: string
+  coordWest?: string
+  coordSouth?: string
+  coordNorth?: string
+  thesaurusKey?: string
+  definition?: string
+  value?: string
+  uri?: string
+}
+
+export interface ThesaurusApiResponse {
+  key?: string
+  dname?: string
+  description?: string[] | string
+  filename?: string
+  title?: string
+  multilingualTitles?: string[]
+  dublinCoreMultilinguals?: string[]
+  date?: string
+  url?: string
+  defaultNamespace?: string
+  type?: string
+  activated?: string
+}

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

@@ -5,6 +5,7 @@ type MultilingualField = {
   [K in `lang${LangCode}`]: string
 } & {
   default: string
+  link?: string
 }
 
 type BooleanString = 'true' | 'false'

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

@@ -4,25 +4,28 @@ import { Iso19139Converter } from '../iso19139'
 import { renameElements } from '../xml-utils'
 import {
   readContacts,
-  readDistributions,
+  readContactsForResource,
+  readDefaultLanguage,
   readKind,
   readLandingPage,
   readLineage,
+  readOnlineResources,
+  readOtherLanguages,
   readOwnerOrganization,
   readRecordCreated,
   readRecordPublished,
   readRecordUpdated,
-  readResourceContacts,
   readUniqueIdentifier,
 } from './read-parts'
 import {
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
+  writeDefaultLanguage,
   writeKind,
   writeLandingPage,
   writeLineage,
-  writeOwnerOrganization,
+  writeOnlineResources,
+  writeOtherLanguages,
   writeRecordCreated,
   writeRecordPublished,
   writeRecordUpdated,
@@ -44,11 +47,13 @@ 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.writers['uniqueIdentifier'] = writeUniqueIdentifier
     this.writers['kind'] = writeKind
@@ -60,12 +65,14 @@ 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
+    this.writers['defaultLanguage'] = writeDefaultLanguage
+    this.writers['otherLanguages'] = writeOtherLanguages
   }
 
   beforeDocumentCreation(rootEl: XmlElement) {
@@ -82,7 +89,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,27 @@ import {
 } from '../function-utils'
 import {
   extractCharacterString,
-  extractDatasetDistributions,
+  extractDatasetOnlineResources,
   extractDateTime,
+  extractLocalizedCharacterString,
   extractRole,
+  extractServiceOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
 import {
-  DatasetDistribution,
   Individual,
+  LanguageCode,
+  OnlineResource,
   Organization,
+  OrganizationTranslations,
   RecordKind,
+  RecordTranslations,
   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'
 
 export function readKind(rootEl: XmlElement): RecordKind {
   return pipe(
@@ -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)
 }
 
@@ -320,10 +334,39 @@ 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)
 }
+
+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)
+}