geonetwork-ui 2.6.0-dev.0716b5712 → 2.6.0-dev.0cd426aa4

package/libs/util/i18n/src/lib/language-codes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"language-codes.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/i18n/src/lib/language-codes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;CAiB9B,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;CAiB1B,CAAA;AAED,eAAO,MAAM,kBAAkB,IAK9B,CAAA"}
+{"version":3,"file":"language-codes.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/i18n/src/lib/language-codes.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4B1B,CAAA;AAED,eAAO,MAAM,kBAAkB,IAK9B,CAAA;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAG1D"}

package/libs/util/shared/src/index.d.ts

@@ -1,6 +1,6 @@
-export * from './lib/util-shared.module';
 export * from './lib/services';
 export * from './lib/utils';
 export * from './lib/links';
 export * from './lib/image-fallback.directive';
+export * from './lib/gn-ui-version';
 //# sourceMappingURL=index.d.ts.map

package/libs/util/shared/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/util/shared/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/util/shared/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qBAAqB,CAAA"}

package/libs/util/shared/src/lib/gn-ui-version.d.ts

@@ -0,0 +1,3 @@
+export declare const GEONETWORK_UI_VERSION: string;
+export declare const GEONETWORK_UI_TAG_NAME: string;
+//# sourceMappingURL=gn-ui-version.d.ts.map

package/libs/util/shared/src/lib/gn-ui-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gn-ui-version.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/shared/src/lib/gn-ui-version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,QAAsB,CAAA;AAExD,eAAO,MAAM,sBAAsB,QAGJ,CAAA"}

package/libs/util/shared/src/lib/image-fallback.directive.d.ts

