geonetwork-ui 2.4.0-alpha.2.dbfa93cf3 → 2.4.0-alpha.2.ddc8a5a9f

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

@@ -27,6 +27,7 @@ import {
 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
 
@@ -127,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')),
@@ -135,11 +142,9 @@ 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(
@@ -286,15 +291,14 @@ 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) => {
@@ -394,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'
     }

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

@@ -17,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
@@ -108,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
@@ -137,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
@@ -151,7 +152,7 @@ export type MetadataObject = Partial<{
   pointOfContactOrg: string
   pointOfContactOrgForResource: string
   popularity: number
-  publicationDateForResource: string
+  publicationDateForResource: string | string[]
   rating: string
   record: string
   recordGroup: string
@@ -186,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

@@ -15,6 +15,7 @@ import {
   readRecordCreated,
   readRecordPublished,
   readRecordUpdated,
+  readReuseType,
   readUniqueIdentifier,
 } from './read-parts'
 import {
@@ -32,6 +33,7 @@ import {
   writeResourceCreated,
   writeResourcePublished,
   writeResourceUpdated,
+  writeReuseType,
   writeSpatialRepresentation,
   writeStatus,
   writeUniqueIdentifier,
@@ -54,6 +56,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.readers['onlineResources'] = readOnlineResources
     this.readers['defaultLanguage'] = readDefaultLanguage
     this.readers['otherLanguages'] = readOtherLanguages
+    this.readers['reuseType'] = readReuseType
 
     this.writers['uniqueIdentifier'] = writeUniqueIdentifier
     this.writers['kind'] = writeKind
@@ -63,6 +66,7 @@ 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'] = () => undefined // fixme: find a way to store this value properly

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

@@ -24,6 +24,7 @@ import {
   extractLocalizedCharacterString,
   extractRole,
   extractServiceOnlineResources,
+  extractReuseOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
@@ -35,11 +36,13 @@ import {
   OrganizationTranslations,
   RecordKind,
   RecordTranslations,
+  ReuseType,
   Role,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchMimeType } from '../common/distribution.mapper'
 import { fullNameToParts } from '../iso19139/utils/individual-name'
 import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function readKind(rootEl: XmlElement): RecordKind {
   return pipe(
@@ -50,10 +53,7 @@ export function readKind(rootEl: XmlElement): RecordKind {
       'mcc:MD_ScopeCode'
     ),
     readAttribute('codeListValue'),
-    map(
-      (scopeCode): RecordKind =>
-        scopeCode === 'service' ? 'service' : 'dataset'
-    )
+    map((scopeCode): RecordKind => getResourceType(scopeCode))
   )(rootEl)
 }
 
@@ -321,6 +321,19 @@ export function readRecordPublished(rootEl: XmlElement): Date {
   return extractDateInfo('publication')(rootEl)
 }
 
+export function readReuseType(rootEl: XmlElement): ReuseType {
+  return pipe(
+    findNestedElement(
+      'mdb:metadataScope',
+      'mdb:MD_MetadataScope',
+      'mdb:resourceScope',
+      'mcc:MD_ScopeCode'
+    ),
+    readAttribute('codeListValue'),
+    map((scopeCode): ReuseType => getReuseType(scopeCode))
+  )(rootEl)
+}
+
 const getMimeType = pipe(
   findParent('mrd:MD_Distribution'),
   findNestedElement(
@@ -335,16 +348,17 @@ const getMimeType = pipe(
 )
 
 export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
+  let getOnlineResources: ChainableFunction<XmlElement, OnlineResource[]>
   if (readKind(rootEl) === 'dataset') {
-    return pipe(
-      findNestedElements('mrd:distributionInfo', 'mrd:MD_Distribution'),
-      mapArray(extractDatasetOnlineResources(getMimeType)),
-      flattenArray()
-    )(rootEl)
+    getOnlineResources = extractDatasetOnlineResources(getMimeType)
+  } else if (readKind(rootEl) === 'service') {
+    getOnlineResources = extractServiceOnlineResources()
+  } else {
+    getOnlineResources = extractReuseOnlineResources()
   }
   return pipe(
     findNestedElements('mrd:distributionInfo', 'mrd:MD_Distribution'),
-    mapArray(extractServiceOnlineResources()),
+    mapArray(getOnlineResources),
     flattenArray()
   )(rootEl)
 }

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

@@ -50,6 +50,7 @@ import {
 import { findIdentification } from '../iso19139/read-parts'
 import { namePartsToFull } from '../iso19139/utils/individual-name'
 import { LANG_2_TO_3_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { kindToCodeListValue } from '../common/resource-types'
 
 export function writeUniqueIdentifier(
   record: CatalogRecord,
@@ -66,6 +67,7 @@ export function writeUniqueIdentifier(
 }
 
 export function writeKind(record: CatalogRecord, rootEl: XmlElement) {
+  const kind = kindToCodeListValue(record)
   pipe(
     findNestedChildOrCreate(
       'mdb:metadataScope',
@@ -77,8 +79,8 @@ export function writeKind(record: CatalogRecord, rootEl: XmlElement) {
       'codeList',
       'https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ScopeCode'
     ),
-    writeAttribute('codeListValue', record.kind),
-    setTextContent(record.kind)
+    writeAttribute('codeListValue', kind),
+    setTextContent(kind)
   )(rootEl)
 }
 
@@ -217,6 +219,10 @@ export function writeResourcePublished(
   appendResourceDate(record.resourcePublished, 'publication')(rootEl)
 }
 
+export function writeReuseType(record: CatalogRecord, rootEl: XmlElement) {
+  writeKind(record, rootEl)
+}
+
 export function appendResponsibleParty(
   contact: Individual,
   defaultLanguage: LanguageCode