geonetwork-ui 2.11.0-dev.6c8b66d60 → 2.11.0-dev.7f3cfba04

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -17,7 +17,6 @@ import {
   AssociatedRecord,
   CatalogRecord,
   DatasetFeatureCatalog,
-  DatasetFeatureType,
   LanguageCode,
   LinkedRecord,
   RecordRelation,
@@ -182,43 +181,15 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
-  private mapEmbeddedFeatureCatalog(
-    featureTypes: Array<DatasetFeatureType>
-  ): DatasetFeatureCatalog {
-    return {
-      featureTypes: featureTypes.map((featureType) => ({
-        name: featureType.typeName || '',
-        definition: featureType.definition || '',
-        attributes: Array.isArray(featureType.attributeTable)
-          ? featureType.attributeTable.map((attr) => {
-              const values = attr.values
-                ?.filter((v) => v.code || v.label)
-                .map((v) => ({
-                  code: v.code,
-                  label: v.label,
-                }))
-              return {
-                name: attr.name,
-                code: attr.code,
-                definition: attr.definition,
-                type: attr.type,
-                ...(values?.length > 0 ? { values } : {}),
-              }
-            })
-          : [],
-      })),
-    }
-  }
-  getFeatureCatalog(
+  queryLinkedFeatureCatalog(
     record: CatalogRecord,
     visited: Set<string> = new Set() // prevent looping
   ): Observable<DatasetFeatureCatalog | null> {
     if (
-      record.extras?.['featureTypes'] &&
-      Array.isArray(record.extras['featureTypes']) &&
-      record.extras['featureTypes'].length > 0
+      'featureTypeDescriptions' in record &&
+      record.featureTypeDescriptions?.length > 0
     ) {
-      return of(this.mapEmbeddedFeatureCatalog(record.extras['featureTypes']))
+      return of({ featureTypes: record.featureTypeDescriptions })
     }
 
     const featureCatalogIdentifier = record.extras[
@@ -228,7 +199,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       visited.add(featureCatalogIdentifier)
       return this.getRecord(featureCatalogIdentifier).pipe(
         switchMap((record) =>
-          record ? this.getFeatureCatalog(record, visited) : of(null)
+          record ? this.queryLinkedFeatureCatalog(record, visited) : of(null)
         )
       )
     }

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

@@ -316,6 +316,7 @@ export interface DatasetRecord extends BaseRecord {
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
+  featureTypeDescriptions?: DatasetFeatureCatalog['featureTypes']
 }
 
 export interface ServiceEndpoint {
@@ -350,30 +351,22 @@ export interface ReuseRecord extends BaseRecord {
 export type DatasetFeatureCatalog = {
   featureTypes: Array<{
     name: string
-    definition: string
+    description?: string
     attributes: DatasetFeatureAttribute[]
   }>
 }
 export interface DatasetFeatureAttributeValue {
   code?: string
-  definition?: string
+  description?: string
   label?: string
 }
 export interface DatasetFeatureAttribute {
   name: string
-  definition: string
-  type: string
-  code: string
+  description?: string
+  type?: string
+  code?: string
   values?: Array<DatasetFeatureAttributeValue>
 }
-export interface DatasetFeatureType {
-  aliases: string
-  code: string
-  isAbstract: string
-  typeName: string
-  definition: string
-  attributeTable: Array<DatasetFeatureAttribute>
-}
 
 export type ReuseType = 'application' | 'map' | 'other'
 

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

@@ -7,6 +7,8 @@ export interface TermsAggregationParams {
   limit: number
   sort: AggregationSort
   filter?: string
+  includeValues?: string[]
+  excludeValues?: string[]
 }
 export interface HistogramAggregationParams {
   type: 'histogram'

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

@@ -21,7 +21,10 @@ export type QueryString = {
   query_string: string
 }
 export type QueryRange = {
-  range: Record<string, { format: string; gte: string; lte: string }>
+  range: Record<
+    string,
+    { format: string; gte?: string; lte?: string; relation?: string }
+  >
 }
 export type QueryGeoShape = {
   geo_shape: {

package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts

@@ -17,7 +17,7 @@ export abstract class RecordsRepositoryInterface {
   abstract search(params: SearchParams): Observable<SearchResults>
   abstract getMatchesCount(filters: FieldFilters): Observable<number>
   abstract getRecord(uniqueIdentifier: string): Observable<CatalogRecord | null>
-  abstract getFeatureCatalog(
+  abstract queryLinkedFeatureCatalog(
     record: CatalogRecord
   ): Observable<DatasetFeatureCatalog | null>
   abstract aggregate(params: AggregationsParams): Observable<Aggregations>

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

@@ -164,69 +164,49 @@ As such, **it is not very interesting at all.**`,
     extras: {
       isPublishedToAll: true,
       edit: true,
-      featureTypes: [
-        {
-          attributeTable: [
-            {
-              code: 'OBJECTID',
-              name: 'OBJECTID',
-              link: '',
-              definition: 'Object identifier',
-              type: 'OID',
-            },
-            {
-              code: 'NOM',
-              name: 'Nom',
-              link: '',
-              definition: 'Nom de la rue',
-              type: 'String (48)',
-              values: [
-                {
-                  code: 'Pomme',
-                  label: 'Les Pommiers',
-                  description: 'Sous les pommiers',
-                },
-                {
-                  code: 'Cotton',
-                  label: 'Rue Cotton',
-                  description: 'Rue Cotton',
-                },
-                { code: "Passage de l'échiquier" },
-                { description: 'Rue du Charlieu' },
-              ],
-            },
-            {
-              code: 'RUE',
-              name: 'Rue',
-              link: '',
-              definition: '',
-              type: 'String (50)',
-            },
-          ],
-          code: '',
-          aliases: '',
-          typeName: "Catalogue d'attributs N°1",
-          definition: 'Définition du catalogue d attributs N°1',
-          isAbstract: 'false',
-        },
-        {
-          attributeTable: [
-            {
-              code: 'UniqueObject',
-              name: 'unique object ',
-              link: '',
-              definition: 'this is the only object of this catalog',
-              type: 'String (50)',
-            },
-          ],
-          code: '',
-          aliases: '',
-          typeName: "Catalogue d'attributs N°2",
-          definition: 'Définition du catalogue d attributs N°2',
-          isAbstract: 'false',
-        },
-      ],
     },
+    featureTypeDescriptions: [
+      {
+        name: "Catalogue d'attributs N°1",
+        description: 'Définition du catalogue d attributs N°1',
+        attributes: [
+          {
+            name: 'OBJECTID',
+            description: 'Object identifier',
+            code: 'OBJECTID',
+            type: 'OID',
+          },
+          {
+            name: 'Nom',
+            description: 'Nom de la rue',
+            code: 'NOM',
+            type: 'String (48)',
+            values: [
+              { code: 'Pomme', label: 'Les Pommiers' },
+              { code: 'Cotton', label: 'Rue Cotton' },
+              { code: "Passage de l'échiquier" },
+            ],
+          },
+          {
+            name: 'Rue',
+            code: 'RUE',
+            type: 'String (50)',
+          },
+        ],
+      },
+      {
+        name: "Catalogue d'attributs N°2",
+        description: 'Définition du catalogue d attributs N°2',
+        attributes: [
+          {
+            name: 'unique object ',
+            description: 'this is the only object of this catalog',
+            code: 'UniqueObject',
+            type: 'String (50)',
+          },
+        ],
+      },
+    ],
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',

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

@@ -209,7 +209,8 @@ export class DataService {
     ogcApiLink: DatasetServiceDistribution
   ): Promise<DatasetOnlineResource[]> {
     const collectionInfo = await this.getDownloadUrlsFromOgcApi(
-      ogcApiLink.url.href
+      ogcApiLink.url.href,
+      ogcApiLink.name
     )
 
     return Object.keys(collectionInfo.bulkDownloadLinks).map((mimeType) => {
@@ -229,31 +230,41 @@ export class DataService {
     })
   }
 
-  async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
+  private async getTargetCollectionId(
+    endpoint: OgcApiEndpoint,
+    collectionId?: string
+  ): Promise<string | undefined> {
+    const collections = await endpoint.featureCollections
+    return collections.length === 1 && !collectionId
+      ? collections[0]
+      : collectionId
+  }
+
+  async getDownloadUrlsFromOgcApi(
+    url: string,
+    collectionId?: string
+  ): Promise<OgcApiCollectionInfo> {
     const endpoint = new OgcApiEndpoint(url)
-    return await endpoint.featureCollections
-      .then((collections) => {
-        return endpoint.getCollectionInfo(collections[0])
-      })
-      .catch((error) => {
-        throw new Error(`ogc.unreachable.unknown`)
-      })
+    try {
+      const id = await this.getTargetCollectionId(endpoint, collectionId)
+      return await endpoint.getCollectionInfo(id)
+    } catch {
+      throw new Error('ogc.unreachable.unknown')
+    }
   }
 
   async getItemsFromOgcApi(
     url: string,
+    collectionId?: string,
     limit?: number
   ): Promise<OgcApiRecord[]> {
     const endpoint = new OgcApiEndpoint(url)
-    return await endpoint.featureCollections
-      .then((collections) => {
-        return collections.length
-          ? endpoint.getCollectionItems(collections[0], limit)
-          : null
-      })
-      .catch(() => {
-        throw new Error(`ogc.unreachable.unknown`)
-      })
+    try {
+      const id = await this.getTargetCollectionId(endpoint, collectionId)
+      return await endpoint.getCollectionItems(id, limit)
+    } catch {
+      throw new Error('ogc.unreachable.unknown')
+    }
   }
 
   async getItemsFromStacApi(
@@ -381,7 +392,9 @@ export class DataService {
       link.type === 'service' &&
       link.accessServiceProtocol === 'ogcFeatures'
     ) {
-      return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
+      return from(
+        this.getDownloadUrlsFromOgcApi(link.url.href, link.name)
+      ).pipe(
         switchMap((collectionInfo) => {
           const isMimeTypeJson = (mimeType: string): boolean => {
             return mimeType.toLowerCase().indexOf('json') > -1

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

@@ -6,7 +6,6 @@ export * from './lib/feature-map.module'
 export * from './lib/map-state-container/map-state-container.component'
 export * from './lib/constant'
 export * from './lib/utils'
-export * from './lib/style'
 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'

package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.ts

@@ -33,7 +33,6 @@ import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain
 import { NOT_KNOWN_CONSTRAINT } from '../../../../../../libs/feature/editor/src'
 import { NotificationsService } from '../../../../../../libs/feature/notifications/src'
 import { ButtonComponent, TextInputComponent } from '../../../../../../libs/ui/inputs/src'
-import { getOptionalEditorConfig } from '../../../../../../libs/util/app-config/src'
 import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 import { iconoirAppWindow, iconoirPlusCircle } from '@ng-icons/iconoir'
 import { matCloseOutline } from '@ng-icons/material-icons/outline'
@@ -48,6 +47,10 @@ marker('notify.reuse.form.error.title')
 marker('notify.reuse.form.error.body')
 
 export const REUSE_FORM_URL = new InjectionToken<string>('reuseFormUrl')
+// language assigned to the created reuse record; falls back to the current UI language
+export const NEW_RECORD_DEFAULT_LANGUAGE = new InjectionToken<string>(
+  'newRecordDefaultLanguage'
+)
 
 @Component({
   selector: 'gn-ui-notify-reuse-form',
@@ -86,6 +89,9 @@ export class NotifyReuseFormComponent implements OnDestroy {
   private readonly notificationsService = inject(NotificationsService)
   private readonly platformServiceInterface = inject(PlatformServiceInterface)
   reuseFormUrl = inject(REUSE_FORM_URL, { optional: true })
+  private newRecordDefaultLanguage = inject(NEW_RECORD_DEFAULT_LANGUAGE, {
+    optional: true,
+  })
   private locationStrategy = inject(LocationStrategy)
 
   me = toSignal(this.platformServiceInterface.getMe())
@@ -158,8 +164,7 @@ export class NotifyReuseFormComponent implements OnDestroy {
   submit() {
     if (!this.isFormValid()) return
     const defaultLang =
-      getOptionalEditorConfig()?.NEW_RECORD_DEFAULT_LANGUAGE ??
-      this.translate.currentLang
+      this.newRecordDefaultLanguage ?? this.translate.currentLang
     const onlineResource: OnlineLinkResource = {
       type: 'link',
       url: new URL(this.url()),

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

@@ -40,7 +40,9 @@ export class MdViewEffects {
     this.actions$.pipe(
       ofType(MdViewActions.loadFullMetadataSuccess),
       filter(({ full }) => full !== undefined),
-      switchMap(({ full }) => this.recordsRepository.getFeatureCatalog(full)),
+      switchMap(({ full }) =>
+        this.recordsRepository.queryLinkedFeatureCatalog(full)
+      ),
       map((featureCatalog) =>
         MdViewActions.loadFeatureCatalogSuccess({
           datasetCatalog: featureCatalog,

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

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

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

@@ -13,7 +13,13 @@
     (bboxChange)="onBboxChange($event)"
     (errorChange)="onSpatialExtentError($event)"
     [attr.data-cy-field]="fieldName"
-  ></gn-ui-spatial-extent-dropdown>
+  >
+    <gn-ui-location-search
+      [placeholder]="'search.filters.spatialExtent.searchLocation' | translate"
+      (bboxSelected)="onLocationSelected($event)"
+      data-cy="locationSearch"
+    ></gn-ui-location-search>
+  </gn-ui-spatial-extent-dropdown>
 } @else {
   <gn-ui-dropdown-multiselect
     class="w-full"

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

@@ -1,8 +1,10 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  InjectionToken,
   Input,
   OnInit,
+  ViewChild,
   inject,
 } from '@angular/core'
 import {
@@ -26,8 +28,20 @@ import { DateRange } from '../../../../../../libs/api/repository/src'
 import { CommonModule } from '@angular/common'
 import { BoundingBox } from '../../../../../../libs/util/shared/src'
 import { NotificationsService } from '../../../../../../libs/feature/notifications/src'
-import { TranslateService } from '@ngx-translate/core'
-import { getOptionalSearchConfig } from '../../../../../../libs/util/app-config/src'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import {
+  LocationBbox,
+  LocationSearchComponent,
+} from '../location-search/location-search.component'
+
+marker('search.filters.spatialExtent.searchLocation')
+
+// in MB, null means no limit
+export const SPATIAL_EXTENT_MAX_FILE_SIZE = new InjectionToken<number | null>(
+  'spatialExtentMaxFileSize',
+  { factory: () => null }
+)
 
 @Component({
   selector: 'gn-ui-filter-dropdown',
@@ -40,6 +54,8 @@ import { getOptionalSearchConfig } from '../../../../../../libs/util/app-config/
     DateRangeDropdownComponent,
     DropdownMultiselectComponent,
     SpatialExtentDropdownComponent,
+    LocationSearchComponent,
+    TranslatePipe,
   ],
 })
 export class FilterDropdownComponent implements OnInit {
@@ -52,8 +68,10 @@ export class FilterDropdownComponent implements OnInit {
   @Input() fieldName: string
   @Input() title: string
 
-  spatialExtentMaxFileSize =
-    getOptionalSearchConfig()?.SPATIAL_EXTENT_MAX_FILE_SIZE
+  @ViewChild(SpatialExtentDropdownComponent)
+  spatialExtentDropdown: SpatialExtentDropdownComponent
+
+  spatialExtentMaxFileSize = inject(SPATIAL_EXTENT_MAX_FILE_SIZE)
 
   fieldType: FieldType
   choices$: Observable<Choice[]>
@@ -96,6 +114,10 @@ export class FilterDropdownComponent implements OnInit {
     this.clearSpatialExtentErrorNotification()
   }
 
+  onLocationSelected({ bbox, label }: LocationBbox) {
+    this.spatialExtentDropdown.setLocationBbox(bbox, label)
+  }
+
   onSpatialExtentError(error: SpatialExtentDropdownError) {
     this.clearSpatialExtentErrorNotification()
     this.spatialExtentErrorNotificationId =

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

@@ -5,28 +5,60 @@ import {
   GeocodingResult,
   queryGeonames,
   GeonamesOptions,
-  DataGouvFrOptions,
-  queryDataGouvFr,
+  GeoplateformeOptions,
+  queryGeoplateforme,
 } 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]
+type GeoplateformeGeocodingProvider = ['geoplateforme', GeoplateformeOptions]
 export type GeocodingProvider =
   | GeoadminGeocodingProvider
   | GeonamesGeocodingProvider
-  | DataGouvFrGeocodingProvider
+  | GeoplateformeGeocodingProvider
+
+export const DEFAULT_GEOCODING_PROVIDER = [
+  'geonames',
+  { maxRows: 5 },
+] as GeocodingProvider
 
 export const GEOCODING_PROVIDER = new InjectionToken<GeocodingProvider>(
   'geocoding-provider',
   {
     providedIn: 'root',
-    factory: () => ['geonames', { maxRows: 5 }] as GeocodingProvider,
+    factory: (): GeocodingProvider => DEFAULT_GEOCODING_PROVIDER,
   }
 )
 
+// these options are arrays in the providers, but they can be configured
+// with a single value for simplicity
+const GEOCODING_PROVIDER_ARRAY_OPTIONS: {
+  geoadmin: (keyof GeoadminOptions)[]
+  geoplateforme: (keyof GeoplateformeOptions)[]
+} = {
+  geoadmin: ['origins', 'features'],
+  geoplateforme: [
+    'index',
+    'category',
+    'type',
+    'postCode',
+    'cityCode',
+    'depCode',
+  ],
+}
+
+function wrapArrayOptions<T extends object>(options: T, keys: (keyof T)[]): T {
+  const wrapped = { ...options }
+  for (const key of keys) {
+    if (typeof wrapped[key] === 'string') {
+      wrapped[key] = [wrapped[key]] as T[keyof T]
+    }
+  }
+  return wrapped
+}
+
 @Injectable({
   providedIn: 'root',
 })
@@ -38,7 +70,13 @@ export class GeocodingService {
     switch (this.provider[0]) {
       case 'geoadmin':
         queryObservable = from(
-          queryGeoadmin(text, this.provider[1] as GeoadminOptions)
+          queryGeoadmin(
+            text,
+            wrapArrayOptions(
+              this.provider[1] as GeoadminOptions,
+              GEOCODING_PROVIDER_ARRAY_OPTIONS.geoadmin
+            )
+          )
         )
         break
       case 'geonames':
@@ -46,9 +84,15 @@ export class GeocodingService {
           queryGeonames(text, this.provider[1] as GeonamesOptions)
         )
         break
-      case 'data-gouv-fr':
+      case 'geoplateforme':
         queryObservable = from(
-          queryDataGouvFr(text, this.provider[1] as DataGouvFrOptions)
+          queryGeoplateforme(text, {
+            ...wrapArrayOptions(
+              this.provider[1] as GeoplateformeOptions,
+              GEOCODING_PROVIDER_ARRAY_OPTIONS.geoplateforme
+            ),
+            returnTrueGeometry: true,
+          })
         )
         break
       default:

package/src/libs/feature/search/src/lib/location-search/location-search.component.html

@@ -2,7 +2,17 @@
   [action]="searchAction"
   [displayWithFn]="displayWithFn"
   [placeholder]="placeholder"
-  [displayWithTemplate]="displayWithTemplate"
+  [displayWithTemplate]="defaultItemTpl"
+  [clearOnSelection]="true"
   (itemSelected)="handleItemSelected($event)"
 >
 </gn-ui-autocomplete>
+
+<ng-template #defaultItemTpl let-result>
+  <div class="py-2">
+    @if (getSecondaryLabel(result)) {
+      <div class="gn-ui-card-detail">{{ getSecondaryLabel(result) }}</div>
+    }
+    <div class="gn-ui-card-title">{{ getDisplayLabel(result) }}</div>
+  </div>
+</ng-template>