geonetwork-ui 2.4.0-dev.e1bb65c4 → 2.4.0-dev.e5f8e61e

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.model.ts

@@ -1,43 +0,0 @@
-type BaseFormFieldType =
-  | 'text'
-  | 'number'
-  | 'rich'
-  | 'date'
-  | 'list'
-  | 'spatial_extent'
-  | 'temporal_extent'
-  | 'url'
-  | 'file'
-  | 'toggle'
-
-type AllFormFieldType = BaseFormFieldType | 'object' | 'array'
-
-interface FormFieldConfigBase {
-  type: AllFormFieldType
-  labelKey: string
-  hintKey?: string
-  tooltipKey?: string
-  required?: boolean
-  locked?: boolean
-  invalid?: boolean
-  invalidHintKey?: string
-}
-
-export interface FormFieldConfigSimple extends FormFieldConfigBase {
-  type: BaseFormFieldType
-}
-
-export interface FormFieldConfigArray extends FormFieldConfigBase {
-  type: 'array'
-  items: FormFieldConfig
-}
-
-export interface FormFieldConfigObject extends FormFieldConfigBase {
-  type: 'object'
-  fields: Array<FormFieldConfig>
-}
-
-export type FormFieldConfig =
-  | FormFieldConfigSimple
-  | FormFieldConfigArray
-  | FormFieldConfigObject

package/src/libs/feature/editor/src/lib/models/fields.model.ts

@@ -1,29 +0,0 @@
-import { FormFieldConfig } from '../components/record-form/form-field'
-
-// Expressions should be enclosed in `${}` to be recognized as such
-// eg. ${dateNow()}
-export type EditorFieldExpression = `$\{${string}}`
-
-export interface EditorFieldConfig {
-  // configuration of the form field used as presentation; optional, nothing shown if not defined
-  formFieldConfig?: FormFieldConfig
-
-  // name of the target field in the record; will not change the record directly if not defined
-  model?: string
-
-  // a hidden field won't show but can still be used to modify the record
-  // FIXME: currently this is redundant with an absence of formFieldConfig but necessary for clarity
-  hidden?: boolean
-
-  // the result of this expression will replace the field value on save
-  onSaveProcess?: EditorFieldExpression
-}
-
-export type EditorFieldsConfig = EditorFieldConfig[]
-
-export type EditorFieldValue = string | number | boolean | unknown
-
-export interface EditorFieldState {
-  config: EditorFieldConfig
-  value: string | number | boolean | unknown
-}

package/src/libs/feature/map/src/lib/+state/map.effects.ts

@@ -1,7 +0,0 @@
-import { Injectable } from '@angular/core'
-import { Actions } from '@ngrx/effects'
-
-@Injectable()
-export class MapEffects {
-  constructor(private readonly actions$: Actions) {}
-}

package/src/libs/feature/map/src/lib/+state/map.models.ts

@@ -1,9 +0,0 @@
-import { MapContextLayerModel } from '../map-context/map-context.model'
-
-export type MapLayer = MapContextLayerModel & {
-  title: string
-}
-export type MapLayerWithInfo = MapLayer & {
-  error: string | null
-  loading: boolean
-}

package/src/libs/feature/map/src/lib/constant/map-options.ts

@@ -1,17 +0,0 @@
-import { InjectionToken } from '@angular/core'
-import { StyleFunction } from 'ol/style/Style'
-import { defaultStyle, hlStyle } from './style.constant'
-
-export interface MapOptionsModel {
-  defaultStyle: StyleFunction
-  hlStyle: StyleFunction
-}
-
-export const defaultMapOptions: MapOptionsModel = {
-  defaultStyle,
-  hlStyle,
-}
-
-export const FEATURE_MAP_OPTIONS = new InjectionToken<MapOptionsModel>(
-  'mapOptions'
-)

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

@@ -1,42 +0,0 @@
-import { EventEmitter, Injectable } from '@angular/core'
-import Feature from 'ol/Feature'
-import { Geometry } from 'ol/geom'
-import { forkJoin, Observable, of } from 'rxjs'
-import { MapManagerService } from '../manager/map-manager.service'
-import { MapUtilsService } from '../utils/map-utils.service'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class FeatureInfoService {
-  features$ = new EventEmitter<Feature<Geometry>[]>()
-
-  constructor(
-    private manager: MapManagerService,
-    private mapUtils: MapUtilsService
-  ) {}
-
-  handleFeatureInfo(): void {
-    const { map } = this.manager
-    map.on('click', (event) => {
-      const gfiFeaturesObservables =
-        this.mapUtils.getGFIFeaturesObservablesFromClick(map, event)
-      const vectorFeatures$ = of(
-        this.mapUtils.getVectorFeaturesFromClick(map, event)
-      )
-
-      const featuresObservablesArray: Observable<Feature<Geometry>[]>[] = [
-        ...gfiFeaturesObservables,
-        vectorFeatures$,
-      ]
-
-      forkJoin(...featuresObservablesArray).subscribe((featuresArrays) => {
-        const allFeatures = featuresArrays.reduce(
-          (outputFeatures, features) => [...outputFeatures, ...features],
-          []
-        )
-        this.features$.emit(allFeatures)
-      })
-    })
-  }
-}

