geonetwork-ui 2.11.0-dev.1cf4ab0c6 → 2.11.0-dev.448254758

package/translations/it.json

@@ -425,7 +425,6 @@
   "map.add.layer.wms": "Da un WMS",
   "map.addFromFile.placeholder": "Clicca o trascina un file qui",
   "map.dropdown.placeholder": "Nessun livello di anteprima disponibile",
-  "map.geocoding.placeholder": "Cerca un luogo",
   "map.help.addFromFile": "Clicca o trascina un file per aggiungerlo alla mappa (attualmente supporta solo il formato GeoJSON)",
   "map.layer.add": "Aggiungi",
   "map.layers.available": "Layer disponibili",
@@ -692,7 +691,6 @@
   "search.filters.representationType": "Tipo di rappresentazione",
   "search.filters.resourceCreationRevisionDate": "Data della risorsa",
   "search.filters.resourceType": "Tipo di risorsa",
-  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
   "search.filters.spatialExtent.bboxFromFileDelete": "",
   "search.filters.spatialExtent.bboxInitial": "",
@@ -700,7 +698,9 @@
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",
+  "search.filters.spatialExtent.error.outOfBounds": "",
   "search.filters.spatialExtent.error.title": "",
+  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.helpText": "",
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "Standard",

package/translations/nl.json

@@ -425,7 +425,6 @@
   "map.add.layer.wms": "",
   "map.addFromFile.placeholder": "",
   "map.dropdown.placeholder": "",
-  "map.geocoding.placeholder": "",
   "map.help.addFromFile": "",
   "map.layer.add": "",
   "map.layers.available": "",
@@ -692,7 +691,6 @@
   "search.filters.representationType": "",
   "search.filters.resourceCreationRevisionDate": "",
   "search.filters.resourceType": "",
-  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
   "search.filters.spatialExtent.bboxFromFileDelete": "",
   "search.filters.spatialExtent.bboxInitial": "",
@@ -700,7 +698,9 @@
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",
+  "search.filters.spatialExtent.error.outOfBounds": "",
   "search.filters.spatialExtent.error.title": "",
+  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.helpText": "",
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "",

package/translations/pt.json

@@ -425,7 +425,6 @@
   "map.add.layer.wms": "",
   "map.addFromFile.placeholder": "",
   "map.dropdown.placeholder": "",
-  "map.geocoding.placeholder": "",
   "map.help.addFromFile": "",
   "map.layer.add": "",
   "map.layers.available": "",
@@ -692,7 +691,6 @@
   "search.filters.representationType": "",
   "search.filters.resourceCreationRevisionDate": "",
   "search.filters.resourceType": "",
-  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
   "search.filters.spatialExtent.bboxFromFileDelete": "",
   "search.filters.spatialExtent.bboxInitial": "",
@@ -700,7 +698,9 @@
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",
+  "search.filters.spatialExtent.error.outOfBounds": "",
   "search.filters.spatialExtent.error.title": "",
+  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.helpText": "",
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "",

package/translations/sk.json

@@ -425,7 +425,6 @@
   "map.add.layer.wms": "Z WMS",
   "map.addFromFile.placeholder": "Kliknite na tlačidlo alebo sem vložte súbor",
   "map.dropdown.placeholder": "",
-  "map.geocoding.placeholder": "Nájsť miesto",
   "map.help.addFromFile": "Kliknite na tlačidlo alebo sem vložte súbor, ktorý chcete pridať do mapy (v súčasnosti podporuje iba formát GeoJSON).",
   "map.layer.add": "Pridať",
   "map.layers.available": "Dostupné vrsty",
@@ -692,7 +691,6 @@
   "search.filters.representationType": "Typ reprezentácie",
   "search.filters.resourceCreationRevisionDate": "",
   "search.filters.resourceType": "Typ zdroja",
-  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
   "search.filters.spatialExtent.bboxFromFileDelete": "",
   "search.filters.spatialExtent.bboxInitial": "",
@@ -700,7 +698,9 @@
   "search.filters.spatialExtent.error.fileTooLarge": "",
   "search.filters.spatialExtent.error.invalidFormat": "",
   "search.filters.spatialExtent.error.noGeometry": "",
+  "search.filters.spatialExtent.error.outOfBounds": "",
   "search.filters.spatialExtent.error.title": "",
+  "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.helpText": "",
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "Štandard",

package/src/libs/feature/map/src/lib/geocoding/geocoding.component.html

