geonetwork-ui 2.7.0-dev.65c46841b → 2.7.0-dev.7488c1064

package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.ts

@@ -6,7 +6,7 @@ import { DatasetFeatureCatalog } from '../../../../../../libs/common/domain/src/
 import { FormsModule } from '@angular/forms'
 import { of } from 'rxjs'
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators'
-import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
+import { createFuzzyFilter, getIsMobile } from '../../../../../../libs/util/shared/src'
 import { iconoirSearch } from '@ng-icons/iconoir'
 
 @Component({
@@ -39,6 +39,8 @@ export class SearchFeatureCatalogComponent {
     return this._featureCatalog
   }
 
+  isMobile$ = getIsMobile()
+
   @Output() filteredFeatureCatalogChange =
     new EventEmitter<DatasetFeatureCatalog>()
   filteredFeatureCatalog: DatasetFeatureCatalog

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -231,6 +231,7 @@ export function loadAppConfig() {
           'filter_geometry_url',
           'search_preset',
           'advanced_filters',
+          'limit',
         ],
         warnings,
         errors
@@ -257,6 +258,7 @@ export function loadAppConfig() {
                 filters: param.filters,
               })),
               ADVANCED_FILTERS: parsedSearchSection.advanced_filters,
+              LIMIT: parsedSearchSection.limit,
             } as SearchConfig)
 
       const parsedMetadataQualitySection = parseConfigSection(

package/src/libs/util/app-config/src/lib/model.ts

@@ -60,6 +60,7 @@ export interface SearchConfig {
   FILTER_GEOMETRY_DATA?: string
   SEARCH_PRESET?: SearchPreset[]
   ADVANCED_FILTERS?: []
+  LIMIT?: number
 }
 
 export interface MetadataQualityConfig {

package/src/libs/util/shared/src/lib/utils/geojson.ts

@@ -1,8 +1,11 @@
-import { Feature, FeatureCollection, Geometry } from 'geojson'
+import type { Feature, FeatureCollection, Geometry, Position } from 'geojson'
 
+/**
+ * @returns The geometry if available, otherwise null.
+ */
 export function getGeometryFromGeoJSON(
   data: FeatureCollection | Feature | Geometry
-): Geometry {
+): Geometry | null {
   if (data.type === 'FeatureCollection') {
     return data?.features?.[0]?.geometry || null
   }
@@ -24,3 +27,70 @@ export function getGeometryFromGeoJSON(
   }
   return null
 }
+
+// FIXME: this type should be more generic across the project
+export type BoundingBox = [number, number, number, number]
+
+export function getGeometryBoundingBox(geometry: Geometry): BoundingBox {
+  // use the bounding box if specified in the GeoJSON object
+  if (geometry.bbox) {
+    return geometry.bbox.length > 4
+      ? [geometry.bbox[0], geometry.bbox[1], geometry.bbox[3], geometry.bbox[4]]
+      : (geometry.bbox as BoundingBox)
+  }
+
+  const coordinatesReducer = (prev: BoundingBox, coords: Position) =>
+    [
+      Math.min(prev[0], coords[0]),
+      Math.min(prev[1], coords[1]),
+      Math.max(prev[2], coords[0]),
+      Math.max(prev[3], coords[1]),
+    ] as BoundingBox
+  const coordinatesArrayReducer = (
+    prev: BoundingBox,
+    coordsArray: Position[]
+  ) => {
+    const bbox = coordsArray.reduce(coordinatesReducer, emptyExtent)
+    return [
+      Math.min(prev[0], bbox[0]),
+      Math.min(prev[1], bbox[1]),
+      Math.max(prev[2], bbox[2]),
+      Math.max(prev[3], bbox[3]),
+    ] as BoundingBox
+  }
+  const emptyExtent = [Infinity, Infinity, -Infinity, -Infinity] as BoundingBox
+
+  switch (geometry.type) {
+    case 'MultiPolygon':
+      return geometry.coordinates.reduce((prev, polygonCoords) => {
+        const bbox = polygonCoords.reduce(coordinatesArrayReducer, emptyExtent)
+        return [
+          Math.min(prev[0], bbox[0]),
+          Math.min(prev[1], bbox[1]),
+          Math.max(prev[2], bbox[2]),
+          Math.max(prev[3], bbox[3]),
+        ] as BoundingBox
+      }, emptyExtent)
+    case 'GeometryCollection':
+      return geometry.geometries.reduce((prev, geom) => {
+        const bbox = getGeometryBoundingBox(geom)
+        return [
+          Math.min(prev[0], bbox[0]),
+          Math.min(prev[1], bbox[1]),
+          Math.max(prev[2], bbox[2]),
+          Math.max(prev[3], bbox[3]),
+        ] as BoundingBox
+      }, emptyExtent)
+    case 'Polygon':
+    case 'MultiLineString':
+      return geometry.coordinates.reduce(coordinatesArrayReducer, emptyExtent)
+    case 'LineString':
+    case 'MultiPoint':
+      return geometry.coordinates.reduce<BoundingBox>(
+        coordinatesReducer,
+        emptyExtent
+      )
+    case 'Point':
+      return coordinatesReducer(emptyExtent, geometry.coordinates)
+  }
+}

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

@@ -4,6 +4,7 @@ export * from './format-fields'
 export * from './fuzzy-filter'
 export * from './geojson'
 export * from './image-resize'
+export * from './mobile-screen'
 export * from './no-duplicate-file-name'
 export * from './parse'
 export * from './remove-whitespace'

package/src/libs/util/shared/src/lib/utils/mobile-screen.ts

@@ -0,0 +1,14 @@
+import { fromEvent, startWith, map, shareReplay } from 'rxjs'
+
+/**
+ * This returns true when the screen size is under 768px, which is the mobile threshold.
+ */
+const MOBILE_MAX_WIDTH = 768
+
+export function getIsMobile() {
+  return fromEvent(window, 'resize').pipe(
+    startWith(window.innerWidth),
+    map(() => window.innerWidth < MOBILE_MAX_WIDTH),
+    shareReplay({ bufferSize: 1, refCount: true })
+  )
+}

package/translations/de.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "Beschreibung",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Schließen",
   "record.metadata.api.form.closeForm": "Formular schließen",
   "record.metadata.api.form.create": "Ihre Anfrage erstellen",

package/translations/en.json

@@ -390,6 +390,16 @@
   "record.kind.service": "Service",
   "record.metadata.about": "Description",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "GPFDL",
+  "record.metadata.api.accessServiceProtocol.esriRest": "esriRest",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "maplibre-style",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "ogcFeatures",
+  "record.metadata.api.accessServiceProtocol.other": "other",
+  "record.metadata.api.accessServiceProtocol.tms": "tms",
+  "record.metadata.api.accessServiceProtocol.wfs": "wfs",
+  "record.metadata.api.accessServiceProtocol.wms": "wms",
+  "record.metadata.api.accessServiceProtocol.wmts": "wmts",
+  "record.metadata.api.accessServiceProtocol.wps": "wps",
   "record.metadata.api.form.closeButton": "Close",
   "record.metadata.api.form.closeForm": "Close the form",
   "record.metadata.api.form.create": "Create your request",

package/translations/es.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "",
   "record.metadata.api": "",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "",
   "record.metadata.api.form.closeForm": "",
   "record.metadata.api.form.create": "",

package/translations/fr.json

@@ -390,6 +390,16 @@
   "record.kind.service": "Service",
   "record.metadata.about": "A propos",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "autre",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Fermer",
   "record.metadata.api.form.closeForm": "Fermer le panneau de personnalisation",
   "record.metadata.api.form.create": "Paramétrer votre requête",

package/translations/it.json

@@ -390,6 +390,16 @@
   "record.kind.service": "Servizio",
   "record.metadata.about": "Descrizione",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Chiude",
   "record.metadata.api.form.closeForm": "Chiude il pannello di personalizzazione",
   "record.metadata.api.form.create": "Configura la sua richiesta",

package/translations/nl.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "",
   "record.metadata.api": "",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "",
   "record.metadata.api.form.closeForm": "",
   "record.metadata.api.form.create": "",

package/translations/pt.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "",
   "record.metadata.api": "",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "",
   "record.metadata.api.form.closeForm": "",
   "record.metadata.api.form.create": "",

package/translations/sk.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "O",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Zavrieť",
   "record.metadata.api.form.closeForm": "Zavrieť formulár",
   "record.metadata.api.form.create": "Vytvoriť požiadavku",