package/src/libs/feature/map/src/lib/manager/map-instance.directive.ts

@@ -1,10 +0,0 @@
-import { Directive } from '@angular/core'
-import { MapManagerService } from './map-manager.service'
-
-@Directive({
-  selector: '[gnUiMapContainer]',
-  providers: [MapManagerService],
-})
-export class MapInstanceDirective {
-  constructor(private manager: MapManagerService) {}
-}

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

@@ -1,13 +0,0 @@
-import { Injectable } from '@angular/core'
-import Map from 'ol/Map'
-import { MapUtilsService } from '../utils/map-utils.service'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class MapManagerService {
-  readonly map: Map
-  constructor(private utils: MapUtilsService) {
-    this.map = this.utils.createEmptyMap()
-  }
-}

package/src/libs/feature/map/src/lib/map-container/map-container.component.html

@@ -1 +0,0 @@
-<gn-ui-map-context [context]="context$ | async"></gn-ui-map-context>

package/src/libs/feature/map/src/lib/map-container/map-container.component.ts

@@ -1,26 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core'
-import { Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
-import { MapFacade } from '../+state/map.facade'
-import { MapContextModel } from '../map-context/map-context.model'
-import { DEFAULT_BASELAYER_CONTEXT } from '../map-context/map-context.service'
-
-@Component({
-  selector: 'gn-ui-map-container',
-  templateUrl: './map-container.component.html',
-  styleUrls: ['./map-container.component.css'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class MapContainerComponent {
-  context$: Observable<MapContextModel> = this.mapFacade.layers$.pipe(
-    map((layers) => ({
-      view: {
-        center: [4, 42],
-        zoom: 6,
-      },
-      layers: [DEFAULT_BASELAYER_CONTEXT, ...layers],
-    }))
-  )
-
-  constructor(private mapFacade: MapFacade) {}
-}

package/src/libs/feature/map/src/lib/map-context/component/map-context.component.html

@@ -1 +0,0 @@
-<gn-ui-map [map]="map"></gn-ui-map>

package/src/libs/feature/map/src/lib/map-context/component/map-context.component.ts

@@ -1,57 +0,0 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  OnChanges,
-  Output,
-} from '@angular/core'
-import { MapUtilsService } from '../../utils/map-utils.service'
-import Feature from 'ol/Feature'
-import { Geometry } from 'ol/geom'
-
-import Map from 'ol/Map'
-import { FeatureInfoService } from '../../feature-info/feature-info.service'
-import { MapManagerService } from '../../manager/map-manager.service'
-import { MapContextModel } from '../map-context.model'
-import { MapContextService } from '../map-context.service'
-import { MapConfig } from '../../../../../../../libs/util/app-config/src'
-
-@Component({
-  selector: 'gn-ui-map-context',
-  templateUrl: './map-context.component.html',
-  styleUrls: ['./map-context.component.css'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class MapContextComponent implements OnChanges {
-  @Input() context: MapContextModel
-  @Input() mapConfig: MapConfig
-  @Output() featureClicked = new EventEmitter<Feature<Geometry>[]>()
-
-  map: Map
-
-  constructor(
-    private service: MapContextService,
-    private featureInfo: FeatureInfoService,
-    private manager: MapManagerService,
-    private utils: MapUtilsService
-  ) {
-    this.map = manager.map
-  }
-
-  ngOnChanges() {
-    if (this.context?.view) {
-      if (this.context.view.extent && !this.map.getSize()) {
-        this.map.once('change:size', () => {
-          this.service.resetMapFromContext(
-            this.map,
-            this.context,
-            this.mapConfig
-          )
-        })
-      } else {
-        this.service.resetMapFromContext(this.map, this.context, this.mapConfig)
-      }
-    }
-  }
-}

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

@@ -1,51 +0,0 @@
-import { FEATURE_COLLECTION_POLYGON_FIXTURE_4326 } from '../../../../../../libs/common/fixtures/src'
-import { Extent } from 'ol/extent'
-import {
-  MapContextLayerGeojsonModel,
-  MapContextLayerModel,
-  MapContextLayerTypeEnum,
-  MapContextModel,
-  MapContextViewModel,
-} from '../map-context/map-context.model'
-
-export const MAP_CTX_LAYER_XYZ_FIXTURE: MapContextLayerModel = {
-  type: MapContextLayerTypeEnum.XYZ,
-  url: 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-}
-export const MAP_CTX_LAYER_WMS_FIXTURE: MapContextLayerModel = {
-  type: MapContextLayerTypeEnum.WMS,
-  url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WMS',
-  name: 'commune_actuelle_3857',
-}
-export const MAP_CTX_LAYER_WFS_FIXTURE: MapContextLayerModel = {
-  type: MapContextLayerTypeEnum.WFS,
-  url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WFS&VERSION=1.1.0',
-  name: 'ms:commune_actuelle_3857',
-}
-export const MAP_CTX_LAYER_GEOJSON_FIXTURE: MapContextLayerGeojsonModel = {
-  type: MapContextLayerTypeEnum.GEOJSON,
-  data: FEATURE_COLLECTION_POLYGON_FIXTURE_4326,
-}
-export const MAP_CTX_LAYER_GEOJSON_REMOTE_FIXTURE: MapContextLayerGeojsonModel =
-  {
-    type: MapContextLayerTypeEnum.GEOJSON,
-    url: 'https://my.host.com/data/regions.json',
-  }
-
-export const MAP_CTX_VIEW_FIXTURE: MapContextViewModel = {
-  center: [7.75, 48.6],
-  zoom: 9,
-}
-
-export const MAP_CTX_FIXTURE: MapContextModel = {
-  layers: [
-    MAP_CTX_LAYER_XYZ_FIXTURE,
-    MAP_CTX_LAYER_WMS_FIXTURE,
-    MAP_CTX_LAYER_GEOJSON_FIXTURE,
-  ],
-  view: MAP_CTX_VIEW_FIXTURE,
-}
-
-export const MAP_CTX_EXTENT_FIXTURE: Extent = [
-  171083.69713494915, 6246047.945419401, 476970.39956295764, 6631079.362882684,
-]

package/src/libs/feature/map/src/lib/map-context/map-context.model.ts

@@ -1,95 +0,0 @@
-import type { FeatureCollection } from 'geojson'
-import { Coordinate } from 'ol/coordinate'
-import type { Extent } from 'ol/extent'
-
-export enum MapContextLayerTypeEnum {
-  XYZ = 'xyz',
-  WMS = 'wms',
-  WMTS = 'wmts',
-  WFS = 'wfs',
-  GEOJSON = 'geojson',
-  OGCAPI = 'ogcapi',
-}
-
-export interface MapContextModel {
-  layers: MapContextLayerModel[]
-  view?: MapContextViewModel
-}
-
-export interface MapContextLayerWmsModel {
-  type: 'wms'
-  url: string
-  name: string
-  attributions?: string
-}
-
-export interface MapContextLayerWmtsModel {
-  type: 'wmts'
-  url: string
-  name: string
-  attributions?: string
-}
-
-interface MapContextLayerWfsModel {
-  type: 'wfs'
-  url: string
-  name: string
-  attributions?: string
-}
-
-export interface MapContextLayerOgcapiModel {
-  type: 'ogcapi'
-  url: string
-  name: string
-  layerType: 'feature' | 'vectorTiles' | 'mapTiles' | 'record'
-  attributions?: string
-}
-
-interface LayerXyzModel {
-  type: 'xyz'
-  name?: string
-  attributions?: string
-}
-interface LayerXyzModelWithUrl extends LayerXyzModel {
-  url: string
-  urls?: never
-}
-interface LayerXyzModelWithUrls extends LayerXyzModel {
-  urls: string[]
-  url?: never
-}
-export type MapContextLayerXyzModel =
-  | LayerXyzModelWithUrl
-  | LayerXyzModelWithUrls
-
-interface LayerGeojson {
-  type: 'geojson'
-  attributions?: string
-}
-interface LayerGeojsonWithUrl extends LayerGeojson {
-  url: string
-  data?: never
-}
-interface LayerGeojsonWithData extends LayerGeojson {
-  data: FeatureCollection | string
-  url?: never
-}
-export type MapContextLayerGeojsonModel =
-  | LayerGeojsonWithUrl
-  | LayerGeojsonWithData
-
-export type MapContextLayerModel =
-  | MapContextLayerWmsModel
-  | MapContextLayerWmtsModel
-  | MapContextLayerWfsModel
-  | MapContextLayerXyzModel
-  | MapContextLayerGeojsonModel
-  | MapContextLayerOgcapiModel
-
-export interface MapContextViewModel {
-  center?: Coordinate // expressed in long/lat (EPSG:4326)
-  zoom?: number
-  extent?: Extent // expressed in long/lat (EPSG:4326)
-  maxZoom?: number
-  maxExtent?: Extent // expressed in long/lat (EPSG:4326)
-}