@@ -1,41 +0,0 @@
-<gn-ui-search-input
-  [(value)]="searchText"
-  (valueChange)="onSearchChange($event)"
-  (keyup.enter)="onEnterPress()"
-  [placeholder]="'map.geocoding.placeholder' | translate"
->
-</gn-ui-search-input>
-@if (results && results.length) {
-  <ul
-    class="bg-gray-50 border border-gray-200 w-full mt-2 shadow-sm rounded-lg"
-  >
-    @for (result of results; track result) {
-      <li
-        (click)="zoomToLocation(result)"
-        class="flex items-center pl-8 pr-4 py-2 border-b border-gray-200 relative cursor-pointer hover:bg-blue-100 hover:text-gray-800 transition duration-300 ease-in-out"
-      >
-        <svg
-          class="stroke-current text-blue-500 absolute w-5 h-5 left-3 top-3"
-          xmlns="http://www.w3.org/2000/svg"
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
-        >
-          <path
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            stroke-width="2"
-            d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"
-          />
-          <path
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            stroke-width="2"
-            d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
-          />
-        </svg>
-        <span class="font-sans font-semibold ml-4">{{ result.label }}</span>
-      </li>
-    }
-  </ul>
-}

package/src/libs/feature/map/src/lib/geocoding/geocoding.component.ts

@@ -1,112 +0,0 @@
-import { Component, OnDestroy, inject } from '@angular/core'
-import { catchError, firstValueFrom, from, Subject, takeUntil } from 'rxjs'
-import { debounceTime, switchMap } from 'rxjs/operators'
-import { GeocodingService } from '../geocoding.service'
-import { MapFacade } from '../+state/map.facade'
-
-import { SearchInputComponent } from '../../../../../../libs/ui/inputs/src'
-import { TranslatePipe } from '@ngx-translate/core'
-import { MapContextView } from '@geospatial-sdk/core'
-
-@Component({
-  selector: 'gn-ui-geocoding',
-  templateUrl: './geocoding.component.html',
-  styleUrls: ['./geocoding.component.css'],
-  standalone: true,
-  imports: [SearchInputComponent, TranslatePipe],
-})
-export class GeocodingComponent implements OnDestroy {
-  private mapFacade = inject(MapFacade)
-  private geocodingService = inject(GeocodingService)
-
-  searchText = ''
-  results: any[] = []
-  searchTextChanged = new Subject<string>()
-  destroy$ = new Subject<void>()
-  errorMessage: string | null = null
-
-  constructor() {
-    this.searchTextChanged
-      .pipe(
-        debounceTime(300),
-        switchMap((searchText) => {
-          return from(this.geocodingService.query(searchText)).pipe(
-            catchError((error) => {
-              this.errorMessage =
-                'An error occurred while searching. Please try again.'
-              console.error(error)
-              return []
-            })
-          )
-        }),
-        takeUntil(this.destroy$)
-      )
-      .subscribe((results) => {
-        this.results = results
-      })
-  }
-
-  ngOnDestroy() {
-    this.destroy$.next()
-    this.destroy$.complete()
-  }
-
-  onSearchChange(searchText: string) {
-    if (!searchText) {
-      this.clearSearch()
-      return
-    } else {
-      this.searchTextChanged.next(searchText)
-    }
-  }
-
-  clearSearch() {
-    this.searchText = ''
-    this.results = []
-    this.errorMessage = null
-  }
-
-  async zoomToLocation(result: any) {
-    const geometry = result.geom
-
-    if (geometry.type === 'Point') {
-      await this.zoomToPoint(geometry.coordinates)
-    } else if (geometry.type === 'Polygon') {
-      await this.zoomToPolygon(geometry.coordinates)
-    } else {
-      console.error(`Unsupported geometry type: ${geometry.type}`)
-    }
-  }
-
-  async zoomToPoint(pointCoords: [number, number]) {
-    const context = await firstValueFrom(this.mapFacade.context$)
-    const view: MapContextView = {
-      center: pointCoords,
-      zoom: 10,
-    }
-    this.mapFacade.applyContext({
-      ...context,
-      view,
-    })
-  }
-
-  async zoomToPolygon(polygonCoords: [[number, number][]]) {
-    const context = await firstValueFrom(this.mapFacade.context$)
-    const view: MapContextView = {
-      geometry: {
-        type: 'Polygon',
-        coordinates: polygonCoords,
-      },
-    }
-    this.mapFacade.applyContext({
-      ...context,
-      view,
-    })
-  }
-
-  onEnterPress() {
-    if (this.results && this.results.length > 0) {
-      this.zoomToLocation(this.results[0])
-    }
-  }
-}

package/src/libs/feature/map/src/lib/style/index.ts

