geonetwork-ui 2.6.0-dev.3a78a5eaa → 2.6.0-dev.492bf4497

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

@@ -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

@@ -430,6 +430,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 +461,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 +491,7 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
+          accessRestricted: accessRestricted,
         }
       case 'link':
         return {
@@ -503,8 +510,8 @@ export class Gn4FieldMapper {
         return {
           ...distribution,
           type,
-          endpointUrl: url,
-          protocol: accessServiceProtocol,
+          url: url,
+          accessServiceProtocol: accessServiceProtocol,
         }
     }
   }

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

@@ -965,8 +965,8 @@ export function extractServiceOnlineResources(): ChainableFunction<
         } else {
           return {
             type: 'endpoint',
-            endpointUrl: url,
-            protocol,
+            url: url,
+            accessServiceProtocol: protocol,
             ...(description && { description }),
             translations,
           }

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

@@ -1227,7 +1227,7 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
 }
 
 export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
-  switch (endpoint.protocol.toLowerCase()) {
+  switch (endpoint.accessServiceProtocol.toLowerCase()) {
     case 'wfs':
       return 'OGC:WFS'
     case 'wms':
@@ -1235,14 +1235,14 @@ export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
     case 'wps':
       return 'OGC:WPS'
     default:
-      return endpoint.protocol
+      return endpoint.accessServiceProtocol
   }
 }
 
 export function createOnlineResource(onlineResource: ServiceOnlineResource) {
   let linkageUrl, functionCode, protocol
   if (onlineResource.type === 'endpoint') {
-    linkageUrl = onlineResource.endpointUrl.toString()
+    linkageUrl = onlineResource.url.toString()
     protocol = getServiceEndpointProtocol(onlineResource)
     functionCode = 'download'
   } else {

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -299,14 +299,6 @@ export class ElasticsearchService {
 
   private mustNotFilters(): Record<string, unknown>[] {
     return [
-      {
-        ...this.queryFilterOnValues('resourceType', [
-          'service',
-          'map',
-          'map/static',
-          'mapDigital',
-        ]),
-      },
       {
         query_string: {
           query:
@@ -429,7 +421,7 @@ export class ElasticsearchService {
           must_not: this.mustNotFilters(),
         },
       },
-      _source: ['resourceTitleObject', 'uuid'],
+      _source: ['resourceTitleObject', 'uuid', 'resourceType'],
       from: 0,
       size: 20,
     }

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -152,7 +152,9 @@ export class Gn4Repository implements RecordsRepositoryInterface {
         attributes: Array.isArray(featureType.attributeTable)
           ? featureType.attributeTable.map((attr) => ({
               name: attr.name,
+              code: attr.code,
               title: attr.definition,
+              type: attr.type,
             }))
           : [],
       })),
@@ -164,7 +166,8 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   ): Observable<DatasetFeatureCatalog | null> {
     if (
       record.extras?.['featureTypes'] &&
-      Array.isArray(record.extras['featureTypes'])
+      Array.isArray(record.extras['featureTypes']) &&
+      record.extras['featureTypes'].length > 0
     ) {
       return of(this.mapEmbeddedFeatureCatalog(record.extras['featureTypes']))
     }

package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts

@@ -2,6 +2,8 @@ import { Provider } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { Gn4PlatformService } from './platform/gn4-platform.service'
 import { Gn4PlatformMapper } from './platform/gn4-platform.mapper'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { Gn4Repository } from './gn4-repository'
 
 export function provideGn4(): Provider[] {
   return [
@@ -9,6 +11,10 @@ export function provideGn4(): Provider[] {
       provide: PlatformServiceInterface,
       useClass: Gn4PlatformService,
     },
+    {
+      provide: RecordsRepositoryInterface,
+      useClass: Gn4Repository,
+    },
     Gn4PlatformMapper,
   ]
 }

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -152,6 +152,8 @@ export type ServiceProtocol =
   | 'esriRest'
   | 'ogcFeatures'
   | 'GPFDL'
+  | 'tms'
+  | 'maplibre-style'
   | 'other'
 
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
@@ -164,6 +166,7 @@ export interface DatasetServiceDistribution {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface DatasetDownloadDistribution {
@@ -178,6 +181,7 @@ export interface DatasetDownloadDistribution {
   description?: string
   accessServiceProtocol?: ServiceProtocol
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface OnlineLinkResource {
@@ -186,6 +190,8 @@ export interface OnlineLinkResource {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  mimeType?: string
+  accessRestricted?: boolean
 }
 
 export type DatasetOnlineResource = (
@@ -231,13 +237,13 @@ export type DatasetFeatureCatalog = {
   featureTypes: Array<{
     name: string
     definition: string
-    attributes: Array<{ name: string; title: string }>
+    attributes: Array<{ name: string; title: string; code: string }>
   }>
 }
 
 export interface ServiceEndpoint {
-  endpointUrl: URL
-  protocol: string
+  url: URL
+  accessServiceProtocol: ServiceProtocol
   type: 'endpoint'
   description?: string
   translations?: OnlineResourceTranslations
@@ -268,7 +274,12 @@ export interface DatasetFeatureType {
   isAbstract: string
   typeName: string
   definition: string
-  attributeTable: Array<{ name: string; definition: string }>
+  attributeTable: Array<{
+    name: string
+    definition: string
+    type: string
+    code: string
+  }>
 }
 
 export type ReuseType = 'application' | 'map' | 'other'

package/src/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts

@@ -1,147 +1,157 @@
 export const elasticLinkFixture = (): Record<string, unknown> => ({
   readmeLink: {
-    protocol: 'WWW:LINK',
+    accessServiceProtocol: 'WWW:LINK',
     description: 'Readme page',
     url: 'http://envlit.ifremer.fr/resultats/quadrige',
   },
   doiLink: {
-    protocol: 'WWW:DOI',
+    accessServiceProtocol: 'WWW:DOI',
     description: 'DOI for the resource',
     url: 'http://doi.org/123-456-678',
   },
   dataCsv: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in CSV format',
     name: 'abc.csv',
     url: 'http://my.server/files/abc.csv',
   },
   dataPdf: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in PDF format',
     name: 'abc.pdf',
     url: 'https://my.server/files/abc.pdf',
   },
   dataJpg: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in JPG format',
     name: 'abc.jpg',
     url: 'https://my.server/files/abc.jpg',
   },
   dataZip: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in ZIP format',
     name: 'abc.zip',
     url: 'https://my.server/files/abc.zip',
   },
   dataXls: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in XLS format',
     name: 'abc.xls',
     url: 'https://my.server/files/abc.xls',
   },
   dataXlsx: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in XLSX format',
     name: 'abc.XLSX',
     url: 'https://my.server/files/abc.XLSX',
   },
   dataJson: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in JSON format',
     name: 'abc.json',
     url: 'https://my.server/files/abc.json',
   },
   geodataJson: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in GeoJSON format',
     name: 'dataset.geojson',
     url: 'http://my.server/files/geographic/dataset.geojson',
   },
   geodataJsonWithMimeType: {
-    protocol: 'WWW:DOWNLOAD:application/vnd.geo+json',
+    accessServiceProtocol: 'WWW:DOWNLOAD:application/vnd.geo+json',
     description: 'Geographic data in GeoJSON format',
     name: 'dataset.geojson',
     url: 'http://my.server/files/geographic/dataset',
     mimeType: 'application/vnd.geo+json',
   },
   geodataKml: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in KML format',
     name: 'dataset.kml',
     url: 'http://my.server/files/geographic/dataset.kml',
   },
   geodataGpkg: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in geopackage format',
     name: 'dataset.gpkg',
     url: 'http://my.server/files/geographic/dataset.gpkg',
   },
   geodataShp: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in shapefile format',
     name: 'dataset.shp',
     url: 'http://my.server/files/geographic/dataset.zip',
   },
   geodataShpWithMimeType: {
-    protocol: 'WWW:DOWNLOAD:x-gis/x-shapefile',
+    accessServiceProtocol: 'WWW:DOWNLOAD:x-gis/x-shapefile',
     description: 'Geographic data in shapefile format',
     name: 'dataset',
     url: 'http://my.server/files/geographic/dataset.zip',
     mimeType: 'x-gis/x-shapefile',
   },
   geodataWms: {
-    protocol: 'OGC:WMS',
+    accessServiceProtocol: 'OGC:WMS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wms',
   },
   geodataWmts: {
-    protocol: 'OGC:WMTS',
+    accessServiceProtocol: 'OGC:WMTS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wmts',
   },
   geodataWfs: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wfs',
   },
   geodataWms2: {
-    protocol: 'OGC:WMS',
+    accessServiceProtocol: 'OGC:WMS',
     name: 'myotherlayer',
     url: 'https://my.ogc.server/wms',
   },
   geodataWfs2: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'myotherlayer',
     url: 'https://my.ogc.server/wfs',
   },
   geodataRest: {
-    protocol: 'ESRI:REST',
+    accessServiceProtocol: 'ESRI:REST',
     name: 'myrestlayer',
     url: 'https://my.esri.server/FeatureServer',
   },
   geodataRestWfs: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'mywfsrestlayer',
     url: 'https://my.esri.server/WFSServer',
   },
   maplayerRest: {
-    protocol: 'ESRI:REST',
+    accessServiceProtocol: 'ESRI:REST',
     name: 'myotherrestlayer',
     url: 'https://my.esri.server/MapServer',
   },
   landingPage: {
-    protocol: 'WWW:LINK:LANDING_PAGE',
+    accessServiceProtocol: 'WWW:LINK:LANDING_PAGE',
     name: 'landingpage link',
     url: 'https://landing.page',
   },
   unknownFormat: {
-    protocol: 'WWW:DOWNLOAD-1.0-http--download',
+    accessServiceProtocol: 'WWW:DOWNLOAD-1.0-http--download',
     name: 'Vue HTML des métadonnées sur internet',
     url: 'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480',
   },
   geodataogcfeatures: {
-    protocol: 'OGC API - Features',
+    accessServiceProtocol: 'OGC API - Features',
     name: 'ogcapi features layer',
     url: 'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?',
   },
