geonetwork-ui 2.4.0-dev.fe59f179 → 2.4.1-dev.4e8752d34

package/src/libs/api/metadata-converter/src/lib/fixtures/wallonie.records.service+napitswallonia.ts

@@ -0,0 +1,289 @@
+import { ServiceRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+export const WALLONIE_SERVICE_NAPITSWALLONIA_RECORD: ServiceRecord = {
+  uniqueIdentifier: 'fe1c1a3d-c75b-435c-a1d1-48426818f54d',
+  resourceIdentifier: 'fe1c1a3d-c75b-435c-a1d1-48426818f54d',
+  kind: 'service',
+  otherLanguages: [],
+  defaultLanguage: 'fr',
+  recordCreated: new Date('2023-12-18T12:25:26.465Z'),
+  recordUpdated: new Date('2024-10-15T07:37:39.350Z'),
+  resourceUpdated: new Date('2023-12-18T00:00:00.000Z'),
+  resourcePublished: new Date('2023-12-18T00:00:00.000Z'),
+  title: 'Service OGC API Records du catalogue NAP-ITS-Wallonia',
+  abstract:
+    "Point d'accès OGC API Records du catalogue NAP-ITS-Wallonia contenant la description des données régionales de mobilité telles que demandé par la législation sur les systèmes de transport intelligents.",
+  ownerOrganization: {
+    name: 'Gestion et valorisation de la donnée (SPW - Secrétariat général - SPW Digital - Département Données transversales - Gestion et valorisation de la donnée)',
+    translations: {},
+  },
+  contacts: [
+    {
+      email: 'helpdesk.carto@spw.wallonie.be',
+      organization: {
+        name: 'Gestion et valorisation de la donnée (SPW - Secrétariat général - SPW Digital - Département Données transversales - Gestion et valorisation de la donnée)',
+        translations: {},
+      },
+      role: 'point_of_contact',
+    },
+  ],
+  contactsForResource: [
+    {
+      email: 'helpdesk.carto@spw.wallonie.be',
+      organization: {
+        name: 'Helpdesk carto du SPW (SPW - Secrétariat général - SPW Digital - Département Données transversales - Gestion et valorisation de la donnée)',
+        translations: {},
+      },
+      role: 'point_of_contact',
+    },
+    {
+      email: 'helpdesk.carto@spw.wallonie.be',
+      organization: {
+        name: 'Gestion et valorisation de la donnée (SPW - Secrétariat général - SPW Digital - Département Données transversales - Gestion et valorisation de la donnée)',
+        translations: {},
+      },
+      role: 'custodian',
+    },
+    {
+      email: 'missing@missing.com',
+      organization: {
+        name: 'Service public de Wallonie (SPW)',
+        website: new URL('https://geoportail.wallonie.be/'),
+        translations: {},
+      },
+      role: 'owner',
+    },
+    {
+      email: 'helpdesk.carto@spw.wallonie.be',
+      organization: {
+        name: 'Service public de Wallonie (SPW)',
+        translations: {},
+      },
+      role: 'distributor',
+    },
+  ],
+  keywords: [
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.Themes_geoportail_wallon_hierarchy',
+        name: 'Thèmes du géoportail wallon',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.Themes_geoportail_wallon_hierarchy'
+        ),
+      },
+      label: 'Mobilité (autre)',
+      type: 'theme',
+      translations: {},
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.Themes_geoportail_wallon_hierarchy',
+        name: 'Thèmes du géoportail wallon',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.Themes_geoportail_wallon_hierarchy'
+        ),
+      },
+      label: 'Données de base (autre)',
+      type: 'theme',
+      translations: {},
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.Themes_geoportail_wallon_hierarchy',
+        name: 'Thèmes du géoportail wallon',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.Themes_geoportail_wallon_hierarchy'
+        ),
+      },
+      label: 'Mobilité',
+      type: 'theme',
+      translations: {},
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.Themes_geoportail_wallon_hierarchy',
+        name: 'Thèmes du géoportail wallon',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.Themes_geoportail_wallon_hierarchy'
+        ),
+      },
+      label: 'Données de base',
+      type: 'theme',
+      translations: {},
+    },
+    {
+      label: 'métadonnées',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'ISO',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'CSW',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: '19115',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: '19139',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'description',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'MobilityDCAT',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'DCAT',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'MMTIS',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'SRTI',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'ITS',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'NAP',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'transportdata',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'RTTI',
+      type: 'other',
+      translations: {},
+    },
+    {
+      label: 'SSTP',
+      type: 'other',
+      translations: {},
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.infraSIG',
+        name: 'Mots-clés InfraSIG',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.infraSIG'
+        ),
+      },
+      label: 'Reporting INSPIRENO',
+      type: 'theme',
+      translations: {},
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.httpinspireeceuropaeumetadatacodelistSpatialDataServiceCategory-SpatialDataServiceCategory',
+        name: 'Classification of spatial data services',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.httpinspireeceuropaeumetadatacodelistSpatialDataServiceCategory-SpatialDataServiceCategory'
+        ),
+      },
+      label: 'Service de catalogue',
+      type: 'theme',
+      translations: {},
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope',
+        name: 'Champ géographique',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope'
+        ),
+      },
+      label: 'Régional',
+      type: 'theme',
+      translations: {},
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet-theme',
+        name: 'GEMET themes',
+        url: new URL(
+          'https://metawal.wallonie.be/geonetwork/srv/api/registries/vocabularies/external.theme.gemet-theme'
+        ),
+      },
+      label: 'transport',
+      type: 'theme',
+      translations: {},
+    },
+  ],
+  topics: ['transportation'],
+  licenses: [],
+  legalConstraints: [
+    {
+      url: new URL(
+        'http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/noLimitations'
+      ),
+      text: 'No limitations to public access',
+      translations: {},
+    },
+    {
+      text: "Aucune contrainte d'utilisation ne s'applique",
+      translations: {},
+    },
+  ],
+  securityConstraints: [],
+  spatialExtents: [
+    {
+      bbox: [2.75, 49.45, 6.5, 50.85],
+      translations: {},
+    },
+  ],
+  otherConstraints: [
+    {
+      text: "Aucune condition ne s'applique",
+      translations: {},
+    },
+  ],
+  overviews: [
+    {
+      url: new URL(
+        'https://metawal.wallonie.be/geonetwork/srv/api/records/fe1c1a3d-c75b-435c-a1d1-48426818f54d/attachments/echangeur.png'
+      ),
+      description: 'echangeur.png',
+    },
+  ],
+  onlineResources: [
+    {
+      type: 'endpoint',
+      endpointUrl: new URL(
+        'https://metawal.wallonie.be/geonetwork/api/collections/napits'
+      ),
+      protocol: 'other',
+      description: "Point d'accès OGC API Records pour NAP-ITS-Wallonia.",
+      translations: {},
+    },
+  ],
+  translations: {},
+  landingPage: new URL(
+    'https://metawal.wallonie.be/geonetwork/srv/api/records/fe1c1a3d-c75b-435c-a1d1-48426818f54d'
+  ),
+}

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

