geonetwork-ui 2.10.0-dev.f143bfdfa → 2.10.0-dev.fb2893f44

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts

@@ -2,9 +2,9 @@ import {
   ChangeDetectionStrategy,
   Component,
   EventEmitter,
+  inject,
   Input,
   Output,
-  inject,
 } from '@angular/core'
 import {
   DateAdapter,
@@ -52,6 +52,6 @@ export class DatePickerComponent {
   @Output() dateChange = new EventEmitter<Date>()
 
   constructor() {
-    this.dateAdapter.setLocale(this.translate.currentLang)
+    this.dateAdapter.setLocale(this.translate.getCurrentLang())
   }
 }

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

@@ -1,18 +1,11 @@
 import { ChangeDetectorRef, Component, inject, Input } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { Geometry } from 'geojson'
-import { GeoJSONFeatureCollection } from 'ol/format/GeoJSON.js'
-import GeoJSON from 'ol/format/GeoJSON.js'
-import { Polygon } from 'ol/geom.js'
-import {
-  createViewFromLayer,
-  MapContext,
-  MapContextLayer,
-} from '@geospatial-sdk/core'
+import { createViewFromLayer, MapContext } from '@geospatial-sdk/core'
 import { MapContainerComponent } from '../map-container/map-container.component'
 import { BehaviorSubject, from, Observable, of } from 'rxjs'
 import { map, switchMap, tap } from 'rxjs/operators'
 import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { createSpatialExtentLayer } from '../../map-utils'
 
 @Component({
   selector: 'gn-ui-spatial-extent',
@@ -30,39 +23,10 @@ export class SpatialExtentComponent {
   spatialExtents$ = new BehaviorSubject<DatasetSpatialExtent[]>([])
   mapContext$: Observable<MapContext> = this.spatialExtents$.pipe(
     switchMap((extents) => {
-      if (extents.length === 0) {
+      const layer = createSpatialExtentLayer(extents)
+      if (!layer) {
         return of(null)
       }
-      const featureCollection: GeoJSONFeatureCollection = {
-        type: 'FeatureCollection',
-        features: [],
-      }
-      extents.forEach((extent) => {
-        if (extent.geometry) {
-          featureCollection.features.push({
-            type: 'Feature',
-            properties: {},
-            geometry: extent.geometry,
-          })
-        } else if (extent.bbox?.length >= 0) {
-          featureCollection.features.push({
-            type: 'Feature',
-            properties: {},
-            geometry: this.bboxCoordsToGeometry(extent.bbox),
-          })
-        }
-      })
-
-      const layer: MapContextLayer = {
-        type: 'geojson',
-        data: featureCollection,
-        label: 'Spatial extents',
-        style: {
-          'stroke-color': 'black',
-          'stroke-width': 2,
-          'fill-color': 'rgba(153, 153, 153, 0.3)',
-        },
-      }
       return from(createViewFromLayer(layer)).pipe(
         map((view) => ({ view, layers: [layer] }) as MapContext),
         tap(() => this._cdr.markForCheck())
@@ -71,18 +35,4 @@ export class SpatialExtentComponent {
   )
 
   error = ''
-
-  bboxCoordsToGeometry(bbox: [number, number, number, number]): Geometry {
-    const geometry = new Polygon([
-      [
-        [bbox[0], bbox[1]],
-        [bbox[0], bbox[3]],
-        [bbox[2], bbox[3]],
-        [bbox[2], bbox[1]],
-        [bbox[0], bbox[1]],
-      ],
-    ])
-
-    return new GeoJSON().writeGeometryObject(geometry)
-  }
 }

package/src/libs/ui/map/src/lib/map-utils.ts

@@ -12,6 +12,54 @@ import {
   MouseWheelZoom,
 } from 'ol/interaction.js'
 import MapBrowserEvent from 'ol/MapBrowserEvent.js'
+import type { DatasetSpatialExtent } from '../../../../../libs/common/domain/src/lib/model/record'
+import type {
+  MapContextLayer,
+  MapContextLayerGeojson,
+} from '@geospatial-sdk/core'
+import { spatialExtentsToFeatureCollection } from '../../../../../libs/util/shared/src'
+
+export type SpatialExtentLayerStyle = NonNullable<
+  MapContextLayerGeojson['style']
+>
+
+/**
+ * Default style for a spatial-extent layer: a solid black outline over a
+ * translucent grey fill.
+ */
+export const DEFAULT_SPATIAL_EXTENT_STYLE: SpatialExtentLayerStyle = {
+  'stroke-color': 'black',
+  'stroke-width': 2,
+  'fill-color': 'rgba(153, 153, 153, 0.3)',
+}
+
+/**
+ * Builds a GeoJSON map layer drawing the given spatial extents: each extent is
+ * rendered from its own geometry or, when only a bounding box is available,
+ * from a polygon derived from that box.
+ *
+ * @returns the layer, or `null` when none of the extents can be represented.
+ */
+export function createSpatialExtentLayer(
+  extents: DatasetSpatialExtent[],
+  overrides?: {
+    label?: string
+    clickable?: boolean
+    style?: SpatialExtentLayerStyle
+  }
+): MapContextLayer | null {
+  const data = spatialExtentsToFeatureCollection(extents)
+  if (data.features.length === 0) {
+    return null
+  }
+  return {
+    type: 'geojson',
+    data,
+    label: 'Spatial extents',
+    style: DEFAULT_SPATIAL_EXTENT_STYLE,
+    ...overrides,
+  }
+}
 
 export function prioritizePageScroll(interactions: Collection<Interaction>) {
   interactions.clear()

package/src/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.ts

@@ -52,7 +52,7 @@ export class RecordPreviewFeedComponent extends RecordPreviewComponent {
   protected elementRef: ElementRef
   private translate = inject(TranslateService)
 
-  timeFormat = new Duration(this.translate.currentLang, {})
+  timeFormat = new Duration(this.translate.getCurrentLang(), {})
 
   constructor() {
     const elementRef = inject(ElementRef)

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

@@ -18,10 +18,15 @@ import {
   SearchConfig,
   ThemeConfig,
 } from './model'
-import { TranslateCompiler, TranslateLoader } from '@ngx-translate/core'
+import {
+  TranslateCompiler,
+  TranslateLoader,
+  TranslateModuleConfig,
+} from '@ngx-translate/core'
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
-import { HttpClient } from '@angular/common/http'
 import { FileWithOverridesTranslateLoader } from './i18n/file-with-overrides.translate.loader'
+import { TRANSLATE_HTTP_LOADER_CONFIG } from '@ngx-translate/http-loader'
+import { HttpClient } from '@angular/common/http'
 
 const MISSING_CONFIG_ERROR = `Application configuration was not initialized correctly.
 This error might show up in case of an invalid/malformed configuration file.
@@ -361,16 +366,23 @@ export function _reset() {
   customTranslations = null
 }
 
-export const TRANSLATE_WITH_OVERRIDES_CONFIG = {
+export const TRANSLATE_WITH_OVERRIDES_CONFIG: TranslateModuleConfig = {
   compiler: {
     provide: TranslateCompiler,
     useClass: TranslateMessageFormatCompiler,
   },
-  loader: {
-    provide: TranslateLoader,
-    useFactory: function HttpLoaderFactory(http: HttpClient) {
-      return new FileWithOverridesTranslateLoader(http, './assets/i18n/')
+  loader: [
+    {
+      provide: TRANSLATE_HTTP_LOADER_CONFIG,
+      useValue: {
+        prefix: './assets/i18n/',
+        suffix: '.json',
+      },
     },
-    deps: [HttpClient],
-  },
+    {
+      provide: TranslateLoader,
+      useClass: FileWithOverridesTranslateLoader,
+      deps: [HttpClient, TRANSLATE_HTTP_LOADER_CONFIG],
+    },
+  ],
 }

package/src/libs/util/data-fetcher/src/lib/readers/base-file.ts

@@ -1,4 +1,3 @@
-import { BaseReader } from './base'
 import { DataItem, DatasetInfo, PropertyInfo } from '../model'
 import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
@@ -58,7 +57,7 @@ export class BaseFileReader extends BaseCacheReader {
       this.groupedBy,
       this.aggregations
     )
-    const result = await import('alasql').then((module) =>
+    const result: any[] = await import('alasql').then((module) =>
       module.default(query, [jsonItems])
     )
     return result.map(jsonToGeojsonFeature)

package/src/libs/util/data-fetcher/src/lib/readers/wfs.ts

@@ -1,10 +1,13 @@
 import { EndpointError, WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
 import { DataItem, DatasetInfo, FetchError, PropertyInfo } from '../model'
-import { fetchDataAsText } from '../utils'
+import {
+  fetchDataAsText,
+  getJsonDataItemsProxy,
+  jsonToGeojsonFeature,
+} from '../utils'
 import { GmlReader, parseGml } from './gml'
 import { GeojsonReader, parseGeojson } from './geojson'
 import { BaseCacheReader } from './base-cache'
-import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
 
 export async function getWfsEndpoint(wfsUrl: string): Promise<WfsEndpoint> {
@@ -167,7 +170,7 @@ export class WfsReader extends BaseCacheReader {
       this.groupedBy,
       this.aggregations
     )
-    const result = await import('alasql').then((module) =>
+    const result: any[] = await import('alasql').then((module) =>
       module.default(query, [jsonItems])
     )
     return result.map(jsonToGeojsonFeature)

package/src/libs/util/i18n/src/index.ts

@@ -2,6 +2,5 @@ export * from './lib/i18n.providers'
 export * from './lib/i18n.constants'
 export * from './lib/i18n.interceptor'
 export * from './lib/file.translate.loader'
-export * from './lib/embedded.translate.loader'
 export * from './lib/translate.loader.utils'
 export * from './lib/language-codes'

package/src/libs/util/i18n/src/lib/i18n.constants.ts

@@ -1,6 +1,4 @@
-import { HttpClient } from '@angular/common/http'
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
-import { FileTranslateLoader } from './file.translate.loader'
 import {
   TranslateCompiler,
   TranslateDefaultParser,
@@ -9,26 +7,34 @@ import {
   TranslateParser,
 } from '@ngx-translate/core'
 import { Injectable } from '@angular/core'
+import { TRANSLATE_HTTP_LOADER_CONFIG } from '@ngx-translate/http-loader'
+import { HttpClient } from '@angular/common/http'
+import { FileTranslateLoader } from './file.translate.loader'
 
 export const DEFAULT_LANG = 'en'
 
 // Caution: changing this can break language selection from third parties!
 export const LANGUAGE_STORAGE_KEY = 'geonetwork-ui-language'
 
-export function HttpLoaderFactory(http: HttpClient) {
-  return new FileTranslateLoader(http, './assets/i18n/')
-}
-
 export const TRANSLATE_DEFAULT_CONFIG: TranslateModuleConfig = {
   compiler: {
     provide: TranslateCompiler,
     useClass: TranslateMessageFormatCompiler,
   },
-  loader: {
-    provide: TranslateLoader,
-    useFactory: HttpLoaderFactory,
-    deps: [HttpClient],
-  },
+  loader: [
+    {
+      provide: TRANSLATE_HTTP_LOADER_CONFIG,
+      useValue: {
+        prefix: './assets/i18n/',
+        suffix: '.json',
+      },
+    },
+    {
+      provide: TranslateLoader,
+      useClass: FileTranslateLoader,
+      deps: [HttpClient, TRANSLATE_HTTP_LOADER_CONFIG],
+    },
+  ],
 }
 
 @Injectable()

package/src/libs/util/i18n/src/lib/i18n.interceptor.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/common/http'
 import { DEFAULT_LANG } from './i18n.constants'
 import { Observable } from 'rxjs'
-import { Injectable, Injector, inject } from '@angular/core'
+import { inject, Injectable, Injector } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
 
 @Injectable()
@@ -21,7 +21,7 @@ export class I18nInterceptor implements HttpInterceptor {
     const translate = this.injector.get(TranslateService)
     request = request.clone({
       setHeaders: {
-        'Accept-Language': translate.currentLang || DEFAULT_LANG,
+        'Accept-Language': translate.getCurrentLang() || DEFAULT_LANG,
       },
     })
     return next.handle(request)

package/src/libs/util/i18n/src/lib/i18n.providers.ts

@@ -1,7 +1,8 @@
 import {
-  APP_INITIALIZER,
   EnvironmentProviders,
+  inject,
   makeEnvironmentProviders,
+  provideAppInitializer,
   Provider,
 } from '@angular/core'
 import {
@@ -22,17 +23,16 @@ import {
 } from '@angular/common/http'
 import { I18nInterceptor } from './i18n.interceptor'
 
-function i18nInitializerFromLocalStorageFactory(translate: TranslateService) {
-  return () => {
-    translate.setDefaultLang(DEFAULT_LANG)
-    let storageLang = null
-    try {
-      storageLang = localStorage.getItem(LANGUAGE_STORAGE_KEY)
-    } catch (error) {
-      console.warn(error)
-    }
-    translate.use(storageLang || translate.getBrowserLang() || DEFAULT_LANG)
+function i18nInitializerFromLocalStorageFactory() {
+  const translate = inject(TranslateService)
+  translate.setFallbackLang(DEFAULT_LANG)
+  let storageLang = null
+  try {
+    storageLang = localStorage.getItem(LANGUAGE_STORAGE_KEY)
+  } catch (error) {
+    console.warn(error)
   }
+  translate.use(storageLang || translate.getBrowserLang() || DEFAULT_LANG)
 }
 
 export function provideI18n(
@@ -56,12 +56,9 @@ export function provideI18n(
     provideTranslateService(usedConfig),
   ]
   if (useLocalStorage) {
-    providers.push({
-      provide: APP_INITIALIZER,
-      useFactory: i18nInitializerFromLocalStorageFactory,
-      deps: [TranslateService],
-      multi: true,
-    })
+    providers.push(
+      provideAppInitializer(i18nInitializerFromLocalStorageFactory)
+    )
   }
 
   return makeEnvironmentProviders(providers)

package/src/libs/util/i18n/src/lib/test.translate.loader.ts

@@ -0,0 +1,48 @@
+import { inject, Injectable, InjectionToken } from '@angular/core'
+import {
+  provideTranslateService,
+  TranslateCompiler,
+  TranslateLoader,
+  TranslationObject,
+} from '@ngx-translate/core'
+import { Observable, of } from 'rxjs'
+import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
+
+/**
+ * This translate loader is used for testing purposes, it allows to provide translations directly in the test file without having to create JSON files
+ * Taken from https://github.com/mwootendev/ngx-translate-plugins/issues/87
+ */
+
+const TestTranslations = new InjectionToken<Record<string, TranslationObject>>(
+  'test-translations'
+)
+
+@Injectable()
+class TestTranslateLoader implements TranslateLoader {
+  translations = inject(TestTranslations)
+  getTranslation(lang: string): Observable<TranslationObject> {
+    return of(this.translations[lang] as TranslationObject)
+  }
+}
+
+export function provideTranslateTestingService(
+  translations: Record<string, TranslationObject>
+) {
+  return provideTranslateService({
+    loader: [
+      {
+        provide: TestTranslations,
+        useValue: translations,
+      },
+      {
+        provide: TranslateLoader,
+        useClass: TestTranslateLoader,
+      },
+    ],
+    fallbackLang: 'en',
+    compiler: {
+      provide: TranslateCompiler,
+      useClass: TranslateMessageFormatCompiler,
+    },
+  })
+}

package/src/libs/util/shared/src/lib/services/date.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
 import { type Locale } from 'date-fns/locale'
 import { formatDistance } from 'date-fns/formatDistance'
@@ -30,13 +30,13 @@ export class DateService {
     locale: string
     dateObj: Date
   } {
-    const locale = this.translateService.currentLang || DEFAULT_LANGUAGE
+    const locale = this.translateService.getCurrentLang() || DEFAULT_LANGUAGE
     const dateObj = this.getDateObject(date)
     return { locale, dateObj }
   }
 
   private async getDateLocale(): Promise<Locale> {
-    const lang = this.translateService.currentLang || DEFAULT_LANGUAGE
+    const lang = this.translateService.getCurrentLang() || DEFAULT_LANGUAGE
     const locales = await this.dateLocales
     return locales[lang]
   }

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

@@ -1,4 +1,11 @@
-import type { Feature, FeatureCollection, Geometry, Position } from 'geojson'
+import type {
+  Feature,
+  FeatureCollection,
+  Geometry,
+  Polygon,
+  Position,
+} from 'geojson'
+import type { DatasetSpatialExtent } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 /**
  * @returns The geometry if available, otherwise null.
@@ -94,3 +101,53 @@ export function getGeometryBoundingBox(geometry: Geometry): BoundingBox {
       return coordinatesReducer(emptyExtent, geometry.coordinates)
   }
 }
+
+/**
+ * Builds the closed GeoJSON Polygon matching the given bounding box.
+ */
+export function bboxToPolygon(bbox: BoundingBox): Polygon {
+  const [minX, minY, maxX, maxY] = bbox
+  return {
+    type: 'Polygon',
+    coordinates: [
+      [
+        [minX, minY],
+        [minX, maxY],
+        [maxX, maxY],
+        [maxX, minY],
+        [minX, minY],
+      ],
+    ],
+  }
+}
+
+/**
+ * Returns the geometry carried by a spatial extent, falling back to the polygon
+ * derived from its bounding box. Returns null when the extent has neither.
+ */
+export function spatialExtentToGeometry(
+  extent: DatasetSpatialExtent
+): Geometry | null {
+  if (extent.geometry) return extent.geometry
+  if (extent.bbox) return bboxToPolygon(extent.bbox)
+  return null
+}
+
+/**
+ * Converts a list of dataset spatial extents into a GeoJSON FeatureCollection,
+ * e.g. to be used as the data source of a map layer.
+ */
+export function spatialExtentsToFeatureCollection(
+  extents: DatasetSpatialExtent[]
+): FeatureCollection {
+  return {
+    type: 'FeatureCollection',
+    features: extents.reduce<Feature[]>((features, extent) => {
+      const geometry = spatialExtentToGeometry(extent)
+      if (geometry) {
+        features.push({ type: 'Feature', properties: {}, geometry })
+      }
+      return features
+    }, []),
+  }
+}

package/style.css

@@ -1,4 +1,3 @@
 @import 'tippy.js/dist/tippy.css';
 @import 'ol/ol.css';
-@import '@angular/material/prebuilt-themes/indigo-pink.css';
 @import './tailwind.base.css';

package/tailwind.base.css

@@ -1,3 +1,5 @@
+@import './material-styles.css';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;

package/translations/de.json

@@ -243,25 +243,25 @@
   "editor.record.form.temporalExtents.addRange": "Zeitraum",
   "editor.record.form.temporalExtents.date": "Datum",
   "editor.record.form.temporalExtents.range": "Datumsbereich",
-  "editor.record.form.topics.inspire.biota": "Biologie",
-  "editor.record.form.topics.inspire.boundaries": "Grenzen",
-  "editor.record.form.topics.inspire.climatology": "Klimatologie/Meteorologie/Atmosphäre",
-  "editor.record.form.topics.inspire.economy": "Wirtschaft",
-  "editor.record.form.topics.inspire.elevation": "Höhenangaben",
-  "editor.record.form.topics.inspire.environnement": "Umwelt",
-  "editor.record.form.topics.inspire.farming": "Landwirtschaft",
-  "editor.record.form.topics.inspire.geoscientific": "Geowissenschaften",
-  "editor.record.form.topics.inspire.health": "Gesundheitswesen",
-  "editor.record.form.topics.inspire.imagery": "Bilddaten/Basiskarten/Landbedeckung",
-  "editor.record.form.topics.inspire.intelligence": "Aufklärung/Militär",
-  "editor.record.form.topics.inspire.location": "Ortsangaben",
-  "editor.record.form.topics.inspire.oceans": "Meere",
-  "editor.record.form.topics.inspire.planning": "Planungsunterlagen/Kataster",
-  "editor.record.form.topics.inspire.society": "Gesellschaft",
-  "editor.record.form.topics.inspire.structure": "Bauwerke",
-  "editor.record.form.topics.inspire.transportation": "Verkehrswesen",
-  "editor.record.form.topics.inspire.utilities": "Ver- und Entsorgung/Nachrichtenwesen",
-  "editor.record.form.topics.inspire.waters": "Binnengewässer",
+  "editor.record.form.topics.iso.biota": "Biologie",
+  "editor.record.form.topics.iso.boundaries": "Grenzen",
+  "editor.record.form.topics.iso.climatologyMeteorologyAtmosphere": "Klimatologie/Meteorologie/Atmosphäre",
+  "editor.record.form.topics.iso.economy": "Wirtschaft",
+  "editor.record.form.topics.iso.elevation": "Höhenangaben",
+  "editor.record.form.topics.iso.environment": "Umwelt",
+  "editor.record.form.topics.iso.farming": "Landwirtschaft",
+  "editor.record.form.topics.iso.geoscientificInformation": "Geowissenschaften",
+  "editor.record.form.topics.iso.health": "Gesundheitswesen",
+  "editor.record.form.topics.iso.imageryBaseMapsEarthCover": "Bilddaten/Basiskarten/Landbedeckung",
+  "editor.record.form.topics.iso.intelligenceMilitary": "Aufklärung/Militär",
+  "editor.record.form.topics.iso.location": "Ortsangaben",
+  "editor.record.form.topics.iso.oceans": "Meere",
+  "editor.record.form.topics.iso.planningCadastre": "Planungsunterlagen/Kataster",
+  "editor.record.form.topics.iso.society": "Gesellschaft",
+  "editor.record.form.topics.iso.structure": "Bauwerke",
+  "editor.record.form.topics.iso.transportation": "Verkehrswesen",
+  "editor.record.form.topics.iso.utilitiesCommunication": "Ver- und Entsorgung/Nachrichtenwesen",
+  "editor.record.form.topics.iso.inlandWaters": "Binnengewässer",
   "editor.record.form.topics.placeholder": "Ein oder mehrere Themen auswählen",
   "editor.record.form.updateFrequency.planned": "Dieses Dataset wird regelmäßig aktualisiert.",
   "editor.record.importFromExternalFile.failure.body": "Beim Importieren des Datensatzes ist ein Fehler aufgetreten:",

package/translations/en.json

@@ -243,25 +243,25 @@
   "editor.record.form.temporalExtents.addRange": "Time period",
   "editor.record.form.temporalExtents.date": "Date",
   "editor.record.form.temporalExtents.range": "Date range",
-  "editor.record.form.topics.inspire.biota": "Biota",
-  "editor.record.form.topics.inspire.boundaries": "Boundaries",
-  "editor.record.form.topics.inspire.climatology": "Climatology / Meteorology / Atmosphere",
-  "editor.record.form.topics.inspire.economy": "Economy",
-  "editor.record.form.topics.inspire.elevation": "Elevation",
-  "editor.record.form.topics.inspire.environnement": "Environnement",
-  "editor.record.form.topics.inspire.farming": "Farming",
-  "editor.record.form.topics.inspire.geoscientific": "Geoscientific Information",
-  "editor.record.form.topics.inspire.health": "Health",
-  "editor.record.form.topics.inspire.imagery": "Imagery / Base Maps / Earth Cover",
-  "editor.record.form.topics.inspire.intelligence": "Intelligence / Military",
-  "editor.record.form.topics.inspire.location": "Location",
-  "editor.record.form.topics.inspire.oceans": "Oceans",
-  "editor.record.form.topics.inspire.planning": "Planning / Cadastre",
-  "editor.record.form.topics.inspire.society": "Society",
-  "editor.record.form.topics.inspire.structure": "Structure",
-  "editor.record.form.topics.inspire.transportation": "Transportation",
-  "editor.record.form.topics.inspire.utilities": "Utilities / Communication",
-  "editor.record.form.topics.inspire.waters": "Inland Waters",
+  "editor.record.form.topics.iso.biota": "Biota",
+  "editor.record.form.topics.iso.boundaries": "Boundaries",
+  "editor.record.form.topics.iso.climatologyMeteorologyAtmosphere": "Climatology / Meteorology / Atmosphere",
+  "editor.record.form.topics.iso.economy": "Economy",
+  "editor.record.form.topics.iso.elevation": "Elevation",
+  "editor.record.form.topics.iso.environment": "Environnement",
+  "editor.record.form.topics.iso.farming": "Farming",
+  "editor.record.form.topics.iso.geoscientificInformation": "Geoscientific Information",
+  "editor.record.form.topics.iso.health": "Health",
+  "editor.record.form.topics.iso.imageryBaseMapsEarthCover": "Imagery / Base Maps / Earth Cover",
+  "editor.record.form.topics.iso.intelligenceMilitary": "Intelligence / Military",
+  "editor.record.form.topics.iso.location": "Location",
+  "editor.record.form.topics.iso.oceans": "Oceans",
+  "editor.record.form.topics.iso.planningCadastre": "Planning / Cadastre",
+  "editor.record.form.topics.iso.society": "Society",
+  "editor.record.form.topics.iso.structure": "Structure",
+  "editor.record.form.topics.iso.transportation": "Transportation",
+  "editor.record.form.topics.iso.utilitiesCommunication": "Utilities / Communication",
+  "editor.record.form.topics.iso.inlandWaters": "Inland Waters",
   "editor.record.form.topics.placeholder": "Select one or several topics",
   "editor.record.form.updateFrequency.planned": "This dataset is updated regularly",
   "editor.record.importFromExternalFile.failure.body": "Failure",