+  maplayerTms: {
+    accessServiceProtocol: 'TMS',
+    name: 'mytmslayer',
+    url: 'https://my.tms.server/MapServer',
+  },
+  maplayerTms2: {
+    accessServiceProtocol: 'OSGeo:TMS',
+    name: 'myothertmslayer',
+    url: 'https://my.tms.server/MapServer',
+  },
 })

package/src/libs/common/fixtures/src/lib/link.fixtures.ts

@@ -185,6 +185,20 @@ export const aSetOfLinksFixture = () => ({
       url: new URL('https://my.ogc.server/wms'),
       accessServiceProtocol: 'wms',
     }) as DatasetServiceDistribution,
+  geodataTms: () =>
+    ({
+      name: 'mytmslayer',
+      type: 'service',
+      url: new URL('https://my.ogc.server/tms'),
+      accessServiceProtocol: 'tms',
+    }) as DatasetServiceDistribution,
+  geodataAsMaplibreStyle: () =>
+    ({
+      name: 'mytmslayerAsMaplibreJson',
+      type: 'service',
+      url: new URL('https://my.ogc.server/tms/layer/style.json'),
+      accessServiceProtocol: 'maplibre-style',
+    }) as DatasetServiceDistribution,
   geodataWfs2: () =>
     ({
       name: 'myotherlayer',
@@ -239,10 +253,10 @@ export const aSetOfLinksFixture = () => ({
     ({
       description:
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS'
       ),
-      protocol: 'wms',
+      accessServiceProtocol: 'wms',
       type: 'endpoint',
     }) as ServiceEndpoint,
 })

package/src/libs/common/fixtures/src/lib/record-link.fixtures.ts

@@ -1,26 +1,26 @@
 export const wmsRecordLinkFixture = () => ({
   description: 'Lieu de surveillance (point)',
   name: 'surval_parametre_point',
-  protocol: 'OGC:WMS',
+  accessServiceProtocol: 'OGC:WMS',
   url: 'https://www.ifremer.fr/services/wms/surveillance_littorale',
 })
 
 export const wpsRecordLinkFixture = () => ({
   description: "Extraction des données d'observation",
   name: 'r:survalextraction',
-  protocol: 'OGC:WPS',
+  accessServiceProtocol: 'OGC:WPS',
   url: 'https://www.ifremer.fr/services/wps/surval',
 })
 
 export const wwwRecordLinkFixture = () => ({
   description: '',
   name: 'La base de données Quadrige',
-  protocol: 'WWW:LINK',
+  praccessServiceProtocolotocol: 'WWW:LINK',
   url: 'http://envlit.ifremer.fr/resultats/quadrige',
 })
 
 export const doiRecordLinkFixture = () => ({
-  protocol: 'WWW:DOI',
+  accessServiceProtocol: 'WWW:DOI',
   description: 'DOI for the resource',
   url: 'http://doi.org/123-456-678',
 })
@@ -28,6 +28,6 @@ export const doiRecordLinkFixture = () => ({
 export const wfsRecordLinkFixture = () => ({
   description: 'Lieu de surveillance (point)',
   name: 'surval_parametre_point',
-  protocol: 'OGC:WFS',
+  accessServiceProtocol: 'OGC:WFS',
   url: 'https://www.ifremer.fr/services/wfs/surveillance_littorale',
 })

package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.html

@@ -18,15 +18,17 @@
       [selected]="xProperty$.value"
       [title]="'chart.dropdown.xProperty' | translate"
     ></gn-ui-dropdown-selector>
-    <gn-ui-dropdown-selector
-      class="basis-1/4"
-      *ngIf="!isCountAggregation"
-      [choices]="yChoices$ | async"
-      (selectValue)="yProperty$.next($event)"
-      [selected]="yProperty$.value"
-      [title]="'chart.dropdown.yProperty' | translate"
-      class="select-y-prop"
-    ></gn-ui-dropdown-selector>
+    <ng-container *ngIf="yChoices$ | async as yChoices">
+      <gn-ui-dropdown-selector
+        class="basis-1/4"
+        *ngIf="!isCountAggregation"
+        [choices]="yChoices"
+        (selectValue)="yProperty$.next($event)"
+        [selected]="yProperty$.value"
+        [title]="'chart.dropdown.yProperty' | translate"
+        class="select-y-prop"
+      ></gn-ui-dropdown-selector>
+    </ng-container>
     <gn-ui-dropdown-selector
       class="basis-1/4"
       [choices]="aggregationChoices"
@@ -40,8 +42,10 @@
     class="relative h-full mt-2 bg-white border border-gray-300 rounded-lg overflow-hidden"
   >
     <gn-ui-chart
+      *ngIf="!error"
       [data]="chartData$ | async"
       [type]="chartType$.value"
+      [prettyLabel]="prettyLabel$ | async"
       [labelProperty]="labelProperty"
       [valueProperty]="valueProperty"
     ></gn-ui-chart>