geonetwork-ui 2.2.0-dev.8cce3b0e → 2.2.0-dev.91cd6a97

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

@@ -27,31 +27,192 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
   ],
   contactsForResource: [],
   recordCreated: new Date('2022-02-22T19:40:06'),
+  recordPublished: new Date('2022-02-22T19:40:06'),
   recordUpdated: new Date('2022-02-22T19:40:06'),
   datasetCreated: new Date('1999-01-01T00:00:00'),
   datasetUpdated: new Date('2009-01-01'),
   title: 'Alpenkonvention',
   abstract: `Perimeter der Alpenkonvention in der Schweiz. Die Alpenkonvention ist ein völkerrechtlicher Vertrag zwischen den acht Alpenländern Deutschland, Frankreich, Italien, Liechtenstein, Monaco, Österreich, Schweiz, Slowenien sowie der Europäischen Union. Das Ziel des Übereinkommens ist der Schutz der Alpen durch eine sektorübergreifende, ganzheitliche und nachhaltige Politik.`,
   overviews: [],
-  themes: [
-    'Aufbewahrungs- und Archivierungsplanung AAP - Bund',
-    'Geobasisdaten',
-    'e-geo.ch',
-    'opendata.swiss',
-    'Nachhaltige Entwicklung',
-    'Raumplanung',
-    'Bergschutz',
-    'Bodenschutz',
-    'Umweltpolitik',
-    'Umweltpolitik',
-    'Verkehr',
-    'Verkehr',
-    'Verkehr',
-    'Umweltüberwachung',
-    'Verwaltungseinheiten',
-    'BGDI Bundesgeodaten-Infrastruktur',
+  topics: ['planningCadastre', 'planningCadastre_Planning'],
+  keywords: [
+    {
+      thesaurus: {
+        name: 'geocat.ch',
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+      label: 'Aufbewahrungs- und Archivierungsplanung AAP - Bund',
+    },
+    {
+      thesaurus: {
+        name: 'geocat.ch',
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+      label: 'Geobasisdaten',
+    },
+    {
+      thesaurus: {
+        name: 'geocat.ch',
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+      label: 'e-geo.ch',
+    },
+    {
+      label: 'opendata.swiss',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        name: 'geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Nachhaltige Entwicklung',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Raumplanung',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Bergschutz',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Bodenschutz',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Umweltpolitik',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Umweltpolitik',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Umweltüberwachung',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.inspire-theme',
+        name: 'GEMET - INSPIRE themes, version 1.0',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verwaltungseinheiten',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.inspire-theme',
+        name: 'GEMET - INSPIRE themes, version 1.0',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'BGDI Bundesgeodaten-Infrastruktur',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        name: 'geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
   ],
-  keywords: [],
   spatialRepresentation: 'vector',
   distributions: [
     {
@@ -199,6 +360,7 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
     },
   ],
   recordCreated: new Date('2022-03-07T01:15:51+01:00'),
+  recordPublished: new Date('2022-03-07T01:15:51+01:00'),
   recordUpdated: new Date('2022-03-07T01:15:51+01:00'),
   title: 'Verkehrsregelungsanlagen (WMS)',
   abstract: `Diese Karte beinhaltet die Verkehrsregelungsanlagen des Kantons St.Gallen.`,
@@ -210,8 +372,31 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
       description: 'Vorschaubild',
     },
   ],
-  themes: [],
-  keywords: ['Verkehr', 'opendata.swiss'],
+  topics: [],
+  keywords: [
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'other',
+    },
+    {
+      label: 'opendata.swiss',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        name: 'geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'other',
+    },
+  ],
   onlineResources: [
     {
       type: 'link',

package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts

@@ -3,6 +3,8 @@ import {
   Organization,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getRoleFromRoleCode } from '../iso19139/codelists/role.mapper'
+import { Thesaurus } from './types'
+import { getKeywordTypeFromKeywordTypeCode } from '../iso19139/codelists/keyword.mapper'
 
 export type SourceWithUnknownProps = { [key: string]: unknown }
 
@@ -98,3 +100,30 @@ export const mapContact = (
     ...(phone && { phone }),
   }
 }
+
+export const mapKeywords = (thesauri: Thesaurus[], language: string) => {
+  const keywords = []
+  for (const thesaurusId in thesauri) {
+    const rawThesaurus = thesauri[thesaurusId]
+    let thesaurus = null
+    if (rawThesaurus.id) {
+      const thesaurusSource: SourceWithUnknownProps = { ...rawThesaurus }
+      const url = getAsUrl(selectField(thesaurusSource, 'link'))
+      const name = selectField(thesaurusSource, 'title')
+      thesaurus = {
+        id: rawThesaurus.id,
+        ...(name && { name }),
+        ...(url && { url }),
+      }
+    }
+    for (const keyword of rawThesaurus.keywords) {
+      keywords.push({
+        label: selectTranslatedValue<string>(keyword, language),
+        type: getKeywordTypeFromKeywordTypeCode(rawThesaurus.theme),
+        ...(thesaurus && { thesaurus }),
+      })
+    }
+  }
+
+  return keywords
+}

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

@@ -4,6 +4,7 @@ import {
   getAsUrl,
   getFirstValue,
   mapContact,
+  mapKeywords,
   selectFallback,
   selectFallbackFields,
   selectField,
@@ -27,7 +28,8 @@ import {
   OnlineLinkResource,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchProtocol } from '../common/distribution.mapper'
-import { LangService } from '../../../../../../libs/util/i18n/src'
+import { Thesaurus } from './types'
+import { LANG_3_TO_2_MAPPER, LangService } from '../../../../../../libs/util/i18n/src'
 
 type ESResponseSource = SourceWithUnknownProps
 
@@ -92,8 +94,8 @@ export class Gn4FieldMapper {
     },
     cl_topic: (output, source) => ({
       ...output,
-      themes: [
-        ...(output.themes || []),
+      topics: [
+        ...(output.topics || []),
         ...getAsArray(
           selectField<SourceWithUnknownProps[]>(source, 'cl_topic')
         ).map((topic) => selectTranslatedValue<string>(topic, this.lang3)),
@@ -130,6 +132,22 @@ export class Gn4FieldMapper {
       ...output,
       recordUpdated: toDate(selectField<string>(source, 'changeDate')),
     }),
+    publicationDateForResource: (output, source) => ({
+      ...output,
+      recordPublished: toDate(
+        selectField<string>(source, 'publicationDateForResource')
+      ),
+    }),
+    resourceLanguage: (output, source) => {
+      const langList = getAsArray(
+        selectField<string>(source, 'resourceLanguage')
+      )
+      const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      return {
+        ...output,
+        languages,
+      }
+    },
     link: (output, source) => {
       const rawLinks = getAsArray(
         selectField<SourceWithUnknownProps[]>(source, 'link')
@@ -171,16 +189,17 @@ export class Gn4FieldMapper {
         output
       )
     },
-    tag: (output, source) => ({
+    allKeywords: (output, source) => ({
       ...output,
-      keywords: getAsArray(
-        selectField<SourceWithUnknownProps[]>(source, 'tag')
-      ).map((tag) => selectTranslatedValue<string>(tag, this.lang3)),
+      keywords: mapKeywords(
+        selectField<Thesaurus[]>(source, 'allKeywords'),
+        this.lang3
+      ),
     }),
     inspireTheme: (output, source) => ({
       ...output,
-      themes: [
-        ...(output.themes || []),
+      topics: [
+        ...(output.topics || []),
         ...getAsArray(selectField(source, 'inspireTheme_syn')),
       ],
     }),
@@ -289,9 +308,9 @@ export class Gn4FieldMapper {
         ],
       }
     },
-    resourceTemporalDateRange: (output, source) => {
+    resourceTemporalExtentDateRange: (output, source) => {
       const ranges = getAsArray(
-        selectField(source, 'resourceTemporalDateRange')
+        selectField(source, 'resourceTemporalExtentDateRange')
       )
       return {
         ...output,

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

@@ -24,6 +24,7 @@ export class Gn4MetadataMapper extends MetadataBaseMapper<Gn4Record> {
       status: null,
       lineage: null,
       recordUpdated: null,
+      recordPublished: null,
       ownerOrganization: null,
       licenses: [],
       legalConstraints: [],
@@ -32,10 +33,11 @@ export class Gn4MetadataMapper extends MetadataBaseMapper<Gn4Record> {
       contacts: [],
       contactsForResource: [],
       keywords: [],
-      themes: [],
+      topics: [],
       spatialExtents: [],
       temporalExtents: [],
       overviews: [],
+      languages: [],
     }
     const record: CatalogRecord = Object.keys(_source).reduce(
       (prev, fieldName) =>

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

@@ -56,15 +56,13 @@ interface SpecificationConformance {
   pass: BooleanString
 }
 
-type Keyword = MultilingualField
-type Keywords = Keyword[]
 type ThesaurusName = string
-interface Thesaurus {
+export interface Thesaurus {
   id?: string
   title?: string
   theme?: string
   link?: string
-  keywords: Keywords
+  keywords: MultilingualField[]
 }
 
 export interface Link {
@@ -152,6 +150,7 @@ export type MetadataObject = Partial<{
   pointOfContactOrg: string
   pointOfContactOrgForResource: string
   popularity: number
+  publicationDateForResource: string
   rating: string
   record: string
   recordGroup: string
@@ -175,7 +174,7 @@ export type MetadataObject = Partial<{
   specificationConformance: MaybeArray<SpecificationConformance>
   standardNameObject: MultilingualField
   standardVersionObject: MultilingualField
-  tag: Keywords
+  tag: MultilingualField[]
   tagNumber: string
   userSavedCount: string
   userinfo: string

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

@@ -0,0 +1,16 @@
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/record'
+
+export function getKeywordTypeFromKeywordTypeCode(
+  typeCode: string
+): KeywordType {
+  if (!typeCode) return 'other'
+  switch (typeCode) {
+    case 'theme':
+    case 'place':
+    case 'temporal':
+    case 'other':
+      return typeCode
+    default:
+      return 'other'
+  }
+}

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

@@ -29,7 +29,7 @@ import {
   writeSecurityConstraints,
   writeSpatialRepresentation,
   writeStatus,
-  writeThemes,
+  writeTopics,
   writeTitle,
   writeUniqueIdentifier,
   writeUpdateFrequency,
@@ -51,12 +51,12 @@ import {
   readOverviews,
   readOwnerOrganization,
   readRecordUpdated,
+  readRecordPublished,
   readSecurityConstraints,
   readSpatialExtents,
   readSpatialRepresentation,
   readStatus,
   readTemporalExtents,
-  readThemes,
   readTitle,
   readUniqueIdentifier,
   readUpdateFrequency,
@@ -75,17 +75,15 @@ export function toModel(xml: string): CatalogRecord {
   const contacts = readContacts(rootEl)
   const recordUpdated = readRecordUpdated(rootEl)
   const recordCreated = recordUpdated
+  const recordPublished = readRecordPublished(rootEl)
   const keywords = readKeywords(rootEl)
-  const themes = readThemes(rootEl)
+  const topics = readIsoTopics(rootEl)
   const legalConstraints = readLegalConstraints(rootEl)
   const otherConstraints = readOtherConstraints(rootEl)
   const securityConstraints = readSecurityConstraints(rootEl)
   const licenses = readLicenses(rootEl)
   const overviews = readOverviews(rootEl)
 
-  // not used yet
-  const isoTopics = readIsoTopics(rootEl)
-
   if (kind === 'dataset') {
     const status = readStatus(rootEl)
     const datasetCreated = readDatasetCreated(rootEl)
@@ -102,6 +100,7 @@ export function toModel(xml: string): CatalogRecord {
       kind,
       recordCreated,
       recordUpdated,
+      recordPublished,
       status,
       title,
       abstract,
@@ -109,7 +108,7 @@ export function toModel(xml: string): CatalogRecord {
       contacts,
       contactsForResource: [], // FIXME: is that really useful??
       keywords,
-      themes,
+      topics,
       licenses,
       legalConstraints,
       securityConstraints,
@@ -131,12 +130,13 @@ export function toModel(xml: string): CatalogRecord {
       kind,
       recordCreated,
       recordUpdated,
+      recordPublished,
       title,
       abstract,
       ownerOrganization,
       contacts,
       keywords,
-      themes,
+      topics,
       licenses,
       legalConstraints,
       securityConstraints,
@@ -168,7 +168,7 @@ export function toXml(record: CatalogRecord, originalXml?: string): string {
   writeAbstract(record, rootEl)
   fieldChanged('contacts') && writeContacts(record, rootEl)
   fieldChanged('keywords') && writeKeywords(record, rootEl)
-  fieldChanged('themes') && writeThemes(record, rootEl)
+  fieldChanged('topics') && writeTopics(record, rootEl)
   fieldChanged('legalConstraints') && writeLegalConstraints(record, rootEl)
   fieldChanged('securityConstraints') &&
     writeSecurityConstraints(record, rootEl)

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

@@ -5,6 +5,8 @@ import {
   DatasetTemporalExtent,
   GraphicOverview,
   Individual,
+  Keyword,
+  KeywordThesaurus,
   Organization,
   RecordKind,
   RecordStatus,
@@ -39,6 +41,7 @@ import {
 } from '../function-utils'
 import { getRoleFromRoleCode } from './codelists/role.mapper'
 import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
+import { getKeywordTypeFromKeywordTypeCode } from './codelists/keyword.mapper'
 
 function extractCharacterString(): ChainableFunction<XmlElement, string> {
   return pipe(
@@ -447,7 +450,7 @@ function findIdentification() {
   }
 }
 
-function extractCitationDate(type: 'creation' | 'revision') {
+function extractCitationDate(type: 'creation' | 'revision' | 'publication') {
   return pipe(
     findIdentification(),
     findNestedElements('gmd:citation', 'gmd:CI_Citation', 'gmd:date'),
@@ -514,6 +517,10 @@ export function readRecordUpdated(rootEl: XmlElement): Date {
   return pipe(findChildElement('gmd:dateStamp'), extractDateTime())(rootEl)
 }
 
+export function readRecordPublished(rootEl: XmlElement): Date {
+  return pipe(findChildElement('gmd:dateStamp'), extractDateTime())(rootEl)
+}
+
 export function readTitle(rootEl: XmlElement): string {
   return pipe(
     findIdentification(),
@@ -552,29 +559,60 @@ export function readContacts(rootEl: XmlElement): Individual[] {
   )(rootEl)
 }
 
-function readKeywordsOfType(isTheme: boolean) {
-  return pipe(
-    findIdentification(),
-    findNestedElements('gmd:descriptiveKeywords', 'gmd:MD_Keywords'),
-    filterArray(
-      pipe(
-        findChildrenElement('gmd:MD_KeywordTypeCode'),
-        mapArray(readAttribute('codeListValue')),
-        map((values) => isTheme === values.indexOf('theme') > -1)
-      )
-    ),
-    mapArray(findChildrenElement('gmd:keyword')),
-    flattenArray(),
-    mapArray(extractCharacterString())
+// from gmd:thesaurusName
+function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
+  if (!rootEl) return null
+
+  const findIdentifier = findNestedElement(
+    'gmd:CI_Citation',
+    'gmd:identifier',
+    'gmd:MD_Identifier',
+    'gmd:code'
   )
+  const id = pipe(findIdentifier, extractCharacterString())(rootEl)
+  const url = pipe(findIdentifier, extractUrl())(rootEl)
+  const name = pipe(
+    findNestedElement('gmd:CI_Citation', 'gmd:title'),
+    extractCharacterString()
+  )(rootEl)
+  return {
+    id,
+    ...(name && { name }),
+    ...(url && { url }),
+  }
 }
 
-export function readKeywords(rootEl: XmlElement): string[] {
-  return readKeywordsOfType(false)(rootEl)
+// from gmd:MD_Keywords
+function readKeywordGroup(rootEl: XmlElement): Keyword[] {
+  const type = pipe(
+    findChildrenElement('gmd:MD_KeywordTypeCode'),
+    mapArray(readAttribute('codeListValue')),
+    map((values) => getKeywordTypeFromKeywordTypeCode(values[0]))
+  )(rootEl)
+  const thesaurus = pipe(
+    findNestedElement('gmd:thesaurusName'),
+    readThesaurus
+  )(rootEl)
+  return pipe(
+    findChildrenElement('gmd:keyword'),
+    mapArray((el) => {
+      const label = extractCharacterString()(el)
+      return {
+        ...(thesaurus ? { thesaurus } : {}),
+        label,
+        type,
+      } as Keyword
+    })
+  )(rootEl)
 }
 
-export function readThemes(rootEl: XmlElement): string[] {
-  return readKeywordsOfType(true)(rootEl)
+export function readKeywords(rootEl: XmlElement): Keyword[] {
+  return pipe(
+    findIdentification(),
+    findNestedElements('gmd:descriptiveKeywords', 'gmd:MD_Keywords'),
+    mapArray(readKeywordGroup),
+    flattenArray()
+  )(rootEl)
 }
 
 export function readStatus(rootEl: XmlElement): RecordStatus {
@@ -627,7 +665,7 @@ export function readLicenses(rootEl: XmlElement): Constraint[] {
 export function readIsoTopics(rootEl: XmlElement): string[] {
   return pipe(
     findIdentification(),
-    findChildrenElement('gmd:MD_TopicCategoryCode', false),
+    findChildrenElement('gmd:MD_TopicCategoryCode', true),
     mapArray(readText())
   )(rootEl)
 }