geonetwork-ui 2.2.0-dev.0eef2738 → 2.2.0-dev.1189d390

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { SelectionsApiService } from '../../../../../../../libs/data-access/gn4/src'
-import { BehaviorSubject, Observable, Subscription, map, tap } from 'rxjs'
+import { BehaviorSubject, firstValueFrom } from 'rxjs'
 
 const BUCKET_ID = 'gnui'
 
@@ -12,7 +12,6 @@ export class SelectionService {
   selectedRecordsIdentifiers$: BehaviorSubject<string[]> = new BehaviorSubject(
     []
   )
-  subscription: Subscription
 
   constructor(private selectionsApi: SelectionsApiService) {
     this.selectionsApi.get(BUCKET_ID).subscribe((selectedIds) => {
@@ -33,48 +32,25 @@ export class SelectionService {
     this.selectedRecordsIdentifiers$.next(filtered)
   }
 
-  selectRecords(records: CatalogRecord[]): Observable<void> {
-    const newIds = []
-    records.map((record) => {
-      newIds.push(record.uniqueIdentifier)
+  selectRecords(records: CatalogRecord[]) {
+    const newIds = records.map((record) => record.uniqueIdentifier)
+    this.selectionsApi.add(BUCKET_ID, newIds).subscribe(() => {
+      this.addIdsToSelected(newIds)
     })
-    const apiResponse = this.selectionsApi.add(BUCKET_ID, newIds)
-    return apiResponse.pipe(
-      tap(() => {
-        this.addIdsToSelected(newIds)
-      }),
-      map(() => undefined)
-    )
   }
 
-  deselectRecords(records: CatalogRecord[]): Observable<void> {
-    const idsToBeRemoved = []
-    records.map((record) => {
-      idsToBeRemoved.push(record.uniqueIdentifier)
+  deselectRecords(records: CatalogRecord[]) {
+    const idsToBeRemoved = records.map((record) => record.uniqueIdentifier)
+    this.selectionsApi.clear(BUCKET_ID, idsToBeRemoved).subscribe(() => {
+      this.removeIdsFromSelected(idsToBeRemoved)
     })
-    const apiResponse = this.selectionsApi.clear(BUCKET_ID, idsToBeRemoved)
-    return apiResponse.pipe(
-      tap(() => {
-        this.removeIdsFromSelected(idsToBeRemoved)
-      }),
-      map(() => undefined)
-    )
   }
 
-  clearSelection(): Observable<void> {
-    const currentSelectedResponse = this.selectionsApi.get(BUCKET_ID)
-    let currentSelection
-    this.subscription = currentSelectedResponse.subscribe((value) => {
-      currentSelection = [...value]
+  async clearSelection() {
+    const response = await firstValueFrom(this.selectionsApi.get(BUCKET_ID))
+    const currentSelection = Array.from(response)
+    this.selectionsApi.clear(BUCKET_ID, currentSelection).subscribe(() => {
+      this.removeIdsFromSelected(currentSelection)
     })
-    this.selectionsApi.clear(BUCKET_ID, currentSelection)
-    const apiResponse = this.selectionsApi.clear(BUCKET_ID, currentSelection)
-
-    return apiResponse.pipe(
-      tap(() => {
-        this.removeIdsFromSelected(currentSelection)
-      }),
-      map(() => undefined)
-    )
   }
 }

package/src/libs/common/domain/src/lib/index.ts

@@ -0,0 +1,2 @@
+export * from './organizations.service.interface'
+export * from './platform.service.interface'

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -1,6 +1,7 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { Individual } from './contact.model'
-import { Organization } from './organization.model'
+import type { Individual } from './contact.model'
+import type { Organization } from './organization.model'
+import type { Geometry } from 'geojson'
 
 type Uuid = string
 
@@ -47,13 +48,7 @@ export const RecordStatusValues = [
 ]
 export type RecordStatus = typeof RecordStatusValues[number]
 
-export type AccessConstraintType = 'security' | 'privacy' | 'legal' | 'other'
-export interface AccessConstraint {
-  text: string
-  type: AccessConstraintType
-}
-
-export type License = {
+export type Constraint = {
   text: string
   url?: URL
 }
@@ -76,10 +71,10 @@ export interface BaseRecord {
   kind: RecordKind
   themes: Array<string> // TODO: handle codelists
   keywords: Array<string> // TODO: handle thesaurus and id
-  accessConstraints: Array<AccessConstraint>
-  useLimitations: Array<string>
-  legalConstraints?: Array<string>
-  licenses: Array<License>
+  licenses: Array<Constraint>
+  legalConstraints: Array<Constraint>
+  securityConstraints: Array<Constraint>
+  otherConstraints: Array<Constraint>
   overviews: Array<GraphicOverview>
   extras?: Record<string, unknown>
   landingPage?: URL
@@ -122,6 +117,7 @@ export interface DatasetDownloadDistribution {
   // textEncoding?: string
   name?: string
   description?: string
+  accessServiceProtocol?: ServiceProtocol
 }
 
 export interface OnlineLinkResource {
@@ -145,13 +141,16 @@ export interface GraphicOverview {
 }
 
 export interface DatasetSpatialExtent {
-  geometry: unknown // GeoJSON
+  geometry: Geometry
   description?: string
 }
 
+/**
+ * At least a start or an end date should be provided
+ */
 export interface DatasetTemporalExtent {
-  start: Date
-  end: Date
+  start?: Date
+  end?: Date
   description?: string
 }
 
@@ -163,8 +162,8 @@ export interface DatasetRecord extends BaseRecord {
   datasetUpdated?: Date
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
   distributions: Array<DatasetDistribution>
-  spatialExtents: Array<DatasetSpatialExtent> // not handled yet
-  temporalExtents: Array<DatasetTemporalExtent> // not handled yet
+  spatialExtents: Array<DatasetSpatialExtent>
+  temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
 }
 

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

@@ -1,4 +1,4 @@
-import { FieldName } from './search.model'
+import { FieldName } from './field.model'
 import { FieldFilters } from './filter.model'
 
 export interface TermsAggregationParams {

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

@@ -0,0 +1 @@
+export type FieldName = string

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

@@ -1,4 +1,4 @@
-import { FieldName } from './search.model'
+import { FieldName } from './field.model'
 
 export type FieldFilterByValues = Record<string, boolean>
 export type FieldFilterByExpression = string | number

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

@@ -2,3 +2,4 @@ export * from './aggregation.model'
 export * from './filter.model'
 export * from './search.model'
 export * from './sort-by.model'
+export * from './field.model'

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

@@ -1,10 +1,10 @@
 import { FieldFilters } from './filter.model'
 import { CatalogRecord } from '../record'
 import { Geometry } from 'geojson'
+import { FieldName } from './field.model'
 
-type FieldSort = ['desc' | 'asc', FieldName]
+export type FieldSort = ['desc' | 'asc', FieldName]
 export type SortByField = FieldSort | FieldSort[] // several sort criteria can be used!
-export type FieldName = string
 
 export interface SearchParams {
   filters?: FieldFilters

package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts

@@ -1,6 +1,7 @@
 export interface ThesaurusItemModel {
   key: string
   label: string
+  description?: string
 }
 
 export type ThesaurusModel = ThesaurusItemModel[]

package/src/libs/common/domain/src/lib/model/user/index.ts

@@ -0,0 +1 @@
+export * from './user.model'

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -15,8 +15,5 @@ export abstract class PlatformServiceInterface {
   ): Observable<UserModel[]>
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
-  abstract getThesaurusByLang(
-    thesaurusName: string,
-    lang: string
-  ): Observable<ThesaurusModel>
+  abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
 }

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -115,7 +115,7 @@ As such, **it is not very interesting at all.**`,
         url: new URL('https://data.rennesmetropole.fr/pages/licence/'),
       },
     ],
-    accessConstraints: [
+    legalConstraints: [
       {
         text: "Dataset access isn't possible since it does not really exist",
         type: 'other',
@@ -125,6 +125,8 @@ As such, **it is not very interesting at all.**`,
         type: 'security',
       },
     ],
+    securityConstraints: [],
+    otherConstraints: [],
     spatialExtents: [],
     temporalExtents: [],
     updateFrequency: {
@@ -189,7 +191,9 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
 Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,
-    accessConstraints: [],
+    legalConstraints: [],
+    securityConstraints: [],
+    otherConstraints: [],
     useLimitations: ["Aucune condition ne s'applique", 'Licence Ouverte 2.0'],
     licenses: [
       {

package/src/libs/feature/catalog/src/lib/my-org/my-org.service.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
-import { BehaviorSubject, combineLatest, map, Observable } from 'rxjs'
+import { combineLatest, map, Observable } from 'rxjs'
 import { UserModel } from '../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { shareReplay } from 'rxjs/operators'
 
 @Injectable({
   providedIn: 'root',
@@ -16,20 +17,6 @@ export class MyOrgService {
     userList: UserModel[]
   }>
 
-  private myOrgDataSubject = new BehaviorSubject<{
-    orgName: string
-    logoUrl: string
-    recordCount: number
-    userCount: number
-    userList: UserModel[]
-  }>({
-    orgName: '',
-    logoUrl: '',
-    recordCount: 0,
-    userCount: 0,
-    userList: [],
-  })
-
   constructor(
     private platformService: PlatformServiceInterface,
     private orgService: OrganizationsServiceInterface
@@ -55,7 +42,8 @@ export class MyOrgService {
           userList,
           userCount,
         }
-      })
+      }),
+      shareReplay(1)
     )
   }
 }

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

@@ -9,8 +9,8 @@ import {
   SupportedTypes,
 } from '../../../../../../libs/util/data-fetcher/src'
 import {
-  extensionToFormat,
   getFileFormat,
+  getFileFormatFromServiceOutput,
   getMimeTypeForFormat,
   ProxyService,
 } from '../../../../../../libs/util/shared/src'
@@ -45,7 +45,7 @@ interface WfsDownloadUrls {
 export class DataService {
   constructor(private proxy: ProxyService) {}
 
-  private getDownloadUrlsFromWfs(
+  getDownloadUrlsFromWfs(
     wfsUrl: string,
     featureTypeName: string
   ): Observable<WfsDownloadUrls> {
@@ -120,7 +120,7 @@ export class DataService {
     )
   }
 
-  private getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
+  getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
     return this.proxy.getProxiedUrl(
       `${apiUrl}/query?f=${format}&where=1=1&outFields=*`
     )
@@ -138,8 +138,11 @@ export class DataService {
       map((urls) =>
         Object.keys(urls).map((format) => ({
           ...wfsLink,
+          type: 'download',
           url: new URL(urls[format]),
-          mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
+          mimeType: getMimeTypeForFormat(
+            getFileFormatFromServiceOutput(format)
+          ),
         }))
       )
     )
@@ -153,7 +156,7 @@ export class DataService {
       url: new URL(
         this.getDownloadUrlFromEsriRest(esriRestLink.url.toString(), format)
       ),
-      mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
+      mimeType: getMimeTypeForFormat(getFileFormatFromServiceOutput(format)),
     }))
   }
 

package/src/libs/feature/editor/src/lib/record-form/record-form.component.ts

@@ -1,6 +1,7 @@
 import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { EditorService, FormField } from '../services/editor.service'
+import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
 
 @Component({
   selector: 'gn-ui-record-form',
@@ -8,7 +9,7 @@ import { EditorService, FormField } from '../services/editor.service'
   styleUrls: ['./record-form.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule],
+  imports: [CommonModule, UiInputsModule],
 })
 export class RecordFormComponent {
   constructor(public editorService: EditorService) {}

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

@@ -17,3 +17,4 @@ export * from './lib/layers-panel/layers-panel.component'
 export * from './lib/add-layer-from-catalog/add-layer-from-catalog.component'
 export * from './lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component'
 export * from './lib/map-container/map-container.component'
+export * from './lib/geocoding/geocoding.component'

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

@@ -1 +1,2 @@
 export * from './map-options'
+export * from './projections'

package/src/libs/feature/map/src/lib/feature-map.module.ts

@@ -23,6 +23,8 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { AddLayerFromWmsComponent } from './add-layer-from-wms/add-layer-from-wms.component'
 import { AddLayerFromFileComponent } from './add-layer-from-file/add-layer-from-file.component'
 import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wfs.component'
+import { GeocodingComponent } from './geocoding/geocoding.component'
+import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
 
 @NgModule({
   declarations: [
@@ -35,6 +37,7 @@ import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wf
     AddLayerFromWmsComponent,
     AddLayerFromFileComponent,
     AddLayerFromWfsComponent,
+    GeocodingComponent,
   ],
   exports: [
     MapContextComponent,
@@ -42,6 +45,7 @@ import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wf
     LayersPanelComponent,
     AddLayerFromCatalogComponent,
     MapContainerComponent,
+    GeocodingComponent,
   ],
   imports: [
     CommonModule,
@@ -62,6 +66,10 @@ import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wf
       useValue: defaultMapOptions,
     },
     MapFacade,
+    {
+      provide: GEOCODING_PROVIDER,
+      useValue: ['geonames', { maxRows: 5 }] as GeocodingProvider,
+    },
   ],
 })
 export class FeatureMapModule {}

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

@@ -0,0 +1,39 @@
+<gn-ui-search-input
+  [(value)]="searchText"
+  (valueChange)="onSearchChange($event)"
+  (keyup.enter)="onEnterPress()"
+  [placeholder]="'map.geocoding.placeholder' | translate"
+>
+</gn-ui-search-input>
+<ul
+  class="bg-gray-50 border border-gray-200 w-full mt-2 shadow-sm rounded-lg"
+  *ngIf="results && results.length"
+>
+  <li
+    *ngFor="let result of results"
+    (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

@@ -0,0 +1,99 @@
+import { Component, OnDestroy } from '@angular/core'
+import { catchError, from, Subject, takeUntil } from 'rxjs'
+import { debounceTime, switchMap } from 'rxjs/operators'
+import { MapManagerService } from '../manager/map-manager.service'
+import { fromLonLat } from 'ol/proj'
+import { Polygon } from 'ol/geom'
+import { GeocodingService } from '../geocoding.service'
+
+@Component({
+  selector: 'gn-ui-geocoding',
+  templateUrl: './geocoding.component.html',
+  styleUrls: ['./geocoding.component.css'],
+})
+export class GeocodingComponent implements OnDestroy {
+  searchText = ''
+  results: any[] = []
+  searchTextChanged = new Subject<string>()
+  destroy$ = new Subject<void>()
+  errorMessage: string | null = null
+
+  constructor(
+    private mapManager: MapManagerService,
+    private geocodingService: GeocodingService
+  ) {
+    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
+  }
+
+  zoomToLocation(result: any) {
+    const map = this.mapManager.map
+    const view = map.getView()
+    const geometry = result.geom
+
+    if (geometry.type === 'Point') {
+      this.zoomToPoint(geometry.coordinates, view)
+    } else if (geometry.type === 'Polygon') {
+      this.zoomToPolygon(geometry.coordinates, view)
+    } else {
+      console.error(`Unsupported geometry type: ${geometry.type}`)
+    }
+  }
+
+  zoomToPoint(pointCoords: [number, number], view: any) {
+    const transformedCoords = fromLonLat(pointCoords)
+    view.setCenter(transformedCoords)
+    view.setZoom(12)
+  }
+
+  zoomToPolygon(polygonCoords: [[number, number][]], view: any) {
+    const transformedCoords = polygonCoords[0].map((coord) => fromLonLat(coord))
+    const polygon = new Polygon([transformedCoords])
+    view.fit(polygon, {
+      duration: 100,
+      maxZoom: 12,
+    })
+  }
+
+  onEnterPress() {
+    if (this.results && this.results.length > 0) {
+      this.zoomToLocation(this.results[0])
+    }
+  }
+}

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

@@ -0,0 +1,59 @@
+import { Injectable, Inject, InjectionToken } from '@angular/core'
+import {
+  queryGeoadmin,
+  GeoadminOptions,
+  GeocodingResult,
+  queryGeonames,
+  GeonamesOptions,
+  DataGouvFrOptions,
+  queryDataGouvFr,
+} from '@geospatial-sdk/geocoding'
+import { from, Observable, throwError } from 'rxjs'
+import { catchError } from 'rxjs/operators'
+
+type GeoadminGeocodingProvider = ['geoadmin', GeoadminOptions]
+type GeonamesGeocodingProvider = ['geonames', GeonamesOptions]
+type DataGouvFrGeocodingProvider = ['data-gouv-fr', DataGouvFrOptions]
+export type GeocodingProvider =
+  | GeoadminGeocodingProvider
+  | GeonamesGeocodingProvider
+  | DataGouvFrGeocodingProvider
+
+export const GEOCODING_PROVIDER = new InjectionToken<GeocodingProvider>(
+  'geocoding-provider'
+)
+
+@Injectable({
+  providedIn: 'root',
+})
+export class GeocodingService {
+  constructor(
+    @Inject(GEOCODING_PROVIDER) private provider: GeocodingProvider
+  ) {}
+
+  query(text: string): Observable<GeocodingResult[]> {
+    let queryObservable: Observable<GeocodingResult[]>
+    switch (this.provider[0]) {
+      case 'geoadmin':
+        queryObservable = from(
+          queryGeoadmin(text, this.provider[1] as GeoadminOptions)
+        )
+        break
+      case 'geonames':
+        queryObservable = from(
+          queryGeonames(text, this.provider[1] as GeonamesOptions)
+        )
+        break
+      case 'data-gouv-fr':
+        queryObservable = from(
+          queryDataGouvFr(text, this.provider[1] as DataGouvFrOptions)
+        )
+        break
+      default:
+        return throwError(
+          () => new Error(`Unsupported geocoding provider: ${this.provider[0]}`)
+        )
+    }
+    return queryObservable.pipe(catchError((error) => throwError(error)))
+  }
+}

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

@@ -1,3 +1 @@
 export * from './map-utils.service'
-export * from './map-utils-wms.service'
-export * from './projections'