geonetwork-ui 2.10.3-dev.4154db07d → 2.11.0-dev.0559cfd9d

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

@@ -5,11 +5,13 @@ import {
   findNestedElements,
   findParent,
   readAttribute,
+  readText,
   XmlElement,
 } from '../xml-utils'
 import {
   ChainableFunction,
   combine,
+  fallback,
   filterArray,
   flattenArray,
   getAtIndex,
@@ -32,6 +34,9 @@ import {
 } from '../iso19139/read-parts'
 import {
   AssociatedRecord,
+  DatasetFeatureAttribute,
+  DatasetFeatureAttributeValue,
+  DatasetFeatureType,
   Individual,
   LanguageCode,
   SourceRecord,
@@ -411,3 +416,108 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
     )
   )(rootEl)
 }
+
+function extractCharacterStringOrText(): ChainableFunction<XmlElement, string> {
+  return fallback(extractCharacterString(), readText())
+}
+
+function extractListedValue(): ChainableFunction<
+  XmlElement,
+  DatasetFeatureAttributeValue
+> {
+  return pipe(
+    combine(
+      pipe(findChildElement('gfc:code', false), extractCharacterString()),
+      pipe(findChildElement('gfc:label', false), extractCharacterString()),
+      pipe(findChildElement('gfc:definition', false), extractCharacterString())
+    ),
+    map(([code, label, description]) => ({
+      value: code ?? '',
+      ...(label && { label }),
+      ...(description && { description }),
+    }))
+  )
+}
+
+function extractFeatureAttribute(): ChainableFunction<
+  XmlElement,
+  DatasetFeatureAttribute
+> {
+  return pipe(
+    combine(
+      pipe(
+        findChildElement('gfc:memberName', false),
+        extractCharacterStringOrText()
+      ),
+      pipe(
+        findChildElement('gfc:designation', false),
+        extractCharacterString()
+      ),
+      pipe(findChildElement('gfc:definition', false), extractCharacterString()),
+      pipe(findChildElement('gfc:code', false), extractCharacterString()),
+      pipe(
+        findNestedElement('gfc:valueType', 'gco:TypeName', 'gco:aName'),
+        extractCharacterString()
+      ),
+      pipe(
+        findNestedElements('gfc:listedValue', 'gfc:FC_ListedValue'),
+        mapArray(extractListedValue()),
+        filterArray((value) => !!(value.value || value.label))
+      )
+    ),
+    map(([name, label, description, code, type, values]) => ({
+      name: name ?? '',
+      ...(label && { label }),
+      ...(description && { description }),
+      ...(code && { code }),
+      ...(type && { type }),
+      ...(values.length > 0 && { values }),
+    }))
+  )
+}
+
+export function readFeatureTypeDescriptions(
+  rootEl: XmlElement
+): Array<DatasetFeatureType> {
+  return pipe(
+    findNestedElements(
+      'mdb:contentInfo',
+      'mrc:MD_FeatureCatalogue',
+      'mrc:featureCatalogue',
+      'gfc:FC_FeatureCatalogue',
+      'gfc:featureType',
+      'gfc:FC_FeatureType'
+    ),
+    mapArray(
+      pipe(
+        combine(
+          pipe(
+            findChildElement('gfc:typeName', false),
+            extractCharacterStringOrText()
+          ),
+          pipe(
+            findChildElement('gfc:designation', false),
+            extractCharacterString()
+          ),
+          pipe(
+            findChildElement('gfc:definition', false),
+            extractCharacterString()
+          ),
+          pipe(
+            findNestedElements(
+              'gfc:carrierOfCharacteristics',
+              'gfc:FC_FeatureAttribute'
+            ),
+            mapArray(extractFeatureAttribute())
+          )
+        ),
+        map(([name, label, description, attributes]) => ({
+          name: name ?? '',
+          ...(label && { label }),
+          ...(description && { description }),
+          attributes,
+        }))
+      )
+    )
+  )(rootEl)
+}

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

