geonetwork-ui 2.3.0-dev.f736344f → 2.3.0-dev.ff2a9db7

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

@@ -1,10 +1,12 @@
+export * from './bytes-convert';
+export * from './event';
+export * from './fuzzy-filter';
+export * from './geojson';
+export * from './image-resize';
 export * from './parse';
-export * from './strip-html';
 export * from './remove-whitespace';
-export * from './geojson';
 export * from './sort-by';
-export * from './url';
-export * from './event';
-export * from './fuzzy-filter';
+export * from './strip-html';
 export * from './temporal-extent-union';
+export * from './url';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,yBAAyB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,WAAW,CAAA;AACzB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,yBAAyB,CAAA;AACvC,cAAc,OAAO,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.3.0-dev.f736344f",
+  "version": "2.3.0-dev.ff2a9db7",
   "engines": {
     "node": ">=14.17.0"
   },
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-    "@camptocamp/ogc-client": "^0.4.0",
+    "@camptocamp/ogc-client": "1.1.1-dev.ddbb5b0",
     "@geospatial-sdk/geocoding": "^0.0.5-alpha.2",
     "@ltd/j-toml": "~1.35.2",
     "@messageformat/core": "^3.0.1",

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

@@ -1,4 +1,4 @@
-export * from './lib/iso19139/converter'
-export * from './lib/gn4/gn4.metadata.mapper'
-export * from './lib/gn4/atomic-operations'
-export * from './lib/gn4/types'
+export * from './lib/iso19139'
+export * from './lib/iso19115-3'
+export * from './lib/find-converter'
+export * from './lib/gn4'

package/src/libs/api/metadata-converter/src/lib/{metadata-base.mapper.ts → base.converter.ts}

@@ -7,13 +7,13 @@ export class MetadataMapperContext {
   readonly location?
 }
 
