Skip to content

Commit

Permalink
chore: refactor form field spatial extents,
Browse files Browse the repository at this point in the history 
fix duplicates in keywords
  • Loading branch information
@Angi-Kinas
Angi-Kinas committed Jul 30, 2024
1 parent 0be6d5b commit 6a3915c
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 54 deletions.
10 changes: 6 additions & 4 deletions ...cord-form/form-field/form-field-keywords-generic/form-field-keywords-generic.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,20 @@ export class GenericFormFieldKeywordsComponent {
}

addKeyword(keyword: Keyword) {
const isNewKeyword = this.keywords.find((k) => k.label !== keyword.label)
if (isNewKeyword) {
const duplicatedKeyword = this.keywords.find(
(k) => k.label === keyword.label
)
if (!duplicatedKeyword) {
this.keywords.push(keyword)
this.changedKeywords.emit(this.keywords)
}
}

removeKeyword(keyword: Keyword) {
const removeKeywords = this.keywords.filter(
const removedKeywords = this.keywords.filter(
(k) => k.label !== keyword.label
)

this.changedKeywords.emit(removeKeywords)
this.changedKeywords.emit(removedKeywords)
}
}
100 changes: 57 additions & 43 deletions ...s/record-form/form-field/form-field-spatial-extent/form-field-spatial-extent.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ import {
import { UiWidgetsModule } from '@geonetwork-ui/ui/widgets'
import { getOptionalMapConfig, MapConfig } from '@geonetwork-ui/util/app-config'
import { Extent } from 'ol/extent'
import Feature from 'ol/Feature'

import { GeoJSONFeatureCollection } from 'ol/format/GeoJSON'
import GeoJSON from 'ol/format/GeoJSON'
import { Polygon } from 'ol/geom'
import { Fill, Stroke, Style } from 'ol/style'
import { catchError, from, map, Observable, of, switchMap } from 'rxjs'
import { GenericFormFieldKeywordsComponent } from '../form-field-keywords-generic/form-field-keywords-generic.component'
import { Geometry } from 'geojson'

@Component({
selector: 'gn-ui-form-field-spatial-extent',
Expand Down Expand Up @@ -100,7 +100,6 @@ export class FormFieldSpatialExtentComponent implements OnInit {
mapConfig: MapConfig = getOptionalMapConfig()

constructor(
private platformService: PlatformServiceInterface,
private mapFacade: MapFacade,
private styleService: MapStyleService,
private mapUtils: MapUtilsService
Expand All @@ -125,16 +124,39 @@ export class FormFieldSpatialExtentComponent implements OnInit {
}

ngOnInit(): void {
this.placeKeywords.forEach((keyword) => {
const bbox = this.spatialExtents.find(
(extent) => extent.description === keyword?.key
this.linkPlaceKeywordsToSpatialExtents(
this.placeKeywords,
this.spatialExtents
)
this.linkSpatialExtentsToPlaceKeywords(
this.spatialExtents,
this.placeKeywords
)

// add initial places to map
this.handleLayersOnMap()

// Rules
//when creating an extent from a place keyword, the keyword URI should be stored in the extent description; this way, when deleting a place keyword, its corresponding extent can also be removed from the record
// if an extent comes with a description that is a URI for which no keyword was found, a badge “Unknown location” appears below the keyword selector; this way, the extent can still be deleted
// if an extent comes with no description: same, an “Unknown location” badge appears
// if an extent comes with a description that is NOT a URI, the description is shown in the badge
}

linkPlaceKeywordsToSpatialExtents(
placeKeywords: Keyword[],
spatialExtents: DatasetSpatialExtent[]
) {
placeKeywords.forEach((keyword) => {
const bbox = spatialExtents.find(
(extent) => extent?.description === keyword?.key
)?.bbox

const geometries = this.spatialExtents.find(
(extent) => extent.description === keyword?.key
const geometries = spatialExtents.find(
(extent) => extent?.description === keyword?.key
)?.geometries

this.keywordsLinkedToExtents[keyword.key] = {
this.keywordsLinkedToExtents[keyword?.key] = {
placeKeyword: keyword,
spatialExtents: {
bbox: bbox,
Expand All @@ -144,7 +166,14 @@ export class FormFieldSpatialExtentComponent implements OnInit {
}
})

this.spatialExtents.forEach((extent) => {
this.placeKeywords = placeKeywords
}

linkSpatialExtentsToPlaceKeywords(
spatialExtents: DatasetSpatialExtent[],
placeKeywords: Keyword[]
) {
spatialExtents.forEach((extent) => {
if (this.keywordsLinkedToExtents[extent.description]) {
return
} else {
Expand All @@ -158,9 +187,9 @@ export class FormFieldSpatialExtentComponent implements OnInit {
}
}
})
// add initial keywords to badges

const missingPlaces = Object.keys(this.keywordsLinkedToExtents).filter(
(key) => !this.placeKeywords.some(({ key: id }) => key === id)
(key) => !placeKeywords.some(({ key: id }) => key === id)
)
console.log('missingPlaces', missingPlaces)

Expand All @@ -169,8 +198,9 @@ export class FormFieldSpatialExtentComponent implements OnInit {
this.keywordsLinkedToExtents[missingPlace].placeKeyword
)
})
}

// add initial places to map
handleLayersOnMap() {
Object.keys(this.keywordsLinkedToExtents).forEach((key) => {
if (
this.keywordsLinkedToExtents[key].spatialExtents?.geometries?.length >=
Expand All @@ -190,30 +220,9 @@ export class FormFieldSpatialExtentComponent implements OnInit {
)
}
})

// 1. itereate over keywordsLinkedToExtents
// 2. add keywords.key to list of displayed place keywords
// apply Rules -> check if description is undefined or URI -> "Unknown location" badge
// 3. check if geometry is available for keyword
// 4. if yes, add to map
// 5. if no, check if bbox is available
// 6. if yes, add to map
// 7. if no, do nothing?

// Questions:
// I will manage keywordsLinkedToExtents (adding / removing keywords and geoms)
// When will I emit updated values? add/remove
// Will I update the keywordsLinkedToExtents and then emit the values?
// Should keywordsLinkedToExtents be an Observable that should be listened to and then emit the values as Output?

// Rules
//when creating an extent from a place keyword, the keyword URI should be stored in the extent description; this way, when deleting a place keyword, its corresponding extent can also be removed from the record
// if an extent comes with a description that is a URI for which no keyword was found, a badge “Unknown location” appears below the keyword selector; this way, the extent can still be deleted
// if an extent comes with no description: same, an “Unknown location” badge appears
// if an extent comes with a description that is NOT a URI, the description is shown in the badge
}

bboxCoordsToGeometry(bbox: [number, number, number, number]): Feature {
bboxCoordsToGeometry(bbox: [number, number, number, number]): Geometry {
const geometry = new Polygon([
[
[bbox[2], bbox[3]],
Expand All @@ -223,25 +232,27 @@ export class FormFieldSpatialExtentComponent implements OnInit {
[bbox[2], bbox[3]],
],
])
return new Feature(geometry)

const geoJSONGeom = new GeoJSON().writeGeometryObject(geometry)
return geoJSONGeom
}

addToMap(key: string, geometry: Feature) {
addToMap(key: string, geometry: Geometry) {
const featureCollection: GeoJSONFeatureCollection = {
type: 'FeatureCollection',
features: [],
}
const geoJSONGeom = new GeoJSON().writeGeometryObject(
geometry.getGeometry()
)
// const geoJSONGeom = new GeoJSON().writeGeometryObject(
// geometry
// )

featureCollection.features.push({
type: 'Feature',
properties: { description: key },
geometry: geoJSONGeom,
geometry: geometry,
})

console.log('geoJSONGeom', geoJSONGeom)
// console.log('geoJSONGeom', geoJSONGeom)

this.mapFacade.addLayer({
type: MapContextLayerTypeEnum.GEOJSON,
Expand All @@ -255,7 +266,10 @@ export class FormFieldSpatialExtentComponent implements OnInit {
}

handlePlaceKeywordsChange(keywords: Keyword[]) {
// this.placeKeywords = keywords
console.log('placeKeywords', keywords)
this.keywordsLinkedToExtents = []
this.linkPlaceKeywordsToSpatialExtents(keywords, this.spatialExtents)

// add / remove layers
this.handleLayersOnMap()
}
}
15 changes: 8 additions & 7 deletions libs/feature/editor/src/lib/components/record-form/record-form.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
DatasetSpatialExtent,
Keyword,
} from '@geonetwork-ui/common/domain/model/record'
import { KeywordType } from '@geonetwork-ui/common/domain/model/thesaurus'

const DUMMY_DATA_PLACE_KEYWORDS = [
{
Expand All @@ -24,7 +25,7 @@ const DUMMY_DATA_PLACE_KEYWORDS = [
id: '1',
name: 'GEMET',
},
type: 'place',
type: 'place' as KeywordType,
coords: {
coordEast: '13.5',
coordNorth: '52.5',
Expand All @@ -39,7 +40,7 @@ const DUMMY_DATA_PLACE_KEYWORDS = [
id: '1',
name: 'GEMET',
},
type: 'place',
type: 'place' as KeywordType,
coords: {
coordEast: '10',
coordNorth: '53.5',
Expand All @@ -54,7 +55,7 @@ const DUMMY_DATA_PLACE_KEYWORDS = [
id: '1',
name: 'GEMET',
},
type: 'place',
type: 'place' as KeywordType,
coords: {
coordEast: '11.5',
coordNorth: '48.5',
Expand All @@ -67,19 +68,19 @@ const DUMMY_DATA_PLACE_KEYWORDS = [
const DUMMY_DATA_SPATIAL_EXTENTS = [
{
description: 'uri1',
bbox: [13.5, 52.5, 14.5, 53.5],
bbox: [13.5, 52.5, 14.5, 53.5] as [number, number, number, number],
},
{
description: 'uri2',
bbox: [10, 53.5, 11, 53.4],
bbox: [10, 53.5, 11, 53.4] as [number, number, number, number],
},
{
description: 'uri3',
bbox: [11.5, 48.5, 11.5, 48.3],
bbox: [11.5, 48.5, 11.5, 48.3] as [number, number, number, number],
},
{
description: 'URI-Paris',
bbox: [1, 2, 3, 4],
bbox: [1, 2, 3, 4] as [number, number, number, number],
},
]
@Component({
Expand Down

0 comments on commit 6a3915c

Please sign in to comment.