@@ -1,2 +0,0 @@
-export * from './map-style.service'
-export * from './map-style.fixtures'

package/src/libs/feature/map/src/lib/style/map-style.fixtures.ts

@@ -1,47 +0,0 @@
-import { Circle, Fill, Stroke, Style } from 'ol/style.js'
-
-const colorPrimary = 'blue'
-const colorSecondary = 'red'
-const colorStroke = 'white'
-
-export const defaultMapStyleFixture = (): Style =>
-  new Style({
-    image: new Circle({
-      fill: new Fill({
-        color: colorPrimary,
-      }),
-      stroke: new Stroke({
-        color: colorStroke,
-        width: 2,
-      }),
-      radius: 5,
-    }),
-    fill: new Fill({
-      color: 'rgba(0,0,255,0.25)',
-    }),
-    stroke: new Stroke({
-      color: colorStroke,
-      width: 2,
-    }),
-  })
-
-export const defaultMapStyleHlFixture = (): Style =>
-  new Style({
-    image: new Circle({
-      fill: new Fill({
-        color: colorSecondary,
-      }),
-      stroke: new Stroke({
-        color: colorStroke,
-        width: 3,
-      }),
-      radius: 6,
-    }),
-    fill: new Fill({
-      color: 'rgba(255,0,0,0.25)',
-    }),
-    stroke: new Stroke({
-      color: colorSecondary,
-      width: 3,
-    }),
-  })

package/src/libs/feature/map/src/lib/style/map-style.service.ts

@@ -1,108 +0,0 @@
-import { Injectable } from '@angular/core'
-import { getThemeConfig, isConfigLoaded } from '../../../../../../libs/util/app-config/src'
-import chroma from 'chroma-js'
-import Feature from 'ol/Feature.js'
-import { Fill, Stroke, Style } from 'ol/style.js'
-import CircleStyle from 'ol/style/Circle.js'
-import { StyleLike } from 'ol/style/Style.js'
-
-export interface CreateStyleOptions {
-  color: string
-  isFocused?: boolean
-}
-
-export type StyleByGeometryType = {
-  line: Style | Style[]
-  polygon: Style | Style[]
-  point: Style | Style[]
-}
-
-@Injectable({
-  providedIn: 'root',
-})
-export class MapStyleService {
-  styles = {
-    default: this.createStyleFunction(
-      this.createGeometryStyles({
-        color: isConfigLoaded() ? getThemeConfig().PRIMARY_COLOR : 'blue',
-      })
-    ),
-    defaultHL: this.createStyleFunction(
-      this.createGeometryStyles({
-        color: isConfigLoaded() ? getThemeConfig().SECONDARY_COLOR : 'red',
-        isFocused: true,
-      })
-    ),
-  }
-
-  createGeometryStyles(options: CreateStyleOptions): StyleByGeometryType {
-    const { color, isFocused } = options
-    const zIndex = isFocused ? 10 : undefined
-    return {
-      polygon: new Style({
-        fill: new Fill({
-          color: this.computeTransparentFillColor(color),
-        }),
-        stroke: new Stroke({
-          color: 'white',
-          width: 2,
-        }),
-        zIndex,
-      }),
-      point: new Style({
-        image: new CircleStyle({
-          fill: new Fill({
-            color,
-          }),
-          stroke: new Stroke({
-            color: 'white',
-            width: isFocused ? 3 : 2,
-          }),
-          radius: isFocused ? 8 : 7,
-        }),
-        zIndex,
-      }),
-      line: [
-        new Style({
-          stroke: new Stroke({
-            color: 'white',
-            width: isFocused ? 8 : 6,
-          }),
-          zIndex,
-        }),
-        new Style({
-          stroke: new Stroke({
-            color,
-            width: isFocused ? 3 : 2,
-          }),
-          zIndex,
-        }),
-      ],
-    }
-  }
-
-  createStyleFunction(styleByGeometryType: StyleByGeometryType): StyleLike {
-    return (feature: Feature): Style | Style[] => {
-      const geometryType = feature?.getGeometry()?.getType()
-      switch (geometryType) {
-        case 'LinearRing':
-        case 'LineString':
-        case 'MultiLineString':
-          return styleByGeometryType.line
-        case 'Point':
-        case 'MultiPoint':
-          return styleByGeometryType.point
-        case 'Circle':
-        case 'Polygon':
-        case 'MultiPolygon':
-          return styleByGeometryType.polygon
-        default:
-          return styleByGeometryType.point
-      }
-    }
-  }
-
-  private computeTransparentFillColor(color: string, alpha = 0.25): string {
-    return chroma(color).alpha(alpha).css()
-  }
-}