-export abstract class MetadataBaseMapper<F> {
+export abstract class BaseConverter<F> {
   constructor(
     protected ctx: MetadataMapperContext = new MetadataMapperContext()
   ) {}
 
   abstract readRecord(document: F): Promise<CatalogRecord>
-  abstract writeRecord(record: CatalogRecord): Promise<F>
+  abstract writeRecord(record: CatalogRecord, reference?: F): Promise<F>
   readRecords(documents: F[]): Promise<CatalogRecord[]> {
     return Promise.all(documents.map((doc) => this.readRecord(doc)))
   }

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

@@ -0,0 +1,16 @@
+import { Iso19139Converter } from './iso19139'
+import { BaseConverter } from './base.converter'
+import { Iso191153Converter } from './iso19115-3'
+
+export function findConverterForDocument(
+  document: string
+): BaseConverter<string> {
+  if (document.indexOf('mdb:MD_Metadata') > 0) {
+    return new Iso191153Converter()
+  } else if (document.indexOf('gmd:MD_Metadata') > 0) {
+    return new Iso19139Converter()
+  } else {
+    throw new Error(`No suitable converter found for the following document:
+${document.substring(0, 400)}...`)
+  }
+}

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

@@ -10,6 +10,21 @@ export const GENERIC_DATASET_RECORD: DatasetRecord = {
     description: 'A generic organization',
   },
   contacts: [
+    {
+      email: 'bob@org.net',
+      role: 'point_of_contact',
+      organization: {
+        name: 'MyOrganization',
+        website: new URL('https://www.my.org/info'),
+        logoUrl: new URL('https://www.my.org/logo.png'),
+        description: 'A generic organization',
+      },
+      firstName: 'Bob',
+      lastName: 'TheGreat',
+      position: 'developer',
+    },
+  ],
+  contactsForResource: [
     {
       email: 'bob@org.net',
       role: 'author',
@@ -32,14 +47,26 @@ export const GENERIC_DATASET_RECORD: DatasetRecord = {
       },
       position: 'manager',
     },
+    {
+      email: 'bill@org2.com',
+      role: 'distributor',
+      organization: {
+        name: 'Another Organization',
+        website: new URL('https://www.another.org/docs'),
+      },
+      position: 'randomWorker',
+      address: '123 rue des moulins, 10808 Montargis, FR',
+      phone: '+11234567890',
+      lastName: 'TheDistributor',
+      firstName: 'Bill',
+    },
   ],
-  contactsForResource: [],
   status: 'ongoing',
-  recordCreated: new Date('2022-02-01T15:12:00'),
-  recordPublished: new Date('2022-02-01T15:12:00'),
+  recordCreated: new Date('2021-11-15T09:00:00'),
+  recordPublished: new Date('2022-01-01T10:00:00'),
   recordUpdated: new Date('2022-02-01T15:12:00'),
-  datasetCreated: new Date('2022-09-01T14:18:19'),
-  datasetUpdated: new Date('2022-12-04T15:12:00'),
+  resourceCreated: new Date('2022-09-01T14:18:19'),
+  resourceUpdated: new Date('2022-12-04T15:12:00'),
   title: 'A very interesting dataset (un jeu de données très intéressant)',
   abstract: `# Introduction
 This dataset has been established for testing purposes.

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

@@ -16,11 +16,18 @@ export const GEO2FRANCE_PLU_DATASET_RECORD: DatasetRecord = {
       },
     },
   ],
-  contactsForResource: [],
-  recordCreated: new Date('2022-04-15T14:18:19'),
-  recordPublished: new Date('2022-04-15T14:18:19'),
+  contactsForResource: [
+    {
+      email: 'sig@agglo-compiegne.fr',
+      role: 'point_of_contact',
+      organization: {
+        name: 'GeoCompiegnois',
+      },
+    },
+  ],
   recordUpdated: new Date('2022-04-15T14:18:19'),
-  datasetUpdated: new Date('2022-03-29'),
+  resourcePublished: new Date('2022-05-01'),
+  resourceUpdated: new Date('2022-03-29'),
   title:
     "Plan local d'urbanisme (PLU) dématérialisé - commune d'Avrigny - approbation du 29/03/2022",
   // data revision: 2022-03-29 ???

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

@@ -13,6 +13,17 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
     {
       email: 'rolf.giezendanner@are.admin.ch',
       role: 'point_of_contact',
+      address: 'Ittigen, 3063, CH',
+      organization: {
+        name: 'Bundesamt für Raumentwicklung',
+      },
+    },
+  ],
+  contactsForResource: [
+    {
+      email: 'rolf.giezendanner@are.admin.ch',
+      role: 'point_of_contact',
+      address: 'Ittigen, 3063, CH',
       organization: {
         name: 'Bundesamt für Raumentwicklung',
       },
@@ -25,12 +36,9 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
       },
     },
   ],
-  contactsForResource: [],
-  recordCreated: new Date('2022-02-22T19:40:06'),
-  recordPublished: new Date('2022-02-22T19:40:06'),
   recordUpdated: new Date('2022-02-22T19:40:06'),
-  datasetCreated: new Date('1999-01-01T00:00:00'),
-  datasetUpdated: new Date('2009-01-01'),
+  resourceCreated: new Date('1999-01-01T00:00:00'),
+  resourceUpdated: new Date('2009-01-01'),
   title: 'Alpenkonvention',
   abstract: `Perimeter der Alpenkonvention in der Schweiz. Die Alpenkonvention ist ein völkerrechtlicher Vertrag zwischen den acht Alpenländern Deutschland, Frankreich, Italien, Liechtenstein, Monaco, Österreich, Schweiz, Slowenien sowie der Europäischen Union. Das Ziel des Übereinkommens ist der Schutz der Alpen durch eine sektorübergreifende, ganzheitliche und nachhaltige Politik.`,
   overviews: [],
@@ -339,9 +347,25 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
     website: new URL('https://www.sg.ch/bauen/geoinformation/datenbezug.html'),
   },
   contacts: [
+    {
+      email: 'geodaten@sg.ch',
+      role: 'resource_provider',
+      phone: '+41(0)58 229 31 47',
+      address: 'St. Gallen, 9001, CH',
+      organization: {
+        name: 'Amt für Raumentwicklung und Geoinformation (SG)',
+        website: new URL(
+          'https://www.sg.ch/bauen/geoinformation/datenbezug.html'
+        ),
+      },
+    },
+  ],
+  contactsForResource: [
     {
       email: 'geodaten@sg.ch',
       role: 'other',
+      phone: '+41(0)58 229 31 47',
+      address: 'St. Gallen, 9001, CH',
       organization: {
         name: 'Amt für Raumentwicklung und Geoinformation (SG)',
         website: new URL(
@@ -352,6 +376,8 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
     {
       email: 'geodaten@sg.ch',
       role: 'publisher',
+      phone: '+41(0)58 229 31 47',
+      address: 'St. Gallen, 9001, CH',
       organization: {
         name: 'Amt für Raumentwicklung und Geoinformation (SG)',
         website: new URL(
@@ -360,9 +386,9 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
       },
     },
   ],
-  recordCreated: new Date('2022-03-07T01:15:51+01:00'),
-  recordPublished: new Date('2022-03-07T01:15:51+01:00'),
   recordUpdated: new Date('2022-03-07T01:15:51+01:00'),
+  resourceCreated: new Date('2021-09-15'),
+  resourceUpdated: new Date('2021-09-17'),
   title: 'Verkehrsregelungsanlagen (WMS)',
   abstract: `Diese Karte beinhaltet die Verkehrsregelungsanlagen des Kantons St.Gallen.`,
   overviews: [