@@ -86,7 +86,7 @@ export function map<U, V>(mapper: (el: U) => V) {
   return (input: U) => mapper(input)
 }
 
-export function mapArray<U, V>(mapper: (el: U) => V) {
+export function mapArray<U, V>(mapper: (el: U, index: number) => V) {
   return (input: Array<U>) => input.map(mapper)
 }
 

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/gn4.converter.ts

@@ -37,7 +37,8 @@ export class Gn4Converter extends BaseConverter<Gn4Record> {
       spatialExtents: [],
       temporalExtents: [],
       overviews: [],
-      languages: [],
+      defaultLanguage: null,
+      otherLanguages: [],
     }
     const record: CatalogRecord = Object.keys(_source).reduce(
       (prev, fieldName) =>

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

@@ -20,16 +20,14 @@ 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'
 import { LANG_3_TO_2_MAPPER, LangService } from '../../../../../../libs/util/i18n/src'
+import { getResourceType, getReuseType } from '../common/resource-types'
 
 type ESResponseSource = SourceWithUnknownProps
 
@@ -130,6 +128,12 @@ export class Gn4FieldMapper {
         getFirstValue(selectField<string>(source, 'revisionDateForResource'))
       ),
     }),
+    publicationDateForResource: (output, source) => ({
+      ...output,
+      resourcePublished: toDate(
+        selectField<string>(source, 'publicationDateForResource')
+      ),
+    }),
     createDate: (output, source) => ({
       ...output,
       recordCreated: toDate(selectField<string>(source, 'createDate')),
@@ -138,33 +142,43 @@ export class Gn4FieldMapper {
       ...output,
       recordUpdated: toDate(selectField<string>(source, 'changeDate')),
     }),
-    publicationDateForResource: (output, source) => ({
+    publicationDate: (output, source) => ({
       ...output,
-      recordPublished: toDate(
-        selectField<string>(source, 'publicationDateForResource')
-      ),
+      recordPublished: toDate(selectField<string>(source, 'publicationDate')),
     }),
     resourceLanguage: (output, source) => {
       const langList = getAsArray(
         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 +263,6 @@ export class Gn4FieldMapper {
       ...output,
       lineage: selectTranslatedField(source, 'lineageObject', this.lang3),
     }),
-    mainLanguage: (output) => output,
     userSavedCount: (output, source) =>
       this.addExtra(
         {
@@ -278,16 +291,15 @@ export class Gn4FieldMapper {
         },
         output
       ),
-    cl_hierarchyLevel: (output, source) => {
-      const hierarchyLevel = selectField(
-        getFirstValue(selectField(source, 'cl_hierarchyLevel')),
-        'key'
-      )
-      const kind = hierarchyLevel === 'service' ? 'service' : 'dataset'
+    resourceType: (output, source) => {
+      const resourceType = getFirstValue(selectField(source, 'resourceType'))
+      const kind = getResourceType(resourceType)
+      const reuseType = getReuseType(resourceType)
       return {
         ...output,
         kind,
-      }
+        ...(reuseType && { reuseType }),
+      } as CatalogRecord
     },
     geom: (output, source) => {
       const geoms = getAsArray(selectField(source, 'geom'))
@@ -370,16 +382,6 @@ export class Gn4FieldMapper {
       ...output,
       [outputField]: outputArray,
     }
-    // avoid legal constraints being duplicates of licenses
-    if (
-      'legalConstraints' in result &&
-      (type === 'legal' || type === 'license')
-    ) {
-      result.legalConstraints = result.legalConstraints.filter(
-        (constraint) =>
-          !output.licenses?.some((license) => license.text === constraint.text)
-      )
-    }
     return result
   }
 
@@ -387,7 +389,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'
     }
@@ -396,7 +398,8 @@ export class Gn4FieldMapper {
       /^OGC:WMS/.test(protocol) ||
       /^OGC:WFS/.test(protocol) ||
       /^OGC:WMTS/.test(protocol) ||
-      /ogc\W*api\W*features/i.test(protocol)
+      /ogc\W*api\W*features/i.test(protocol) ||
+      (/^WWW:DOWNLOAD-/.test(protocol) && /data.geopf.fr/.test(url)) // TO DO : change with the good protocol when decided
     ) {
       return 'service'
     }
@@ -406,9 +409,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 +453,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/elasticsearch.model.ts

@@ -50,5 +50,5 @@ export const ES_RESOURCES_VALUES = [
   'featureCatalog',
 ] as const
 
-export type EsResourceTypeValues = typeof ES_RESOURCES_VALUES[number]
+export type EsResourceTypeValues = (typeof ES_RESOURCES_VALUES)[number]
 export type EsResourceType = EsResourceTypeValues | EsResourceTypeValues[]

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/gn4/types/metadata.model.ts

@@ -5,6 +5,7 @@ type MultilingualField = {
   [K in `lang${LangCode}`]: string
 } & {
   default: string
+  link?: string
 }
 
 type BooleanString = 'true' | 'false'
@@ -16,7 +17,8 @@ interface CodeListEntry extends MultilingualField {
 type MaybeArray<T> = T | T[]
 
 interface Contact {
-  organisation: string
+  organisation?: string
+  organisationObject?: MultilingualField
   role: string
   email: string
   website: string
@@ -107,17 +109,17 @@ export type MetadataObject = Partial<{
   extra: string
   featureOfRecord: string
   feedbackCount: string
-  geom: Geometry
+  geom: Geometry | Geometry[]
   groupOwner: string
-  groupPublished: string[]
-  groupPublishedId: string
+  groupPublished: string | string[]
+  groupPublishedId: string | string[]
   harvesterUuid: string
   hasInspireTheme: BooleanString
   hasOverview: BooleanString
   hasxlinks: BooleanString
   id: string
-  indexingDate: string
-  indexingError: string[]
+  indexingDate: string | number
+  indexingError: string | string[]
   indexingErrorMsg: string[]
   inspireAnnex: string[]
   inspireAnnexForFirstTheme: string
@@ -136,8 +138,8 @@ export type MetadataObject = Partial<{
   lineageObject: MultilingualField
   link: Link[]
   linkProtocol: string[]
-  linkUrl: string[]
-  linkUrlProtocolOGCWFS: string[]
+  linkUrl: string | string[]
+  linkUrlProtocolOGCWFS: string | string[]
   linkUrlProtocolOGCWMS: string[]
   linkUrlProtocolWWWLINK10httplink: MaybeArray<string>
   linkUrlProtocolWWWLINK10httprelated: string
@@ -150,7 +152,7 @@ export type MetadataObject = Partial<{
   pointOfContactOrg: string
   pointOfContactOrgForResource: string
   popularity: number
-  publicationDateForResource: string
+  publicationDateForResource: string | string[]
   rating: string
   record: string
   recordGroup: string
@@ -185,7 +187,7 @@ export type MetadataObject = Partial<{
 
 export interface Gn4Record {
   _index: string
-  _type: string
+  _type?: string
   _id: string
   _score: number
   _source: MetadataObject

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

@@ -4,31 +4,36 @@ import { Iso19139Converter } from '../iso19139'
 import { renameElements } from '../xml-utils'
 import {
   readContacts,
-  readDistributions,
+  readContactsForResource,
+  readDefaultLanguage,
   readKind,
   readLandingPage,
   readLineage,
+  readOnlineResources,
+  readOtherLanguages,
   readOwnerOrganization,
   readRecordCreated,
   readRecordPublished,
   readRecordUpdated,
-  readResourceContacts,
+  readReuseType,
   readUniqueIdentifier,
 } from './read-parts'
 import {
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
+  writeDefaultLanguage,
   writeKind,
   writeLandingPage,
   writeLineage,
-  writeOwnerOrganization,
+  writeOnlineResources,
+  writeOtherLanguages,
   writeRecordCreated,
   writeRecordPublished,
   writeRecordUpdated,
   writeResourceCreated,
   writeResourcePublished,
   writeResourceUpdated,
+  writeReuseType,
   writeSpatialRepresentation,
   writeStatus,
   writeUniqueIdentifier,
@@ -44,11 +49,14 @@ 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.readers['reuseType'] = readReuseType
 
     this.writers['uniqueIdentifier'] = writeUniqueIdentifier
     this.writers['kind'] = writeKind
@@ -58,14 +66,17 @@ export class Iso191153Converter extends Iso19139Converter {
     this.writers['resourceUpdated'] = writeResourceUpdated
     this.writers['resourceCreated'] = writeResourceCreated
     this.writers['resourcePublished'] = writeResourcePublished
+    this.writers['reuseType'] = writeReuseType
     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 +93,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