geonetwork-ui 2.11.0-dev.aed5b2e5b → 2.11.0-dev.bc1a6d4e2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.11.0-dev.aed5b2e5b",
+  "version": "2.11.0-dev.bc1a6d4e2",
   "engines": {
     "node": ">=24"
   },
@@ -28,6 +28,7 @@
     "@angular/core": "19.x || 20.x || 21.x",
     "@angular/forms": "19.x || 20.x || 21.x",
     "@angular/material": "19.x || 20.x || 21.x",
+    "@angular/material-date-fns-adapter": "19.x || 20.x",
     "@angular/platform-browser": "19.x || 20.x || 21.x",
     "@angular/platform-browser-dynamic": "19.x || 20.x || 21.x",
     "@angular/router": "19.x || 20.x || 21.x",

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

@@ -34,7 +34,12 @@ import {
   LanguageCode,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
-import { getGeometryBoundingBox } from '../../../../../../../libs/util/shared/src'
+import {
+  bboxToPolygon,
+  BoundingBox,
+  getGeometryBoundingBox,
+  isBoundingBox,
+} from '../../../../../../../libs/util/shared/src'
 import { getLength as getGeodesicLength } from 'ol/sphere.js'
 import { LineString } from 'ol/geom.js'
 
@@ -264,8 +269,18 @@ export class ElasticsearchService {
     return this.metadataLang === 'current'
   }
 
-  private filtersToQuery(
+  private findSpatialFilterExtent(
     filters: FieldFilters | FiltersAggregationParams | string
+  ): BoundingBox | undefined {
+    if (typeof filters === 'string') {
+      return undefined
+    }
+    return Object.values(filters).find(isBoundingBox)
+  }
+
+  private filtersToQuery(
+    filters: FieldFilters | FiltersAggregationParams | string,
+    spatialFilterExtent = this.findSpatialFilterExtent(filters)
   ): FilterQuery {
     const addQuote = (key: string) => (/^\/.+\/$/.test(key) ? key : `"${key}"`)
     const makeQuery = (filter: FieldFilter): string => {
@@ -286,7 +301,9 @@ export class ElasticsearchService {
         ? filters
         : Object.keys(filters)
             .filter((fieldname) => fieldname !== 'gn-ui-crossFieldFilter')
+            .filter((fieldname) => !isBoundingBox(filters[fieldname]))
             .filter((fieldname) => !isDateRange(filters[fieldname]))
+            .filter((fieldname) => !Array.isArray(filters[fieldname]))
             .filter(
               (fieldname) =>
                 filters[fieldname] &&
@@ -330,6 +347,21 @@ export class ElasticsearchService {
             },
           },
         },
+      spatialFilterExtent && {
+        geo_shape: {
+          geom: {
+            shape: {
+              type: 'envelope',
+              // spatialFilterExtent is [minX, minY, maxX, maxY]; envelope coordinates are [top-left, bottom-right]
+              coordinates: [
+                [spatialFilterExtent[0], spatialFilterExtent[3]],
+                [spatialFilterExtent[2], spatialFilterExtent[1]],
+              ],
+            },
+            relation: 'intersects',
+          },
+        },
+      },
     ].filter(Boolean)
     return queryParts.length > 0 ? (queryParts as FilterQuery) : undefined
   }
@@ -368,7 +400,12 @@ export class ElasticsearchService {
         },
       })
     }
-    const queryFilters = this.filtersToQuery(fieldSearchFilters)
+    // a spatial extent filter takes precedence over the preference geometry for boosting
+    const spatialFilterExtent = this.findSpatialFilterExtent(fieldSearchFilters)
+    const queryFilters = this.filtersToQuery(
+      fieldSearchFilters,
+      spatialFilterExtent
+    )
     if (queryFilters) {
       filter.push(...queryFilters)
     }
@@ -379,7 +416,10 @@ export class ElasticsearchService {
         },
       })
     }
