geonetwork-ui 2.4.0-dev.a2f3bb9f → 2.4.0-dev.a9a61288

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

@@ -94,7 +94,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -105,7 +105,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -116,7 +116,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -127,7 +127,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -138,7 +138,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -149,7 +149,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -160,7 +160,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -171,7 +171,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -182,7 +182,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.gemet'
         ),
       },
       type: 'theme',
@@ -193,7 +193,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.inspire-theme'
         ),
       },
       type: 'theme',
@@ -204,7 +204,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
         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'
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/external.theme.inspire-theme'
         ),
       },
       type: 'theme',
@@ -332,7 +332,32 @@ Die Quelle ist zu bezeichnen: „Quelle: Stadt Zürich“.`,
   securityConstraints: [],
   otherConstraints: [],
   // data quality?
-  spatialExtents: [],
+  spatialExtents: [
+    {
+      description: 'AK',
+    },
+    {
+      bbox: [
+        6.75599105586694, 45.7887442565203, 10.5418236945627, 47.5175655551557,
+      ],
+    },
+    {
+      geometry: {
+        type: 'MultiPolygon',
+        coordinates: [
+          [
+            [
+              [6.777075, 45.827119, 0],
+              [6.755991, 47.517566, 0],
+              [10.541824, 47.477984, 0],
+              [10.446252, 45.788744, 0],
+              [6.777075, 45.827119, 0],
+            ],
+          ],
+        ],
+      },
+    },
+  ],
   temporalExtents: [],
   status: 'completed',
   updateFrequency: 'asNeeded',

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

@@ -388,7 +388,11 @@ Depuis, ce sont les Districts routiers qui assurent la tenue à jour de ces info
     name: 'Direction Asset Management (SPW - Mobilité et Infrastructures - Direction Asset Management)',
   },
   securityConstraints: [],
-  spatialExtents: [],
+  spatialExtents: [
+    {
+      bbox: [2.75, 49.45, 6.5, 50.85],
+    },
+  ],
   spatialRepresentation: 'vector',
   status: 'ongoing',
   temporalExtents: [],

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

@@ -120,6 +120,7 @@ export const mapKeywords = (thesauri: Thesaurus[], language: string) => {
       keywords.push({
         label: selectTranslatedValue<string>(keyword, language),
         type: getKeywordTypeFromKeywordTypeCode(rawThesaurus.theme),
+        ...(keyword.link && { key: keyword.link }),
         ...(thesaurus && { thesaurus }),
       })
     }

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,31 @@
+export interface KeywordApiResponse {
+  values?: {
+    eng: string
+  }
+  definitions?: {
+    eng: 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/iso19139/iso19139.converter.ts

@@ -34,6 +34,7 @@ import {
   readResourcePublished,
   readResourceUpdated,
   readSecurityConstraints,
+  readSpatialExtents,
   readSpatialRepresentation,
   readStatus,
   readTemporalExtents,
@@ -60,6 +61,7 @@ import {
   writeResourcePublished,
   writeResourceUpdated,
   writeSecurityConstraints,
+  writeSpatialExtents,
   writeSpatialRepresentation,
   writeStatus,
   writeTemporalExtents,
@@ -101,8 +103,8 @@ export class Iso19139Converter extends BaseConverter<string> {
     distributions: readDistributions,
     onlineResources: readOnlineResources,
     temporalExtents: readTemporalExtents,
+    spatialExtents: readSpatialExtents,
     // TODO
-    spatialExtents: () => [],
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => [],
@@ -139,8 +141,8 @@ export class Iso19139Converter extends BaseConverter<string> {
     distributions: writeDistributions,
     onlineResources: writeOnlineResources,
     temporalExtents: writeTemporalExtents,
+    spatialExtents: () => writeSpatialExtents,
     // TODO
-    spatialExtents: () => undefined,
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => undefined,

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

@@ -4,7 +4,6 @@ import {
   GraphicOverview,
   Individual,
   Keyword,
-  KeywordThesaurus,
   Organization,
   RecordKind,
   RecordStatus,
@@ -14,6 +13,8 @@ import {
   UpdateFrequency,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ThesaurusModel } from '../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { Geometry } from 'geojson'
 import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
 import {
   ChainableFunction,
@@ -27,15 +28,17 @@ import {
   pipe,
 } from '../function-utils'
 import {
-  XmlElement,
   findChildElement,
   findChildrenElement,
   findNestedElement,
   findNestedElements,
   findParent,
+  firstChildElement,
   readAttribute,
   readText,
+  XmlElement,
 } from '../xml-utils'
+import { readGeometry } from './utils/geometry'
 import { fullNameToParts } from './utils/individual-name'
 import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
 import { getRoleFromRoleCode } from './utils/role.mapper'
@@ -66,6 +69,14 @@ export function extractDateTime(): ChainableFunction<XmlElement, Date> {
   )
 }
 
+export function extractDecimal(): ChainableFunction<XmlElement, number> {
+  return pipe(
+    findChildElement('gco:Decimal', false),
+    readText(),
+    map((numberStr) => (numberStr ? Number(numberStr) : null))
+  )
+}
+
 export function extractUrl(): ChainableFunction<XmlElement, URL> {
   const getUrl = pipe(findChildElement('gmd:URL', false), readText())
   const getCharacterString = pipe(
@@ -609,7 +620,7 @@ export function readContactsForResource(rootEl: XmlElement): Individual[] {
 }
 
 // from gmd:thesaurusName
-export function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
+export function readThesaurus(rootEl: XmlElement): ThesaurusModel {
   if (!rootEl) return null
 
   const findIdentifier = findNestedElement(
@@ -895,3 +906,62 @@ export function readTemporalExtents(rootEl: XmlElement) {
     })
   )(rootEl)
 }
+
+export function readSpatialExtents(rootEl: XmlElement) {
+  const extractGeometry = (rootEl: XmlElement): Geometry => {
+    if (!rootEl) return null
+    return pipe(
+      findChildElement('gmd:polygon', false),
+      firstChildElement,
+      map((el) => readGeometry(el))
+    )(rootEl)
+  }
+
+  const extractBBox = (
+    rootEl: XmlElement
+  ): [number, number, number, number] => {
+    if (!rootEl) return null
+    return pipe(
+      combine(
+        pipe(findChildElement('gmd:westBoundLongitude'), extractDecimal()),
+        pipe(findChildElement('gmd:southBoundLatitude'), extractDecimal()),
+        pipe(findChildElement('gmd:eastBoundLongitude'), extractDecimal()),
+        pipe(findChildElement('gmd:northBoundLatitude'), extractDecimal())
+      )
+    )(rootEl)
+  }
+
+  const extractDescription = (rootEl: XmlElement): string => {
+    if (!rootEl) return null
+    return pipe(
+      findNestedElement(
+        'gmd:geographicIdentifier',
+        'gmd:MD_Identifier',
+        'gmd:code'
+      ),
+      extractCharacterString()
+    )(rootEl)
+  }
+
+  return pipe(
+    findIdentification(),
+    findNestedElements('gmd:extent', 'gmd:EX_Extent', 'gmd:geographicElement'),
+    mapArray(
+      combine(
+        pipe(findChildElement('gmd:EX_BoundingPolygon'), extractGeometry),
+        pipe(findChildElement('gmd:EX_GeographicBoundingBox'), extractBBox),
+        pipe(
+          findChildElement('gmd:EX_GeographicDescription'),
+          extractDescription
+        )
+      )
+    ),
+    mapArray(([geometry, bbox, description]) => {
+      return {
+        ...(geometry && { geometry }),
+        ...(bbox && { bbox }),
+        ...(description && { description }),
+      }
+    })
+  )(rootEl)
+}

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

@@ -0,0 +1,39 @@
+import { XmlElement } from '@rgrove/parse-xml'
+import { Geometry } from 'geojson'
+import GML32 from 'ol/format/GML32'
+import GeoJSON from 'ol/format/GeoJSON'
+import { parse } from 'ol/xml'
+import {
+  createDocument,
+  getRootElement,
+  parseXmlString,
+  xmlToString,
+} from '../../xml-utils'
+
+export function readGeometry(el: XmlElement): Geometry {
+  const xmlDoc = createDocument(el)
+  xmlDoc.root.attributes['xmlns'] = 'http://www.opengis.net/gml/3.2'
+  const gmlString = xmlToString(xmlDoc)
+  const doc = parse(gmlString)
+  // we need an intermediate node to be able to parse the GML
+  const node = document.createElement('pre')
+  node.appendChild(doc.documentElement)
+  const gml32Format = new GML32()
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const geometry = gml32Format.readGeometryFromNode(node)
+  const geojsonFormat = new GeoJSON()
+  return geojsonFormat.writeGeometryObject(geometry)
+}
+
+export function writeGeometry(geometryObject: Geometry): XmlElement {
+  const geojsonFormat = new GeoJSON()
+  const geometry = geojsonFormat.readGeometry(geometryObject)
+  const gml32Format = new GML32()
+  const node = gml32Format.writeGeometryNode(geometry)
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const element = node.firstElementChild as HTMLElement
+  const gmlString = new XMLSerializer().serializeToString(element)
+  return getRootElement(parseXmlString(gmlString))
+}

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

@@ -1,4 +1,4 @@
-import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 export function getKeywordTypeFromKeywordTypeCode(
   typeCode: string

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

@@ -6,7 +6,6 @@ import {
   DatasetServiceDistribution,
   Individual,
   Keyword,
-  KeywordThesaurus,
   RecordStatus,
   Role,
   ServiceEndpoint,
@@ -15,7 +14,9 @@ import {
   UpdateFrequencyCode,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ThesaurusModel } from '../../../../../../libs/common/domain/src/lib/model/thesaurus'
 import format from 'date-fns/format'
+import { Geometry } from 'geojson'
 import {
   ChainableFunction,
   fallback,
@@ -45,6 +46,7 @@ import {
   setTextContent,
 } from '../xml-utils'
 import { readKind } from './read-parts'
+import { writeGeometry } from './utils/geometry'
 import { namePartsToFull } from './utils/individual-name'
 
 export function writeCharacterString(
@@ -101,6 +103,14 @@ export function writeDate(
   )
 }
 
+export function writeDecimal(
+  decimal: number
+): ChainableFunction<XmlElement, XmlElement> {
+  return tap(
+    pipe(findChildOrCreate('gco:Decimal'), setTextContent(decimal.toString()))
+  )
+}
+
 export function getProgressCode(status: RecordStatus): string {
   switch (status) {
     case 'completed':
@@ -367,7 +377,7 @@ export function removeKeywords() {
 }
 
 // returns a <gmd:thesaurusName> element
-export function createThesaurus(thesaurus: KeywordThesaurus) {
+export function createThesaurus(thesaurus: ThesaurusModel) {
   return pipe(
     createElement('gmd:thesaurusName'),
     createChild('gmd:CI_Citation'),
@@ -1184,3 +1194,62 @@ export function writeTemporalExtents(
     )
   )(rootEl)
 }
+
+export function writeSpatialExtents(record: DatasetRecord, rootEl: XmlElement) {
+  const appendBoundingPolygon = (geometry?: Geometry) => {
+    if (!geometry) return null
+    return pipe(
+      createElement('gmd:EX_BoundingPolygon'),
+      appendChildren(
+        pipe(
+          createElement('gmd:polygon'),
+          appendChildren(() => writeGeometry(geometry))
+        )
+      )
+    )
+  }
+
+  const appendGeographicBoundingBox = (
+    bbox?: [number, number, number, number]
+  ) => {
+    if (!bbox) return null
+    return pipe(
+      createElement('gmd:EX_GeographicBoundingBox'),
+      appendChildren(
+        pipe(createElement('gmd:westBoundLongitude'), writeDecimal(bbox[0])),
+        pipe(createElement('gmd:eastBoundLongitude'), writeDecimal(bbox[2])),
+        pipe(createElement('gmd:southBoundLatitude'), writeDecimal(bbox[1])),
+        pipe(createElement('gmd:northBoundLatitude'), writeDecimal(bbox[3]))
+      )
+    )
+  }
+
+  const appendGeographicDescription = (description?: string) => {
+    if (!description) return null
+    return pipe(
+      createElement('gmd:EX_GeographicDescription'),
+      createChild('gmd:geographicIdentifier'),
+      createChild('gmd:MD_Identifier'),
+      createChild('gmd:code'),
+      writeCharacterString(description)
+    )
+  }
+
+  pipe(
+    findOrCreateIdentification(),
+    findNestedChildOrCreate('gmd:extent', 'gmd:EX_Extent'),
+    removeChildrenByName('gmd:geographicElement'),
+    appendChildren(
+      ...record.spatialExtents.map((extent) =>
+        pipe(
+          createElement('gmd:geographicElement'),
+          appendChildren(
+            appendBoundingPolygon(extent.geometry),
+            appendGeographicBoundingBox(extent.bbox),
+            appendGeographicDescription(extent.description)
+          )
+        )
+      )
+    )
+  )(rootEl)
+}

package/src/libs/api/metadata-converter/src/lib/xml-utils.ts

@@ -6,6 +6,7 @@ import {
   XmlText,
 } from '@rgrove/parse-xml'
 import { ChainableFunction, fallback } from './function-utils'
+
 export { XmlDocument, XmlElement } from '@rgrove/parse-xml'
 
 export class XmlParseError extends Error {
@@ -115,6 +116,10 @@ export function allChildrenElement(element: XmlElement): Array<XmlElement> {
   ] as Array<XmlElement>
 }
 
+export function firstChildElement(element: XmlElement): XmlElement {
+  return allChildrenElement(element)[0] ?? null
+}
+
 /**
  * Will return all matching elements nested according to the given
  * names (similar to a path), starting form the input element;
@@ -228,6 +233,7 @@ export function xmlToString(
 ${padding}<${el.name}${attrs}/>
 ${parentPadding}`
   }
+
   return `
 ${padding}<${el.name}${attrs}>${children}</${el.name}>
 ${parentPadding}`
@@ -307,11 +313,13 @@ function getTreeRoot(element: XmlElement): XmlElement {
 
 // stays on the parent element
 // if the given elements are part of a subtree, will add the root of subtree
+// will filter out falsy elements
 export function appendChildren(
   ...childrenFns: Array<ChainableFunction<void, XmlElement>>
 ): ChainableFunction<XmlElement, XmlElement> {
   return (element) => {
     if (!element) return null
+    childrenFns = childrenFns.filter((fn) => fn)
     element.children.push(...childrenFns.map((fn) => fn()).map(getTreeRoot))
     element.children.forEach((el) => (el.parent = element))
     return element