feat(dh): handle ogc api types

geonetwork · Dec 21, 2023 · 2e6c0b6 · 2e6c0b6
1 parent 73998bf
commit 2e6c0b6
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 1 deletion.
diff --git a/libs/api/metadata-converter/src/lib/common/distribution.mapper.ts b/libs/api/metadata-converter/src/lib/common/distribution.mapper.ts
@@ -5,6 +5,7 @@ export function matchProtocol(protocol: string): ServiceProtocol {
   if (/wfs/i.test(protocol)) return 'wfs'
   if (/wmts/i.test(protocol)) return 'wmts'
   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'
   return 'other'
 }

diff --git a/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.spec.ts b/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.spec.ts
@@ -72,6 +72,7 @@ describe('Gn4FieldMapper', () => {
           'link',
           'link',
           'download',
+          'service',
         ])
       })
     })

diff --git a/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts b/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts
@@ -323,7 +323,8 @@ export class Gn4FieldMapper {
       (/^ESRI:REST/.test(protocol) && /FeatureServer/.test(url)) ||
       /^OGC:WMS/.test(protocol) ||
       /^OGC:WFS/.test(protocol) ||
-      /^OGC:WMTS/.test(protocol)
+      /^OGC:WMTS/.test(protocol) ||
+      /ogc\W*api\W*features/i.test(protocol)
     ) {
       return 'service'
     }

diff --git a/libs/common/domain/src/lib/model/record/metadata.model.ts b/libs/common/domain/src/lib/model/record/metadata.model.ts
@@ -98,6 +98,7 @@ export type ServiceProtocol =
   | 'wps'
   | 'wmts'
   | 'esriRest'
+  | 'ogcFeatures'
   | 'other'
 
 export type DatasetDistributionType = 'service' | 'download' | 'link'

diff --git a/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts b/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts
@@ -141,4 +141,9 @@ export const ES_LINK_FIXTURES: Record<string, unknown> = deepFreeze({
     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',
+    name: 'ogcapi features layer',
+    url: 'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?',
+  },
 })
diff --git a/libs/common/fixtures/src/lib/link.fixtures.ts b/libs/common/fixtures/src/lib/link.fixtures.ts
@@ -151,4 +151,11 @@ export const LINK_FIXTURES: Record<string, DatasetDistribution> = deepFreeze({
       'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480'
     ),
   },
+  ogcApiFormat: {
+    name: 'ogc api features layer',
+    type: 'service',
+    url: new URL(
+      'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?'
+    ),
+  },
 })
diff --git a/libs/feature/record/src/lib/state/mdview.facade.ts b/libs/feature/record/src/lib/state/mdview.facade.ts
@@ -6,6 +6,7 @@ import * as MdViewSelectors from './mdview.selectors'
 import { LinkClassifierService, LinkUsage } from '@geonetwork-ui/util/shared'
 import { DatavizConfigurationModel } from '@geonetwork-ui/common/domain/model/dataviz/dataviz-configuration.model'
 import { CatalogRecord } from '@geonetwork-ui/common/domain/model/record'
+import { BehaviorSubject } from 'rxjs'
 
 @Injectable()
 /**

diff --git a/libs/util/shared/src/lib/links/link-classifier.service.ts b/libs/util/shared/src/lib/links/link-classifier.service.ts
@@ -25,6 +25,8 @@ export class LinkClassifierService {
           case 'wms':
           case 'wmts':
             return [LinkUsage.API, LinkUsage.MAP_API]
+          case 'ogcFeatures':
+            return [LinkUsage.API]
           default:
             return [LinkUsage.UNKNOWN]
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ describe('Gn4FieldMapper', () => { @@
               'link',
               'link',
               'download',
+              'service',
             ])
           })
         })
@@ Expand Down @@