@@ -1,5 +1,8 @@
 import {
   CatalogRecord,
+  DatasetFeatureAttribute,
+  DatasetFeatureAttributeValue,
+  DatasetFeatureType,
   DatasetRecord,
   Individual,
   LanguageCode,
@@ -587,7 +590,7 @@ export function writeAssociatedRecords(
     removeChildrenByName('mri:associatedResource'),
     appendChildren(
       ...record.associatedRecords
-        .filter((assoc) => assoc.uuid && assoc.associationType)
+        .filter((assoc) => assoc.uniqueIdentifier && assoc.associationType)
         .map((assoc) =>
           pipe(
             createNestedElement(
@@ -608,7 +611,7 @@ export function writeAssociatedRecords(
               ),
               pipe(
                 createElement('mri:metadataReference'),
-                writeAttribute('uuidref', assoc.uuid)
+                writeAttribute('uuidref', assoc.uniqueIdentifier)
               )
             )
           )
@@ -616,3 +619,131 @@ export function writeAssociatedRecords(
     )
   )(rootEl)
 }
+
+function createNilElement(name: string, nilReason: string) {
+  return pipe(createElement(name), writeAttribute('gco:nilReason', nilReason))
+}
+
+function createFeatureCatalogueShell() {
+  return pipe(
+    createNestedElement(
+      'mdb:contentInfo',
+      'mrc:MD_FeatureCatalogue',
+      'mrc:featureCatalogue',
+      'gfc:FC_FeatureCatalogue'
+    ),
+    // create mandatory elements which are not part of the model yet
+    appendChildren(
+      createNilElement('cat:name', 'missing'),
+      createNilElement('cat:scope', 'missing'),
+      createNilElement('cat:versionNumber', 'missing'),
+      createNilElement('cat:versionDate', 'missing'),
+      createNilElement('gfc:producer', 'missing')
+    )
+  )
+}
+
+function createListedValue(value: DatasetFeatureAttributeValue) {
+  return pipe(
+    createNestedElement('gfc:listedValue', 'gfc:FC_ListedValue'),
+    appendChildren(
+      value.label
+        ? pipe(createElement('gfc:label'), writeCharacterString(value.label))
+        : createNilElement('gfc:label', 'missing'),
+      value.value
+        ? pipe(createElement('gfc:code'), writeCharacterString(value.value))
+        : null,
+      value.description
+        ? pipe(
+            createElement('gfc:definition'),
+            writeCharacterString(value.description)
+          )
+        : null
+    )
+  )
+}
+
+function createFeatureAttribute(attribute: DatasetFeatureAttribute) {
+  return pipe(
+    createNestedElement(
+      'gfc:carrierOfCharacteristics',
+      'gfc:FC_FeatureAttribute'
+    ),
+    appendChildren(
+      pipe(createElement('gfc:memberName'), setTextContent(attribute.name)),
+      attribute.description
+        ? pipe(
+            createElement('gfc:definition'),
+            writeCharacterString(attribute.description)
+          )
+        : null,
+      createNilElement('gfc:cardinality', 'missing'),
+      attribute.label
+        ? pipe(
+            createElement('gfc:designation'),
+            writeCharacterString(attribute.label)
+          )
+        : null,
+      attribute.code
+        ? pipe(createElement('gfc:code'), writeCharacterString(attribute.code))
+        : null,
+      attribute.type
+        ? pipe(
+            createNestedElement('gfc:valueType', 'gco:TypeName', 'gco:aName'),
+            writeCharacterString(attribute.type)
+          )
+        : null,
+      ...(attribute.values ?? [])
+        .filter((value) => value.value || value.label)
+        .map(createListedValue)
+    )
+  )
+}
+
+function createFeatureType(featureType: DatasetFeatureType) {
+  return pipe(
+    createNestedElement('gfc:featureType', 'gfc:FC_FeatureType'),
+    appendChildren(
+      pipe(createElement('gfc:typeName'), setTextContent(featureType.name)),
+      featureType.description
+        ? pipe(
+            createElement('gfc:definition'),
+            writeCharacterString(featureType.description)
+          )
+        : null,
+      pipe(
+        createNestedElement('gfc:isAbstract', 'gco:Boolean'),
+        setTextContent('false')
+      ),
+      featureType.label
+        ? pipe(
+            createElement('gfc:designation'),
+            writeCharacterString(featureType.label)
+          )
+        : null,
+      ...featureType.attributes.map(createFeatureAttribute),
+      createNilElement('gfc:featureCatalogue', 'missing')
+    )
+  )
+}
+
+export function writeFeatureTypeDescriptions(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  const featureTypes = record.featureTypeDescriptions ?? []
+  const catalogues = findNestedElements(
+    'mdb:contentInfo',
+    'mrc:MD_FeatureCatalogue',
+    'mrc:featureCatalogue',
+    'gfc:FC_FeatureCatalogue'
+  )(rootEl)
+  catalogues.forEach((catalogue) =>
+    removeChildrenByName('gfc:featureType')(catalogue)
+  )
+  if (!featureTypes.length) return
+
+  const catalogue =
+    catalogues[0] ?? appendChildTree(createFeatureCatalogueShell())(rootEl)
+  appendChildren(...featureTypes.map(createFeatureType))(catalogue)
+}

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

@@ -118,6 +118,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: readLineage,
     sourceRecords: readSourceRecords,
     associatedRecords: readAssociatedRecords,
+    featureTypeDescriptions: () => undefined,
     onlineResources: readOnlineResources,
     temporalExtents: readTemporalExtents,
     spatialExtents: readSpatialExtents,
@@ -161,6 +162,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: writeLineage,
     sourceRecords: writeSourceRecords,
     associatedRecords: writeAssociatedRecords,
+    featureTypeDescriptions: () => undefined,
     onlineResources: writeOnlineResources,
     temporalExtents: writeTemporalExtents,
     spatialExtents: writeSpatialExtents,
@@ -306,6 +308,10 @@ export class Iso19139Converter extends BaseConverter<string> {
       const sourceRecords = this.readers['sourceRecords'](rootEl, tr)
       const associatedRecords = this.readers['associatedRecords'](rootEl, tr)
       const updateFrequency = this.readers['updateFrequency'](rootEl, tr)
+      const featureTypeDescriptions = this.readers['featureTypeDescriptions'](
+        rootEl,
+        tr
+      ) as DatasetRecord['featureTypeDescriptions']
 
       return this.afterRecordRead({
         ...this.readBaseRecord(rootEl, tr),
@@ -317,6 +323,7 @@ export class Iso19139Converter extends BaseConverter<string> {
         ...(spatialRepresentation && { spatialRepresentation }),
         temporalExtents,
         updateFrequency,
+        ...(featureTypeDescriptions?.length && { featureTypeDescriptions }),
         translations: tr,
       } as DatasetRecord)
     } else if (kind === 'reuse') {
@@ -416,6 +423,8 @@ export class Iso19139Converter extends BaseConverter<string> {
 
     if (record.kind === 'dataset') {
       fieldChanged('status') && this.writers['status'](record, rootEl)
+      fieldChanged('featureTypeDescriptions') &&
+        this.writers['featureTypeDescriptions'](record, rootEl)
     }
     if (record.kind === 'dataset' || record.kind === 'reuse') {
       fieldChanged('updateFrequency') &&

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

@@ -51,6 +51,7 @@ import {
   readText,
   XmlElement,
 } from '../xml-utils'
+import { getAssociationTypeFromCode } from './utils/association-type.mapper'
 import { readGeometry } from './utils/geometry'
 import { fullNameToParts } from './utils/individual-name'
 import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
@@ -68,7 +69,8 @@ export function extractCharacterString(): ChainableFunction<
     fallback(
       findChildElement('gco:CharacterString', false),
       findChildElement('gmx:Anchor', false),
-      findChildElement('gmx:MimeFileType', false)
+      findChildElement('gmx:MimeFileType', false),
+      findChildElement('gco:LocalName', false)
     ),
     readText()
   )
@@ -931,19 +933,22 @@ export function readSourceRecords(rootEl: XmlElement): SourceRecord[] {
 export function extractAssociatedRecords(
   containerName: string,
   aggregateName: string,
-  readUuid: ChainableFunction<XmlElement, string>
+  readIdentifier: ChainableFunction<XmlElement, string>
 ): ChainableFunction<XmlElement, AssociatedRecord[]> {
   return pipe(
     findChildrenElement(containerName, false),
     mapArray((el) => {
       const aggregateEl = findChildElement(aggregateName, false)(el)
-      const uuid = readUuid(aggregateEl)
-      const associationType = pipe(
+      const uniqueIdentifier = readIdentifier(aggregateEl)
+      const associationTypeCode = pipe(
         findNestedElement('gmd:associationType', 'gmd:DS_AssociationTypeCode'),
         readAttribute('codeListValue')
       )(aggregateEl)
-      if (!uuid || !associationType) return null
-      return { uuid, associationType }
+      if (!uniqueIdentifier || !associationTypeCode) return null
+      return {
+        uniqueIdentifier,
+        associationType: getAssociationTypeFromCode(associationTypeCode),
+      }
     }),
     filterArray((r): r is AssociatedRecord => r !== null)
   )

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

@@ -0,0 +1,12 @@
+import {
+  AssociationType,
+  associationTypeValues,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
+
+export function getAssociationTypeFromCode(
+  associationTypeCode: string
+): AssociationType {
+  return associationTypeValues.includes(associationTypeCode as AssociationType)
+    ? (associationTypeCode as AssociationType)
+    : 'crossReference'
+}

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

@@ -1276,7 +1276,7 @@ export function writeAssociatedRecords(
     removeChildrenByName('gmd:aggregationInfo'),
     appendChildren(
       ...record.associatedRecords
-        .filter((assoc) => assoc.uuid && assoc.associationType)
+        .filter((assoc) => assoc.uniqueIdentifier && assoc.associationType)
         .map((assoc) =>
           pipe(
             createNestedElement(
@@ -1290,7 +1290,7 @@ export function writeAssociatedRecords(
                   'gmd:MD_Identifier',
                   'gmd:code'
                 ),
-                writeCharacterString(assoc.uuid)
+                writeCharacterString(assoc.uniqueIdentifier)
               ),
               pipe(
                 createNestedElement(