geonetwork-ui 2.4.0-dev.83f48876 → 2.4.0-dev.8b395cf5

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',
@@ -222,7 +222,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
     },
   ],
   spatialRepresentation: 'vector',
-  distributions: [
+  onlineResources: [
     {
       type: 'link',
       url: new URL('https://map.geo.admin.ch/?layers=ch.are.alpenkonvention'),
@@ -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

@@ -68,7 +68,7 @@ Toutes ces données sont reprises dans BDR.`,
   resourceCreated: new Date('2002-01-01'),
   resourceUpdated: new Date('2022-06-16'),
   resourcePublished: new Date('2022-06-16'),
-  distributions: [
+  onlineResources: [
     {
       description:
         "Application de consultation des routes et autoroutes de Wallonie. Cette application est sécurisée et n'est accessible que pour les agents de la DGO1 du SPW.",
@@ -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/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'
@@ -158,13 +155,13 @@ export class Gn4FieldMapper {
       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,
@@ -287,7 +284,7 @@ export class Gn4FieldMapper {
       return {
         ...output,
         kind,
-      }
+      } as CatalogRecord
     },
     geom: (output, source) => {
       const geoms = getAsArray(selectField(source, 'geom'))
@@ -387,7 +384,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 +403,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 +447,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/keywords.model.ts

@@ -1,10 +1,6 @@
 export interface KeywordApiResponse {
-  values?: {
-    eng: string
-  }
-  definitions?: {
-    eng: string
-  }
+  values?: Record<string, string>
+  definitions?: Record<string, string>
   coordEast?: string
   coordWest?: string
   coordSouth?: string

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

@@ -4,10 +4,10 @@ import { Iso19139Converter } from '../iso19139'
 import { renameElements } from '../xml-utils'
 import {
   readContacts,
-  readDistributions,
   readKind,
   readLandingPage,
   readLineage,
+  readOnlineResources,
   readOwnerOrganization,
   readRecordCreated,
   readRecordPublished,
@@ -18,10 +18,10 @@ import {
 import {
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
   writeKind,
   writeLandingPage,
   writeLineage,
+  writeOnlineResources,
   writeOwnerOrganization,
   writeRecordCreated,
   writeRecordPublished,
@@ -48,7 +48,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.readers['ownerOrganization'] = readOwnerOrganization
     this.readers['landingPage'] = readLandingPage
     this.readers['lineage'] = readLineage
-    this.readers['distributions'] = readDistributions
+    this.readers['onlineResources'] = readOnlineResources
 
     this.writers['uniqueIdentifier'] = writeUniqueIdentifier
     this.writers['kind'] = writeKind
@@ -63,7 +63,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.writers['ownerOrganization'] = writeOwnerOrganization
     this.writers['landingPage'] = writeLandingPage
     this.writers['lineage'] = writeLineage
-    this.writers['distributions'] = writeDistributions
+    this.writers['onlineResources'] = writeOnlineResources
     this.writers['status'] = writeStatus
     this.writers['spatialRepresentation'] = writeSpatialRepresentation
   }

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

@@ -19,15 +19,16 @@ import {
 } from '../function-utils'
 import {
   extractCharacterString,
-  extractDatasetDistributions,
+  extractDatasetOnlineResources,
   extractDateTime,
   extractRole,
+  extractServiceOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
 import {
-  DatasetDistribution,
   Individual,
+  OnlineResource,
   Organization,
   RecordKind,
   Role,
@@ -320,10 +321,17 @@ 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)
 }

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

@@ -2,7 +2,6 @@ import {
   CatalogRecord,
   DatasetRecord,
   Individual,
-  ServiceOnlineResource,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   addAttribute,
@@ -34,14 +33,14 @@ import {
   pipe,
 } from '../function-utils'
 import {
-  appendDistribution,
   appendKeywords,
+  appendOnlineResource,
+  appendServiceOnlineResources,
   createDistributionInfo,
   findOrCreateDistribution,
   findOrCreateIdentification,
   getProgressCode,
   getRoleCode,
-  getServiceEndpointProtocol,
   removeKeywords,
   writeCharacterString,
   writeDateTime,
@@ -481,7 +480,7 @@ function removeTransferOptions(rootEl: XmlElement) {
   )(rootEl)
 }
 
-function appendDistributionFormat(mimeType: string) {
+function appendOnlineResourceFormat(mimeType: string) {
   return appendChildren(
     pipe(
       createElement('mrd:distributionFormat'),
@@ -494,11 +493,18 @@ 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)
+  }
+
+  // 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 +513,7 @@ export function writeDistributions(record: DatasetRecord, rootEl: XmlElement) {
         ),
         appendChildTree(createDistributionInfo())
       ),
-      appendDistribution(distribution, appendDistributionFormat)
+      appendOnlineResource(onlineResource, appendOnlineResourceFormat)
     )(rootEl)
   })
 }

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

@@ -18,7 +18,6 @@ import {
   readAbstract,
   readContacts,
   readContactsForResource,
-  readDistributions,
   readIsoTopics,
   readKeywords,
   readKind,
@@ -34,6 +33,7 @@ import {
   readResourcePublished,
   readResourceUpdated,
   readSecurityConstraints,
+  readSpatialExtents,
   readSpatialRepresentation,
   readStatus,
   readTemporalExtents,
@@ -45,7 +45,6 @@ import {
   writeAbstract,
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
   writeGraphicOverviews,
   writeKeywords,
   writeKind,
@@ -60,6 +59,7 @@ import {
   writeResourcePublished,
   writeResourceUpdated,
   writeSecurityConstraints,
+  writeSpatialExtents,
   writeSpatialRepresentation,
   writeStatus,
   writeTemporalExtents,
@@ -98,11 +98,10 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: readSpatialRepresentation,
     overviews: readOverviews,
     lineage: readLineage,
-    distributions: readDistributions,
     onlineResources: readOnlineResources,
     temporalExtents: readTemporalExtents,
+    spatialExtents: readSpatialExtents,
     // TODO
-    spatialExtents: () => [],
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => [],
@@ -136,11 +135,10 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: writeSpatialRepresentation,
     overviews: writeGraphicOverviews,
     lineage: writeLineage,
-    distributions: writeDistributions,
     onlineResources: writeOnlineResources,
     temporalExtents: writeTemporalExtents,
+    spatialExtents: writeSpatialExtents,
     // TODO
-    spatialExtents: () => undefined,
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => undefined,
@@ -175,6 +173,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     const licenses = this.readers['licenses'](rootEl)
     const overviews = this.readers['overviews'](rootEl)
     const landingPage = this.readers['landingPage'](rootEl)
+    const onlineResources = this.readers['onlineResources'](rootEl)
 
     if (kind === 'dataset') {
       const status = this.readers['status'](rootEl)
@@ -183,7 +182,6 @@ export class Iso19139Converter extends BaseConverter<string> {
       const spatialExtents = this.readers['spatialExtents'](rootEl)
       const temporalExtents = this.readers['temporalExtents'](rootEl)
       const lineage = this.readers['lineage'](rootEl)
-      const distributions = this.readers['distributions'](rootEl)
       const updateFrequency = this.readers['updateFrequency'](rootEl)
 
       return {
@@ -213,12 +211,11 @@ export class Iso19139Converter extends BaseConverter<string> {
         overviews,
         spatialExtents,
         temporalExtents,
-        distributions,
+        onlineResources,
         updateFrequency,
         ...(landingPage && { landingPage }),
       } as DatasetRecord
     } else {
-      const onlineResources = this.readers['onlineResources'](rootEl)
       return {
         uniqueIdentifier,
         kind,
@@ -305,6 +302,8 @@ export class Iso19139Converter extends BaseConverter<string> {
     fieldChanged('licenses') && this.writers['licenses'](record, rootEl)
     fieldChanged('otherConstraints') &&
       this.writers['otherConstraints'](record, rootEl)
+    fieldChanged('onlineResources') &&
+      this.writers['onlineResources'](record, rootEl)
 
     if (record.kind === 'dataset') {
       fieldChanged('status') && this.writers['status'](record, rootEl)
@@ -315,12 +314,9 @@ export class Iso19139Converter extends BaseConverter<string> {
       fieldChanged('overviews') && this.writers['overviews'](record, rootEl)
       fieldChanged('temporalExtents') &&
         this.writers['temporalExtents'](record, rootEl)
-      fieldChanged('distributions') &&
-        this.writers['distributions'](record, rootEl)
+      fieldChanged('spatialExtents') &&
+        this.writers['spatialExtents'](record, rootEl)
       fieldChanged('lineage') && this.writers['lineage'](record, rootEl)
-    } else {
-      fieldChanged('onlineResources') &&
-        this.writers['onlineResources'](record, rootEl)
     }
 
     this.beforeDocumentCreation(rootEl)