@@ -6,6 +6,6 @@ export declare class ImageFallbackDirective {
     useFallback(): void;
     constructor(el: ElementRef);
     static ɵfac: i0.ɵɵFactoryDeclaration<ImageFallbackDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<ImageFallbackDirective, "img[gnUiImageFallback]", never, { "fallbackUrl": { "alias": "fallbackUrl"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<ImageFallbackDirective, "img[gnUiImageFallback]", never, { "fallbackUrl": { "alias": "fallbackUrl"; "required": false; }; }, {}, never, never, true, never>;
 }
 //# sourceMappingURL=image-fallback.directive.d.ts.map

package/libs/util/shared/src/lib/image-fallback.directive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-fallback.directive.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/shared/src/lib/image-fallback.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAuB,MAAM,eAAe,CAAA;;AAE1E,qBAGa,sBAAsB;IAYrB,OAAO,CAAC,EAAE;IAXb,WAAW,EAAE,MAAM,CAAA;IAE5B,WAAW;gBASS,EAAE,EAAE,UAAU;yCAZvB,sBAAsB;2CAAtB,sBAAsB;CAalC"}
+{"version":3,"file":"image-fallback.directive.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/shared/src/lib/image-fallback.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAuB,MAAM,eAAe,CAAA;;AAE1E,qBAIa,sBAAsB;IAYrB,OAAO,CAAC,EAAE;IAXb,WAAW,EAAE,MAAM,CAAA;IAE5B,WAAW;gBASS,EAAE,EAAE,UAAU;yCAZvB,sBAAsB;2CAAtB,sBAAsB;CAalC"}

package/libs/util/shared/src/lib/links/link-classifier.service.d.ts

@@ -1,4 +1,4 @@
-import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record';
+import { DatasetOnlineResource, ServiceOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record';
 import * as i0 from "@angular/core";
 export declare enum LinkUsage {
     API = "api",
@@ -10,8 +10,8 @@ export declare enum LinkUsage {
     UNKNOWN = "unknown"
 }
 export declare class LinkClassifierService {
-    getUsagesForLink(link: DatasetOnlineResource): LinkUsage[];
-    hasUsage(link: DatasetOnlineResource, usage: LinkUsage): boolean;
+    getUsagesForLink(link: DatasetOnlineResource | ServiceOnlineResource): LinkUsage[];
+    hasUsage(link: DatasetOnlineResource | ServiceOnlineResource, usage: LinkUsage): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<LinkClassifierService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LinkClassifierService>;
 }

package/libs/util/shared/src/lib/links/link-classifier.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-classifier.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-classifier.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2DAA2D,CAAA;;AAGjG,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,YAAY,gBAAgB;IAC5B,OAAO,YAAY;CACpB;AAED,qBAGa,qBAAqB;IAChC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,SAAS,EAAE;IAsC1D,QAAQ,CAAC,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,SAAS;yCAvC3C,qBAAqB;6CAArB,qBAAqB;CA0CjC"}
+{"version":3,"file":"link-classifier.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-classifier.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,2DAA2D,CAAA;;AAGlE,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,YAAY,gBAAgB;IAC5B,OAAO,YAAY;CACpB;AAED,qBAGa,qBAAqB;IAChC,gBAAgB,CACd,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,SAAS,EAAE;IA0Cd,QAAQ,CACN,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,KAAK,EAAE,SAAS;yCA/CP,qBAAqB;6CAArB,qBAAqB;CAmDjC"}

package/libs/util/shared/src/lib/links/link-utils.d.ts

@@ -1,4 +1,4 @@
-import { DatasetOnlineResource, ServiceProtocol } from '../../../../../../libs/common/domain/src/lib/model/record';
+import { DatasetOnlineResource, ServiceOnlineResource, ServiceProtocol } from '../../../../../../libs/common/domain/src/lib/model/record';
 export declare const FORMATS: {
     readonly csv: {
         readonly extensions: readonly ["csv"];
@@ -99,14 +99,21 @@ export declare const FORMATS: {
 };
 export type FileFormat = keyof typeof FORMATS;
 export declare function getFormatPriority(linkFormat: FileFormat): number;
-export declare function getLinkPriority(link: DatasetOnlineResource): number;
+export declare function getLinkPriority(link: DatasetOnlineResource | ServiceOnlineResource): number;
 export declare function getFileFormatFromServiceOutput(serviceOutput: string): FileFormat | null;
-export declare function getFileFormat(link: DatasetOnlineResource): FileFormat;
-export declare function isFormatInQueryParam(link: DatasetOnlineResource, alias: string): boolean;
+export declare function getFileFormat(link: DatasetOnlineResource | ServiceOnlineResource): FileFormat;
+export declare function isFormatInQueryParam(link: DatasetOnlineResource | ServiceOnlineResource, alias: string): boolean;
 export declare function mimeTypeToFormat(mimeType: string): FileFormat;
-export declare function checkFileFormat(link: DatasetOnlineResource, format: FileFormat): boolean;
+export declare function checkFileFormat(link: DatasetOnlineResource | ServiceOnlineResource, format: FileFormat): boolean;
 export declare function getBadgeColor(linkFormat: FileFormat): string;
-export declare function getLinkLabel(link: DatasetOnlineResource): string;
-export declare function getLayers(url: string, serviceProtocol: ServiceProtocol): Promise<any[]>;
+export declare function getLinkLabel(link: DatasetOnlineResource | ServiceOnlineResource): string;
+export declare function getLayers(url: string, serviceProtocol: ServiceProtocol): Promise<{
+    name: string;
+    hasRecords?: boolean;
+    hasFeatures?: boolean;
+    hasVectorTiles?: boolean;
+    hasMapTiles?: boolean;
+}[] | import("@camptocamp/ogc-client").WfsFeatureTypeFull[] | import("@camptocamp/ogc-client").WmsLayerFull[] | import("@camptocamp/ogc-client").WmtsLayer[]>;
+export declare function wmsLayerFlatten(layerFull: any): any[];
 export declare function getMimeTypeForFormat(format: FileFormat): string | null;
 //# sourceMappingURL=link-utils.d.ts.map

package/libs/util/shared/src/lib/links/link-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAUlE,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgHV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAEnE;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,qBAAqB,GAAG,UAAU,CAcrE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,EAC3B,MAAM,EAAE,UAAU,GACjB,OAAO,CAQT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CA0BhE;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,kBAwB5E;AAcD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}
+{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAUlE,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgHV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,MAAM,CAER;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,UAAU,CAcZ;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,MAAM,EAAE,UAAU,GACjB,OAAO,CAQT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,MAAM,CA6BR;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe;;;;;;8JAmC5E;AAED,wBAAgB,eAAe,CAAC,SAAS,KAAA,SAUxC;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.6.0-dev.0716b5712",
+  "version": "2.6.0-dev.0cd426aa4",
   "engines": {
     "node": ">=20"
   },
@@ -40,7 +40,7 @@
     "@ngrx/store": "17.x || 18.x || 19.x",
     "@ngrx/store-devtools": "17.x || 18.x || 19.x",
     "@ngrx/operators": "18.x",
-    "@ngx-translate/core": "15.x",
+    "@ngx-translate/core": "16.x",
     "@ngx-translate/http-loader": "16.x",
     "rxjs": "7.x",
     "zone.js": "*",
@@ -62,7 +62,7 @@
     "@nx/angular": "20.2.2",
     "@rgrove/parse-xml": "4.2.0",
     "alasql": "4.6.0",
-    "axios": "1.7.9",
+    "axios": "1.8.2",
     "basiclightbox": "^5.0.4",
     "chart.js": "4.4.7",
     "chroma-js": "3.1.2",
@@ -77,7 +77,7 @@
     "ng-table-virtual-scroll": "1.6.1",
     "ngx-chips": "3.0.0",
     "ngx-dropzone": "3.1.0",
-    "ngx-translate-messageformat-compiler": "7.0.0",
+    "ngx-translate-messageformat-compiler": "~7.1.0",
     "ol": "^8.2.0",
     "papaparse": "5.4.1",
     "pg": "^8.9.0",

package/src/libs/api/metadata-converter/src/index.ts

@@ -5,3 +5,4 @@ export * from './lib/gn4'
 export * from './lib/dcat-ap'
 export * from './lib/xml-utils'
 export * from './lib/base.converter'
+export * from './lib/common/resource-types'

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

@@ -1,7 +1,4 @@
-import {
-  CatalogRecord,
-  DatasetRecord,
-} from '../../../../../libs/common/domain/src/lib/model/record'
+import { CatalogRecord } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export class MetadataMapperContext {
   readonly location?

package/src/libs/api/metadata-converter/src/lib/common/distribution.mapper.ts

@@ -4,6 +4,7 @@ export function matchProtocol(protocol: string): ServiceProtocol {
   if (/wms/i.test(protocol)) return 'wms'
   if (/wfs/i.test(protocol)) return 'wfs'
   if (/wmts/i.test(protocol)) return 'wmts'
+  if (/tms/i.test(protocol)) return 'tms'
   if (/wps/i.test(protocol)) return 'wps'
   if (/ogc\W*api\W*features/i.test(protocol)) return 'ogcFeatures'
   if (/esri/i.test(protocol)) return 'esriRest'

package/src/libs/api/metadata-converter/src/lib/common/resource-types.ts

@@ -4,23 +4,37 @@ import {
   ReuseType,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
-export function getResourceType(type: string): RecordKind {
-  const possibleResourceTypes = {
-    application: 'reuse',
-    dataset: 'dataset',
-    map: 'reuse',
-    'map/static': 'reuse', // old index field
-    'map/interactive': 'reuse', // old index field
-    'map-interactive': 'reuse', // new index field since Oct 10, 2024
-    'map-static': 'reuse', // new index field
-    mapDigital: 'reuse',
-    interactiveMap: 'reuse',
-    staticMap: 'reuse',
-    service: 'service',
-  } as const
+export const PossibleResourceTypes = {
+  application: 'reuse',
+  dataset: 'dataset',
+  interactiveMap: 'reuse',
+  map: 'reuse',
+  'map/static': 'reuse', // old index field
+  'map/interactive': 'reuse', // old index field
+  'map-interactive': 'reuse', // new index field since Oct 10, 2024
+  'map-static': 'reuse', // new index field
+  mapDigital: 'reuse',
+  series: 'dataset',
+  service: 'service',
+  staticMap: 'reuse',
+} as const
+
+type KindType = keyof typeof PossibleResourceTypes
+type ResourceType = 'reuse' | 'dataset' | 'service'
+type PossibleResourceTypesGrouped = {
+  [K in ResourceType]: KindType[]
+}
+
+export const PossibleResourceTypesDefinition = Object.entries(
+  PossibleResourceTypes
+).reduce(
+  (acc, [key, val]) => ((acc[val] ??= []).push(key), acc),
+  {}
+) as PossibleResourceTypesGrouped
 
+export function getResourceType(type: string): RecordKind {
   return (
-    possibleResourceTypes[type as keyof typeof possibleResourceTypes] ||
+    PossibleResourceTypes[type as keyof typeof PossibleResourceTypes] ||
     'dataset'
   )
 }

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

@@ -18,7 +18,7 @@ import { getAsValidUrl } from '../common/url'
 import { fullNameToParts } from '../iso19139/utils/individual-name'
 import { readLicenseFromString } from '../common/license'
 import { matchProtocol } from '../common/distribution.mapper'
-import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 
 function getDatasetNode(dataStore: Store, recordNode: NamedNode): NamedNode {
   return (dataStore.the(recordNode, FOAF('primaryTopic'), null) ||
@@ -457,7 +457,7 @@ export function readDefaultLanguage(dataStore: Store, recordNode: NamedNode) {
   const languageNode = statements[0].object as NamedNode
   let language = languageNode.value.split('/').pop().toLowerCase()
   if (language.length === 3) {
-    language = LANG_3_TO_2_MAPPER[language] ?? language
+    language = getLang2FromLang3(language) ?? language
   }
   return language.substring(0, 2)
 }

package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.service+eaux-usees.ts

@@ -174,10 +174,10 @@ export const GEO2FRANCE_SERVICE_EAUXUSEES_RECORD: ServiceRecord = {
   onlineResources: [
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.sandre.eaufrance.fr/geo/odp?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetCapabilities'
       ),
-      protocol: 'wfs',
+      accessServiceProtocol: 'wfs',
       description:
         'Ouvrages de dépollution - Système de traitement des eaux usées - France entière',
       translations: {},

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

@@ -617,7 +617,7 @@ Die Quelle ist zu bezeichnen: „Quelle: Stadt Zürich“.`,
   status: 'completed',
   updateFrequency: 'asNeeded',
   defaultLanguage: 'de',
-  otherLanguages: ['fr', 'it', 'en', 'rm'],
+  otherLanguages: ['fr', 'it', 'en', 'rm', 'aar'],
   translations: {
     abstract: {
       en: 'The perimeters of the Alpine Convention in Switzerland. The Alpine Convention is an international treaty between the eight Alpine countries: Germany, France, Italy, Liechtenstein, Monaco, Austria, Switzerland and Slovenia, plus the European Union. The aim of the treaty is to protect the Alps by means of cross-sectoral, integrated and sustainable policies.',
@@ -772,10 +772,10 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
     },
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS'
       ),
-      protocol: 'wms',
+      accessServiceProtocol: 'wms',
       description:
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS',
       translations: {

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

@@ -629,10 +629,10 @@ export const METAWAL_SERVICE_RECORD: ServiceRecord = {
     {
       description:
         'Ce service ESRI-REST permet de visualiser la couche de données "Plan parcellaire cadastral - situation 01/01/2016" (uniquement les données du bâti et le parcellaire)',
-      endpointUrl: new URL(
+      url: new URL(
         'https://geoservices.wallonie.be/arcgis/rest/services/PLAN_REGLEMENT/CADMAP_2016_PARCELLES/MapServer'
       ),
-      protocol: 'esriRest',
+      accessServiceProtocol: 'esriRest',
       type: 'endpoint',
       translations: {},
     },

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

@@ -274,10 +274,10 @@ export const WALLONIE_SERVICE_NAPITSWALLONIA_RECORD: ServiceRecord = {
   onlineResources: [
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://metawal.wallonie.be/geonetwork/api/collections/napits'
       ),
-      protocol: 'other',
+      accessServiceProtocol: 'other',
       description: "Point d'accès OGC API Records pour NAP-ITS-Wallonia.",
       translations: {},
     },

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

@@ -26,8 +26,12 @@ import {
 } 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'
+import { TranslateService } from '@ngx-translate/core'
+import {
+  getLang2FromLang3,
+  getLocalizedIndexKey,
+} from '../../../../../../libs/util/i18n/src'
 
 type ESResponseSource = SourceWithUnknownProps
 
@@ -42,10 +46,12 @@ type EsFieldMapperFn = (
 export class Gn4FieldMapper {
   constructor(
     private metadataUrlService: MetadataUrlService,
-    private langService: LangService
+    private translateService: TranslateService
   ) {}
 
-  private lang3 = this.langService.gnLang
+  private get lang3() {
+    return getLocalizedIndexKey(this.translateService.currentLang)
+  }
 
   protected fields: Record<string, EsFieldMapperFn> = {
     id: (output, source) =>
@@ -150,14 +156,24 @@ export class Gn4FieldMapper {
       const langList = getAsArray(
         selectField<string>(source, 'resourceLanguage')
       )
-      const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      const languages = langList.map(getLang2FromLang3)
       const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null // set the first language as main one as fallback
+
+      return {
+        ...output,
+        defaultLanguage,
+      }
+    },
+    otherLanguage: (output, source) => {
+      const langList = getAsArray(selectField<string>(source, 'otherLanguage'))
+      const languages = langList.map(getLang2FromLang3)
+      const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null
       const otherLanguages = languages.filter(
         (lang) => lang !== defaultLanguage
       )
+
       return {
         ...output,
-        defaultLanguage,
         otherLanguages,
       }
     },
@@ -165,7 +181,7 @@ export class Gn4FieldMapper {
       const language = selectField<string>(source, 'mainLanguage')
       return {
         ...output,
-        defaultLanguage: language ? LANG_3_TO_2_MAPPER[language] : null,
+        defaultLanguage: language ? getLang2FromLang3(language) : null,
       }
     },
     link: (output, source) => {
@@ -294,12 +310,52 @@ export class Gn4FieldMapper {
         ) ?? {},
         '_source'
       )
-      const featureCatalogIdentifier = selectField(
+      const featureCatalogIdentifier: string = selectField(
         <SourceWithUnknownProps>fcatSource,
         'uuid'
       )
-      return featureCatalogIdentifier
-        ? this.addExtra({ featureCatalogIdentifier }, output)
+      const sourceOfLinks = getAsArray(
+        selectField(
+          <SourceWithUnknownProps>selectField(source, 'related'),
+          'hassources'
+        )
+      )
+      const sourceOfIdentifiers: string[] = sourceOfLinks
+        .filter((link) => link['origin'] === 'catalog')
+        .map((link) => {
+          return selectField(
+            selectField(<SourceWithUnknownProps>link, '_source'),
+            'uuid'
+          )
+        })
+      const extraValues: Record<string, string | string[]> = {}
+      if (featureCatalogIdentifier) {
+        extraValues.featureCatalogIdentifier = featureCatalogIdentifier
+      }
+      if (sourceOfIdentifiers && sourceOfIdentifiers.length > 0) {
+        extraValues.sourceOfIdentifiers = sourceOfIdentifiers
+      }
+      return Object.keys(extraValues).length > 0
+        ? this.addExtra(extraValues, output)
+        : output
+    },
+    recordLink: (output, source) => {
+      const recordLinks = getAsArray(
+        selectField<SourceWithUnknownProps[]>(source, 'recordLink')
+      )
+      const sourcesIdentifiers: string[] = recordLinks
+        .filter(
+          (link) => link['origin'] === 'catalog' && link['type'] === 'sources'
+        )
+        .map((link) => selectField(<SourceWithUnknownProps>link, 'to'))
+
+      return sourcesIdentifiers && sourcesIdentifiers.length > 0
+        ? this.addExtra(
+            {
+              sourcesIdentifiers,
+            },
+            output
+          )
         : output
     },
     isPublishedToAll: (output, source) =>
@@ -309,6 +365,13 @@ export class Gn4FieldMapper {
         },
         output
       ),
+    isHarvested: (output, source) =>
+      this.addExtra(
+        {
+          isHarvested: selectField(source, 'isHarvested') !== 'false',
+        },
+        output
+      ),
     edit: (output, source) =>
       this.addExtra(
         {
@@ -430,6 +493,7 @@ export class Gn4FieldMapper {
       /^OGC:WMS/.test(protocol) ||
       /^OGC:WFS/.test(protocol) ||
       /^OGC:WMTS/.test(protocol) ||
+      /TMS/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
     ) {
@@ -460,6 +524,11 @@ export class Gn4FieldMapper {
       ),
       selectField<string>(sourceLink, 'description')
     )
+    const descriptionLink = selectField<object>(sourceLink, 'descriptionObject')
+    const accessRestricted =
+      descriptionLink &&
+      'link' in descriptionLink &&
+      descriptionLink.link.toString().includes('#MD_RestrictionCode_restricted')
     // no url: fail early
     if (url === null) {
       // TODO: collect errors at the record level?
@@ -485,6 +554,7 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
+          accessRestricted: accessRestricted,
         }
       case 'link':
         return {
@@ -503,8 +573,8 @@ export class Gn4FieldMapper {
         return {
           ...distribution,
           type,
-          endpointUrl: url,
-          protocol: accessServiceProtocol,
+          url: url,
+          accessServiceProtocol: accessServiceProtocol,
         }
     }
   }

package/src/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core'
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { TranslateService } from '@ngx-translate/core'
-import { LANG_2_TO_3_MAPPER } from '../../../../../../libs/util/i18n/src'
+import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -14,8 +14,8 @@ export class MetadataUrlService {
 
   getUrl(uuid: string, apiPath: string = this.apiConfiguration.basePath) {
     const prefix = `${apiPath}/../`
-    return `${prefix}${
-      LANG_2_TO_3_MAPPER[this.translate.currentLang]
-    }/catalog.search#/metadata/${uuid}`
+    return `${prefix}${getLang3FromLang2(
+      this.translate.currentLang
+    )}/catalog.search#/metadata/${uuid}`
   }
 }

package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts

@@ -164,7 +164,6 @@ export type MetadataObject = Partial<{
   resourceDate: ResourceDate[]
   resourceEdition: string
   resourceIdentifier: ResourceIdentifier[]
-  resourceLanguage: string[]
   resourceTemporalDateRange: ResourceTemporalDateRange[]
   resourceTemporalExtentDateRange: ResourceTemporalDateRange[]
   resourceTitleObject: MultilingualField

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

@@ -22,9 +22,9 @@ import {
   extractDatasetOnlineResources,
   extractDateTime,
   extractLocalizedCharacterString,
+  extractReuseOnlineResources,
   extractRole,
   extractServiceOnlineResources,
-  extractReuseOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
@@ -41,7 +41,7 @@ import {
 } 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 { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function readKind(rootEl: XmlElement): RecordKind {
@@ -363,11 +363,14 @@ export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
   )(rootEl)
 }
 
-function readLocaleElement(): ChainableFunction<XmlElement, LanguageCode> {
+export function readLocaleElement(): ChainableFunction<
+  XmlElement,
+  LanguageCode
+> {
   return pipe(
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
+    map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
   )
 }
 
@@ -381,6 +384,9 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
 export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
   return pipe(
     findChildrenElement('mdb:otherLocale', false),
-    mapArray(readLocaleElement())
+    mapArray(readLocaleElement()),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    )
   )(rootEl)
 }

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

@@ -49,7 +49,7 @@ import {
 } from '../iso19139/write-parts'
 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 { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
 
 export function writeUniqueIdentifier(
@@ -529,7 +529,7 @@ export function writeOnlineResources(
 }
 
 function writeLocaleElement(language: LanguageCode) {
-  const lang3 = LANG_2_TO_3_MAPPER[language.toLowerCase()]
+  const lang3 = getLang3FromLang2(language.toLowerCase()) ?? language
   return pipe(
     findChildOrCreate('lan:PT_Locale'),
     writeAttribute('id', language.toUpperCase()),

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

@@ -55,7 +55,7 @@ import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
 import { getRoleFromRoleCode } from './utils/role.mapper'
 import { getStatusFromStatusCode } from './utils/status.mapper'
 import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
-import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function extractCharacterString(): ChainableFunction<
@@ -65,7 +65,8 @@ export function extractCharacterString(): ChainableFunction<
   return pipe(
     fallback(
       findChildElement('gco:CharacterString', false),
-      findChildElement('gmx:Anchor', false)
+      findChildElement('gmx:Anchor', false),
+      findChildElement('gmx:MimeFileType', false)
     ),
     readText()
   )
@@ -965,8 +966,8 @@ export function extractServiceOnlineResources(): ChainableFunction<
         } else {
           return {
             type: 'endpoint',
-            endpointUrl: url,
-            protocol,
+            url: url,
+            accessServiceProtocol: protocol,
             ...(description && { description }),
             translations,
           }
@@ -1161,11 +1162,14 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
     findChildrenElement('gmd:locale', false),
     mapArray(
       pipe(
-        findChildElement('gmd:LanguageCode'),
+        findChildElement('lan:LanguageCode'),
         readAttribute('codeListValue'),
-        map((lang) => LANG_3_TO_2_MAPPER[lang.toLowerCase()])
+        map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
       )
     ),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    ),
     map((languages) => (languages.length ? languages : [defaultLanguage]))
   )(rootEl)
 }
@@ -1173,9 +1177,9 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
 export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
   return pipe(
     findChildElement('gmd:language', false),
-    findChildElement('gmd:LanguageCode'),
+    findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
+    map((lang) => (lang ? getLang2FromLang3(lang.toLowerCase()) : null))
   )(rootEl)
 }