-    if (geometry) {
+    const boostGeometry = spatialFilterExtent
+      ? bboxToPolygon(spatialFilterExtent)
+      : geometry
+    if (boostGeometry) {
       // boosts applied using the filter geometry:
       // * records completely within the geometry receive a boost of 5
       // * records intersecting the geometry receive a boost of 2
@@ -389,7 +429,7 @@ export class ElasticsearchService {
         {
           geo_shape: {
             geom: {
-              shape: geometry,
+              shape: boostGeometry,
               relation: 'within',
             },
             boost: 5.0,
@@ -398,7 +438,7 @@ export class ElasticsearchService {
         {
           geo_shape: {
             geom: {
-              shape: geometry,
+              shape: boostGeometry,
               relation: 'intersects',
             },
             boost: 2.0,
@@ -409,7 +449,7 @@ export class ElasticsearchService {
       // this will boost the results variably depending on their distance from the given geometry
       // note: this takes into account the `location` field of a record; this is generally the center of all spatial extents
       // combined, and thus the actual size/coverage of the record spatial extent isn't relevant here
-      const bbox = getGeometryBoundingBox(geometry)
+      const bbox = getGeometryBoundingBox(boostGeometry)
       const center = [(bbox[0] + bbox[2]) / 2, (bbox[1] + bbox[3]) / 2]
       const northToCenter = new LineString([
         [center[0], bbox[3]],

package/src/libs/common/domain/src/lib/model/search/filter.model.ts

@@ -6,11 +6,15 @@ export type FieldFilterByRange = {
   start?: Date
   end?: Date
 }
+// matches util/shared's BoundingBox; duplicated here to avoid a circular
+// dependency (util/shared already depends on common/domain)
+export type FieldFilterByBoundingBox = [number, number, number, number]
 
 export type FieldFilter =
   | FieldFilterByExpression
   | FieldFilterByValues
   | FieldFilterByRange
+  | FieldFilterByBoundingBox
 export type FieldFilters = Record<FieldName, FieldFilter>
 
 export type QueryString = {
@@ -19,4 +23,12 @@ export type QueryString = {
 export type QueryRange = {
   range: Record<string, { format: string; gte: string; lte: string }>
 }
-export type FilterQuery = Array<QueryString | QueryRange>
+export type QueryGeoShape = {
+  geo_shape: {
+    geom: {
+      shape: { type: string; coordinates: number[][] }
+      relation: string
+    }
+  }
+}
+export type FilterQuery = Array<QueryString | QueryRange | QueryGeoShape>

package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.html

@@ -7,9 +7,11 @@
 } @else if (fieldType === 'spatialExtent') {
   <gn-ui-spatial-extent-dropdown
     [title]="title"
+    [initialBbox]="(selectedBoundingBox$ | async) ?? null"
     [maxFileSizeMb]="spatialExtentMaxFileSize"
     (bboxChange)="onBboxChange($event)"
     (errorChange)="onSpatialExtentError($event)"
+    [attr.data-cy-field]="fieldName"
   ></gn-ui-spatial-extent-dropdown>
 } @else {
   <gn-ui-dropdown-multiselect

package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts

@@ -71,6 +71,14 @@ export class FilterDropdownComponent implements OnInit {
     map((selected) => (Array.isArray(selected) ? {} : (selected as DateRange)))
   ) as Observable<DateRange>
 
+  selectedBoundingBox$ = this.selected$.pipe(
+    map((selected) =>
+      Array.isArray(selected) && selected.length > 0
+        ? (selected as BoundingBox)
+        : null
+    )
+  ) as Observable<BoundingBox | null>
+
   onSelectedValues(values: unknown[]) {
     this.fieldsService
       .buildFiltersFromFieldValues({ [this.fieldName]: values as FieldValue[] })
@@ -80,7 +88,11 @@ export class FilterDropdownComponent implements OnInit {
   private spatialExtentErrorNotificationId: number | null = null
 
   onBboxChange(bbox: BoundingBox | null) {
-    console.log(bbox)
+    this.fieldsService
+      .buildFiltersFromFieldValues({
+        [this.fieldName]: bbox,
+      })
+      .subscribe((filters) => this.searchService.updateFilters(filters))
     this.clearSpatialExtentErrorNotification()
   }
 

package/src/libs/feature/search/src/lib/utils/service/fields.service.ts

@@ -2,6 +2,7 @@ import { Injectable, Injector, inject } from '@angular/core'
 import {
   AbstractSearchField,
   AvailableServicesField,
+  BoundingBoxSearchField,
   DateRangeSearchField,
   FieldValue,
   FullTextSearchField,
@@ -15,7 +16,6 @@ import {
   TranslatedSearchField,
   RecordKindField,
   UserSearchField,
-  SpatialExtentSearchField,
 } from './fields'
 import { forkJoin, Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
@@ -96,7 +96,7 @@ export class FieldsService {
     user: new UserSearchField(this.injector),
     changeDate: new DateRangeSearchField('changeDate', this.injector, 'desc'),
     availableServices: new AvailableServicesField(this.injector),
-    spatialExtent: new SpatialExtentSearchField(this.injector),
+    spatialExtent: new BoundingBoxSearchField('spatialExtent', this.injector),
   } as Record<string, AbstractSearchField>
 
   get supportedFields() {

package/src/libs/feature/search/src/lib/utils/service/fields.ts

@@ -20,7 +20,11 @@ import {
   isDateRange,
   METADATA_LANGUAGE,
 } from '../../../../../../../libs/api/repository/src'
-import { formatUserInfo } from '../../../../../../../libs/util/shared/src'
+import {
+  BoundingBox,
+  formatUserInfo,
+  isBoundingBox,
+} from '../../../../../../../libs/util/shared/src'
 import { PossibleResourceTypes } from '../../../../../../../libs/api/metadata-converter/src'
 
 export type FieldType = 'values' | 'dateRange' | 'spatialExtent'
@@ -431,16 +435,22 @@ export class DateRangeSearchField extends SimpleSearchField {
   }
 }
 
-export class SpatialExtentSearchField extends SimpleSearchField {
-  constructor(injector: Injector) {
-    super('spatialExtent', injector, 'asc')
-  }
-
+export class BoundingBoxSearchField extends SimpleSearchField {
   getAvailableValues(): Observable<FieldAvailableValue[]> {
-    // TODO: return an array of spatial extents to show which ones are available in the dropdown
     return of([])
   }
 
+  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
+    return of({
+      [this.esFieldName]: values.map(Number) as BoundingBox,
+    })
+  }
+
+  getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
+    const filter = filters[this.esFieldName]
+    return of(isBoundingBox(filter) ? filter : [])
+  }
+
   getType(): FieldType {
     return 'spatialExtent'
   }

package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.html

@@ -79,11 +79,7 @@
     @if (hasSelection) {
       <gn-ui-button
         [type]="'primary-light'"
-        [title]="
-          ('search.filters.spatialExtent.bboxDelete' | translate) +
-          ' ' +
-          fileName
-        "
+        [title]="selectionDeleteLabelKey | translate: selectionLabelParams"
         (buttonClick)="removeSelection($event)"
         extraClass="group gap-x-2 w-full h-[28px] px-[8px] py-[4px] mb-[12px] bg-primary-lighter text-white"
         data-test="spatial-extent-selected-item"
@@ -94,12 +90,10 @@
           size="15px"
         ></ng-icon>
         <span class="group-hover:hidden truncate text-sm m-auto">
-          {{ 'search.filters.spatialExtent.bboxPrefix' | translate }}
-          {{ fileName }}
+          {{ selectionLabelKey | translate: selectionLabelParams }}
         </span>
         <span class="hidden group-hover:block truncate text-sm m-auto">
-          {{ 'search.filters.spatialExtent.bboxDelete' | translate }}
-          {{ fileName }}
+          {{ selectionDeleteLabelKey | translate: selectionLabelParams }}
         </span>
         <ng-icon
           name="iconoirCheckCircle"

package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.ts

@@ -46,13 +46,20 @@ import {
 marker('search.filters.spatialExtent.import')
 marker('search.filters.spatialExtent.helpText')
 marker('search.filters.spatialExtent.error.title')
-marker('search.filters.spatialExtent.bboxPrefix')
+
+const LABEL_FROM_FILE = marker('search.filters.spatialExtent.bboxFromFile')
+const LABEL_FROM_FILE_DELETE = marker(
+  'search.filters.spatialExtent.bboxFromFileDelete'
+)
+const LABEL_INITIAL = marker('search.filters.spatialExtent.bboxInitial')
+const LABEL_INITIAL_DELETE = marker(
+  'search.filters.spatialExtent.bboxInitialDelete'
+)
 
 export interface SpatialExtentDropdownError {
   key: string
   params?: Record<string, string | number>
 }
-marker('search.filters.spatialExtent.bboxDelete')
 
 @Component({
   selector: 'gn-ui-spatial-extent-dropdown',
@@ -85,6 +92,11 @@ export class SpatialExtentDropdownComponent {
 
   @Input() title: string
   @Input() maxFileSizeMb: number | null = null
+  @Input() set initialBbox(value: BoundingBox | null) {
+    if (!this.bbox && value) {
+      this.bbox = value
+    }
+  }
 
   @Output() bboxChange = new EventEmitter<BoundingBox | null>()
   @Output() errorChange = new EventEmitter<SpatialExtentDropdownError>()
@@ -123,6 +135,18 @@ export class SpatialExtentDropdownComponent {
     return !!this.bbox
   }
 
+  get selectionLabelKey() {
+    return this.fileName ? LABEL_FROM_FILE : LABEL_INITIAL
+  }
+
+  get selectionDeleteLabelKey() {
+    return this.fileName ? LABEL_FROM_FILE_DELETE : LABEL_INITIAL_DELETE
+  }
+
+  get selectionLabelParams() {
+    return { fileName: this.fileName }
+  }
+
   openOverlay() {
     this.overlayMinWidth =
       this.overlayOrigin.elementRef.nativeElement.getBoundingClientRect()

package/src/libs/ui/map/src/lib/components/map-container/map-container.component.ts

@@ -58,6 +58,8 @@ import { transformExtent } from 'ol/proj.js'
 export const DEFAULT_BASEMAP_LAYER: MapContextLayerMapLibreStyle = {
   type: 'maplibre-style',
   styleUrl: `https://basemaps.cartocdn.com/gl/positron-gl-style/style.json`,
+  clickable: false,
+  hoverable: false,
 }
 
 const DEFAULT_VIEW: MapContextView = {

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

@@ -38,6 +38,14 @@ export function getGeometryFromGeoJSON(
 // FIXME: this type should be more generic across the project
 export type BoundingBox = [number, number, number, number]
 
+export function isBoundingBox(value: unknown): value is BoundingBox {
+  return (
+    Array.isArray(value) &&
+    value.length === 4 &&
+    value.every((item) => typeof item === 'number')
+  )
+}
+
 export function getGeometryBoundingBox(geometry: Geometry): BoundingBox {
   // use the bounding box if specified in the GeoJSON object
   if (geometry.bbox) {

package/translations/de.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "Repräsentationstyp",
   "search.filters.resourceType": "Ressourcentyp",
   "search.filters.spatialExtent": "",
-  "search.filters.spatialExtent.bboxDelete": "",
-  "search.filters.spatialExtent.bboxPrefix": "",
+  "search.filters.spatialExtent.bboxFromFile": "",
+  "search.filters.spatialExtent.bboxFromFileDelete": "",
+  "search.filters.spatialExtent.bboxInitial": "",
+  "search.filters.spatialExtent.bboxInitialDelete": "",
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",

package/translations/en.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "Representation type",
   "search.filters.resourceType": "Resource type",
   "search.filters.spatialExtent": "Spatial extent",
-  "search.filters.spatialExtent.bboxDelete": "Delete",
-  "search.filters.spatialExtent.bboxPrefix": "bbox from",
+  "search.filters.spatialExtent.bboxFromFile": "extent from {fileName}",
+  "search.filters.spatialExtent.bboxFromFileDelete": "Delete {fileName}",
+  "search.filters.spatialExtent.bboxInitial": "Pre-selected extent",
+  "search.filters.spatialExtent.bboxInitialDelete": "Delete selection",
   "search.filters.spatialExtent.error.fileTooLarge": "The file exceeds the maximum allowed size ({maxSize} MB)",
   "search.filters.spatialExtent.error.invalidFormat": "The file could not be read as a valid GeoJSON",
   "search.filters.spatialExtent.error.noGeometry": "No geometry could be found in the file",

package/translations/es.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "",
   "search.filters.resourceType": "",
   "search.filters.spatialExtent": "",
-  "search.filters.spatialExtent.bboxDelete": "",
-  "search.filters.spatialExtent.bboxPrefix": "",
+  "search.filters.spatialExtent.bboxFromFile": "",
+  "search.filters.spatialExtent.bboxFromFileDelete": "",
+  "search.filters.spatialExtent.bboxInitial": "",
+  "search.filters.spatialExtent.bboxInitialDelete": "",
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",

package/translations/fr.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "Type de représentation",
   "search.filters.resourceType": "Type de ressource",
   "search.filters.spatialExtent": "Étendue spatiale",
-  "search.filters.spatialExtent.bboxDelete": "Supprimer",
-  "search.filters.spatialExtent.bboxPrefix": "bbox de",
+  "search.filters.spatialExtent.bboxFromFile": "étendue de {fileName}",
+  "search.filters.spatialExtent.bboxFromFileDelete": "Supprimer {fileName}",
+  "search.filters.spatialExtent.bboxInitial": "étendue présélectionnée",
+  "search.filters.spatialExtent.bboxInitialDelete": "Supprimer la sélection",
   "search.filters.spatialExtent.error.fileTooLarge": "Le fichier dépasse la taille maximale autorisée ({maxSize} Mo)",
   "search.filters.spatialExtent.error.invalidFormat": "Le fichier n'a pas pu être lu comme un GeoJSON valide",
   "search.filters.spatialExtent.error.noGeometry": "Aucune géométrie n'a pu être trouvée dans le fichier",

package/translations/it.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "Tipo di rappresentazione",
   "search.filters.resourceType": "Tipo di risorsa",
   "search.filters.spatialExtent": "",
-  "search.filters.spatialExtent.bboxDelete": "",
-  "search.filters.spatialExtent.bboxPrefix": "",
+  "search.filters.spatialExtent.bboxFromFile": "",
+  "search.filters.spatialExtent.bboxFromFileDelete": "",
+  "search.filters.spatialExtent.bboxInitial": "",
+  "search.filters.spatialExtent.bboxInitialDelete": "",
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",

package/translations/nl.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "",
   "search.filters.resourceType": "",
   "search.filters.spatialExtent": "",
-  "search.filters.spatialExtent.bboxDelete": "",
-  "search.filters.spatialExtent.bboxPrefix": "",
+  "search.filters.spatialExtent.bboxFromFile": "",
+  "search.filters.spatialExtent.bboxFromFileDelete": "",
+  "search.filters.spatialExtent.bboxInitial": "",
+  "search.filters.spatialExtent.bboxInitialDelete": "",
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",

package/translations/pt.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "",
   "search.filters.resourceType": "",
   "search.filters.spatialExtent": "",
-  "search.filters.spatialExtent.bboxDelete": "",
-  "search.filters.spatialExtent.bboxPrefix": "",
+  "search.filters.spatialExtent.bboxFromFile": "",
+  "search.filters.spatialExtent.bboxFromFileDelete": "",
+  "search.filters.spatialExtent.bboxInitial": "",
+  "search.filters.spatialExtent.bboxInitialDelete": "",
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",

package/translations/sk.json

@@ -692,8 +692,10 @@
   "search.filters.representationType": "Typ reprezentácie",
   "search.filters.resourceType": "Typ zdroja",
   "search.filters.spatialExtent": "",
-  "search.filters.spatialExtent.bboxDelete": "",
-  "search.filters.spatialExtent.bboxPrefix": "",
+  "search.filters.spatialExtent.bboxFromFile": "",
+  "search.filters.spatialExtent.bboxFromFileDelete": "",
+  "search.filters.spatialExtent.bboxInitial": "",
+  "search.filters.spatialExtent.bboxInitialDelete": "",
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",