geonetwork-ui 2.7.4-dev.edb6871ab → 2.7.5-dev.0280196b6

package/libs/feature/dataviz/src/lib/service/data.service.d.ts

@@ -27,7 +27,7 @@ export declare class DataService {
     getDownloadLinksFromWfs(wfsLink: DatasetServiceDistribution): Observable<DatasetOnlineResource[]>;
     getDownloadLinksFromOgcApiFeatures(ogcApiLink: DatasetServiceDistribution): Promise<DatasetOnlineResource[]>;
     getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo>;
-    getItemsFromOgcApi(url: string): Promise<OgcApiRecord[]>;
+    getItemsFromOgcApi(url: string, limit?: number): Promise<OgcApiRecord[]>;
     getGeodataLinksFromTms(tmsLink: DatasetServiceDistribution, keepOriginalLink?: boolean): Promise<DatasetServiceDistribution[]>;
     getDownloadLinksFromEsriRest(esriRestLink: DatasetServiceDistribution): DatasetOnlineResource[];
     readAsGeoJson(link: DatasetOnlineResource, cacheActive: boolean): Observable<FeatureCollection>;

package/libs/feature/dataviz/src/lib/service/data.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/dataviz/src/lib/service/data.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAEpB,YAAY,EACZ,WAAW,EACX,UAAU,EAEX,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACL,UAAU,EAKX,MAAM,8CAA8C,CAAA;AACrD,OAAO,EAIL,YAAY,EACb,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAQ,UAAU,EAAc,MAAM,MAAM,CAAA;AAEnD,OAAO,EACL,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wFAAwF,CAAA;;AAe3H,UAAU,eAAe;IACvB,GAAG,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,CAAA;CACvE;AAED,qBAGa,WAAW;IACV,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAEvC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC;IA2BvD,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,eAAe,CAAC;IAkD9B,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,MAAM,CAAC;IAerB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMlE,uBAAuB,CACrB,OAAO,EAAE,0BAA0B,GAClC,UAAU,CAAC,qBAAqB,EAAE,CAAC;IA6BhC,kCAAkC,CACtC,UAAU,EAAE,0BAA0B,GACrC,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAiB7B,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAWrE,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAaxD,sBAAsB,CAC1B,OAAO,EAAE,0BAA0B,EACnC,gBAAgB,UAAQ,GACvB,OAAO,CAAC,0BAA0B,EAAE,CAAC;IAqCxC,4BAA4B,CAC1B,YAAY,EAAE,0BAA0B,GACvC,qBAAqB,EAAE;IAU1B,aAAa,CACX,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,OAAO,GACnB,UAAU,CAAC,iBAAiB,CAAC;IAUhC,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAQnD,UAAU,CACR,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,OAAO,GACnB,UAAU,CAAC,UAAU,CAAC;yCAjQd,WAAW;6CAAX,WAAW;CAmTvB"}
+{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/dataviz/src/lib/service/data.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAEpB,YAAY,EACZ,WAAW,EACX,UAAU,EAEX,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACL,UAAU,EAKX,MAAM,8CAA8C,CAAA;AACrD,OAAO,EAIL,YAAY,EACb,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAQ,UAAU,EAAc,MAAM,MAAM,CAAA;AAEnD,OAAO,EACL,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wFAAwF,CAAA;;AAgB3H,UAAU,eAAe;IACvB,GAAG,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,CAAA;CACvE;AAED,qBAGa,WAAW;IACV,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAEvC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC;IA2BvD,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,eAAe,CAAC;IAkD9B,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,MAAM,CAAC;IAerB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMlE,uBAAuB,CACrB,OAAO,EAAE,0BAA0B,GAClC,UAAU,CAAC,qBAAqB,EAAE,CAAC;IA6BhC,kCAAkC,CACtC,UAAU,EAAE,0BAA0B,GACrC,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAiB7B,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAWrE,kBAAkB,CACtB,GAAG,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,EAAE,CAAC;IAapB,sBAAsB,CAC1B,OAAO,EAAE,0BAA0B,EACnC,gBAAgB,UAAQ,GACvB,OAAO,CAAC,0BAA0B,EAAE,CAAC;IAqCxC,4BAA4B,CAC1B,YAAY,EAAE,0BAA0B,GACvC,qBAAqB,EAAE;IAU1B,aAAa,CACX,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,OAAO,GACnB,UAAU,CAAC,iBAAiB,CAAC;IAUhC,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAQnD,UAAU,CACR,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,OAAO,GACnB,UAAU,CAAC,UAAU,CAAC;yCApQd,WAAW;6CAAX,WAAW;CAmUvB"}

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

@@ -1 +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"}
+{"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,QAIN,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.7.4-dev.edb6871ab",
+  "version": "2.7.5-dev.0280196b6",
   "engines": {
     "node": ">=20"
   },

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -36,6 +36,7 @@ marker('dataset.error.forbidden')
 marker('wfs.unreachable.unknown')
 marker('wfs.featuretype.notfound')
 marker('wfs.geojsongml.notsupported')
+marker('ogc.geojson.notsupported')
 marker('ogc.unreachable.unknown')
 marker('dataset.error.network')
 marker('dataset.error.http')
@@ -220,12 +221,15 @@ export class DataService {
       })
   }
 
-  async getItemsFromOgcApi(url: string): Promise<OgcApiRecord[]> {
+  async getItemsFromOgcApi(
+    url: string,
+    limit?: number
+  ): Promise<OgcApiRecord[]> {
     const endpoint = new OgcApiEndpoint(url)
     return await endpoint.featureCollections
       .then((collections) => {
         return collections.length
-          ? endpoint.getCollectionItems(collections[0])
+          ? endpoint.getCollectionItems(collections[0], limit)
           : null
       })
       .catch(() => {
@@ -347,13 +351,26 @@ export class DataService {
     ) {
       return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
         switchMap((collectionInfo) => {
-          const geojsonUrl = collectionInfo.jsonDownloadLink
-          return openDataset(geojsonUrl, 'geojson', undefined, cacheActive)
-        }),
-        tap((url) => {
-          if (url === null) {
-            throw new Error('wfs.geojsongml.notsupported')
+          const isMimeTypeJson = (mimeType: string): boolean => {
+            return mimeType.toLowerCase().indexOf('json') > -1
           }
+          const geojsonUrl =
+            collectionInfo.bulkDownloadLinks[
+              Object.keys(collectionInfo.bulkDownloadLinks).find((mimeType) =>
+                isMimeTypeJson(mimeType)
+              )
+            ]
+          if (!geojsonUrl) {
+            return throwError(() => 'ogc.geojson.notsupported')
+          }
+          const urlWithoutLimit = new URL(geojsonUrl)
+          urlWithoutLimit.searchParams.delete('limit')
+          return openDataset(
+            urlWithoutLimit.toString(),
+            'geojson',
+            undefined,
+            cacheActive
+          )
         })
       )
     }

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -137,7 +137,7 @@ export class MdViewFacade {
               link.accessServiceProtocol === 'ogcFeatures'
             ) {
               return from(
-                this.dataService.getItemsFromOgcApi(link.url.href)
+                this.dataService.getItemsFromOgcApi(link.url.href, 1)
               ).pipe(
                 map((collectionRecords: OgcApiRecord[]) => {
                   return collectionRecords &&

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

@@ -2,7 +2,8 @@ import packageJson from '../../../../../package.json'
 
 export const GEONETWORK_UI_VERSION = packageJson.version
 
-export const GEONETWORK_UI_TAG_NAME =
-  GEONETWORK_UI_VERSION.split('-')[1] === 'dev'
-    ? '2.7.x'
-    : `v${packageJson.version}`
+export const GEONETWORK_UI_TAG_NAME = GEONETWORK_UI_VERSION.split(
+  '-'
+)[1]?.startsWith('dev')
+  ? '2.7.x'
+  : `v${packageJson.version}`

package/translations/de.json

@@ -382,6 +382,7 @@
   "multiselect.filter.placeholder": "Suche",
   "nav.back": "Zurück",
   "navbar.mobile.menuTitle": "Schnellzugriff",
+  "ogc.geojson.notsupported": "Dieser OGC API-Dienst unterstützt das GeoJSON-Format nicht.",
   "ogc.unreachable.unknown": "Der Dienst konnte nicht erreicht werden",
   "organisation.filter.placeholder": "Ergebnisse filtern",
   "organisation.sort.sortBy": "Sortieren nach:",

package/translations/en.json

@@ -383,6 +383,7 @@
   "multiselect.filter.placeholder": "Search",
   "nav.back": "Back",
   "navbar.mobile.menuTitle": "Quick access",
+  "ogc.geojson.notsupported": "This OGC API does not support the GeoJSON format",
   "ogc.unreachable.unknown": "The service could not be reached",
   "organisation.filter.placeholder": "Filter results",
   "organisation.sort.sortBy": "Sort by:",

package/translations/es.json

@@ -382,6 +382,7 @@
   "multiselect.filter.placeholder": "",
   "nav.back": "",
   "navbar.mobile.menuTitle": "Acceso rápido",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "",
   "organisation.filter.placeholder": "",
   "organisation.sort.sortBy": "",

package/translations/fr.json

@@ -382,6 +382,7 @@
   "multiselect.filter.placeholder": "Rechercher",
   "nav.back": "Retour",
   "navbar.mobile.menuTitle": "Navigation rapide",
+  "ogc.geojson.notsupported": "Le service OGC API ne supporte pas le format GeoJSON",
   "ogc.unreachable.unknown": "Le service n'est pas accessible",
   "organisation.filter.placeholder": "Filtrer les résultats",
   "organisation.sort.sortBy": "Trier par :",

package/translations/it.json

@@ -382,6 +382,7 @@
   "multiselect.filter.placeholder": "Cerca",
   "nav.back": "Indietro",
   "navbar.mobile.menuTitle": "Accesso rapido",
+  "ogc.geojson.notsupported": "Il servizio OGC API non supporta il formato GeoJSON.",
   "ogc.unreachable.unknown": "Il servizio non è accessibile",
   "organisation.filter.placeholder": "Filtra i risultati",
   "organisation.sort.sortBy": "Ordina per:",

package/translations/nl.json

@@ -382,6 +382,7 @@
   "multiselect.filter.placeholder": "",
   "nav.back": "",
   "navbar.mobile.menuTitle": "",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "",
   "organisation.filter.placeholder": "",
   "organisation.sort.sortBy": "",

package/translations/pt.json

@@ -382,6 +382,7 @@
   "multiselect.filter.placeholder": "",
   "nav.back": "",
   "navbar.mobile.menuTitle": "",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "",
   "organisation.filter.placeholder": "",
   "organisation.sort.sortBy": "",

package/translations/sk.json

@@ -382,6 +382,7 @@
   "multiselect.filter.placeholder": "Hľadať",
   "nav.back": "Späť",
   "navbar.mobile.menuTitle": "",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "So službou sa nedalo spojiť",
   "organisation.filter.placeholder": "Filtrovať výsledky",
   "organisation.sort.sortBy": "Zoradiť podľa:",