geonetwork-ui 2.11.0-dev.aed5b2e5b → 2.11.0-dev.b75ae786a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/fesm2022/geonetwork-ui.mjs +3219 -3235
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/index.d.ts +113 -83
- package/index.d.ts.map +1 -1
- package/package.json +2 -1
- package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts +120 -34
- package/src/libs/common/domain/src/lib/model/search/filter.model.ts +24 -2
- package/src/libs/feature/map/src/index.ts +0 -2
- package/src/libs/feature/map/src/lib/feature-map.module.ts +1 -8
- package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.ts +8 -3
- package/src/libs/feature/search/src/index.ts +2 -0
- package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.html +3 -0
- package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts +21 -4
- package/src/libs/feature/{map/src/lib → search/src/lib/geocoding}/geocoding.service.ts +16 -7
- package/src/libs/feature/search/src/lib/location-search/location-search.component.html +8 -0
- package/src/libs/feature/search/src/lib/location-search/location-search.component.ts +40 -0
- package/src/libs/feature/search/src/lib/search-filters-summary-item/search-filters-summary-item.component.ts +2 -0
- package/src/libs/feature/search/src/lib/state/reducer.ts +1 -4
- package/src/libs/feature/search/src/lib/utils/service/fields.service.ts +14 -2
- package/src/libs/feature/search/src/lib/utils/service/fields.ts +49 -5
- package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.ts +2 -1
- package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html +10 -1
- package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.ts +8 -0
- package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.html +7 -4
- package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.ts +12 -9
- package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.model.ts +2 -2
- package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.html +5 -11
- package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.ts +34 -4
- package/src/libs/ui/layout/src/lib/block-list/block-list.component.css +1 -0
- package/src/libs/ui/map/src/lib/components/map-container/map-container.component.ts +2 -0
- package/src/libs/util/app-config/src/lib/app-config.ts +20 -0
- package/src/libs/util/app-config/src/lib/fixtures.ts +16 -1
- package/src/libs/util/app-config/src/lib/model.ts +14 -1
- package/src/libs/util/shared/src/lib/links/link-utils.ts +19 -10
- package/src/libs/util/shared/src/lib/utils/geojson.ts +24 -0
- package/translations/de.json +10 -4
- package/translations/en.json +11 -5
- package/translations/es.json +10 -4
- package/translations/fr.json +11 -5
- package/translations/it.json +10 -4
- package/translations/nl.json +10 -4
- package/translations/pt.json +10 -4
- package/translations/sk.json +10 -4
- package/src/libs/feature/map/src/lib/geocoding/geocoding.component.css +0 -0
- package/src/libs/feature/map/src/lib/geocoding/geocoding.component.html +0 -41
- package/src/libs/feature/map/src/lib/geocoding/geocoding.component.ts +0 -112
- package/src/libs/feature/map/src/lib/style/index.ts +0 -2
- package/src/libs/feature/map/src/lib/style/map-style.fixtures.ts +0 -47
- package/src/libs/feature/map/src/lib/style/map-style.service.ts +0 -108
|
@@ -20,7 +20,11 @@ import {
|
|
|
20
20
|
isDateRange,
|
|
21
21
|
METADATA_LANGUAGE,
|
|
22
22
|
} from '../../../../../../../libs/api/repository/src'
|
|
23
|
-
import {
|
|
23
|
+
import {
|
|
24
|
+
BoundingBox,
|
|
25
|
+
formatUserInfo,
|
|
26
|
+
isBoundingBox,
|
|
27
|
+
} from '../../../../../../../libs/util/shared/src'
|
|
24
28
|
import { PossibleResourceTypes } from '../../../../../../../libs/api/metadata-converter/src'
|
|
25
29
|
|
|
26
30
|
export type FieldType = 'values' | 'dateRange' | 'spatialExtent'
|
|
@@ -431,16 +435,56 @@ export class DateRangeSearchField extends SimpleSearchField {
|
|
|
431
435
|
}
|
|
432
436
|
}
|
|
433
437
|
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
438
|
+
// treats a resource's creation/revision dates as an interval (its min and max), so a record matches
|
|
439
|
+
// when that interval intersects the filter range, not just when a single date falls inside it
|
|
440
|
+
export class ResourceCreationRevisionDateSearchField extends DateRangeSearchField {
|
|
441
|
+
constructor(injector: Injector, order: 'asc' | 'desc' = 'desc') {
|
|
442
|
+
super('resourceCreationRevisionDate', injector, order)
|
|
443
|
+
const dateSourceFields = [
|
|
444
|
+
'creationDateForResource',
|
|
445
|
+
'revisionDateForResource',
|
|
446
|
+
]
|
|
447
|
+
const collectSortedDates = dateSourceFields
|
|
448
|
+
.map(
|
|
449
|
+
(field) => `if (doc.containsKey('${field}')) {
|
|
450
|
+
for (def date : doc['${field}']) { dates.add(date.millis); }
|
|
451
|
+
}`
|
|
452
|
+
)
|
|
453
|
+
.join('\n')
|
|
454
|
+
|
|
455
|
+
this.esService.registerRuntimeField(
|
|
456
|
+
'resourceCreationRevisionDateMin',
|
|
457
|
+
`def dates = [];
|
|
458
|
+
${collectSortedDates}
|
|
459
|
+
if (dates.length > 0) { dates.sort(null); emit(dates[0]); }`,
|
|
460
|
+
'date'
|
|
461
|
+
)
|
|
462
|
+
this.esService.registerRuntimeField(
|
|
463
|
+
'resourceCreationRevisionDateMax',
|
|
464
|
+
`def dates = [];
|
|
465
|
+
${collectSortedDates}
|
|
466
|
+
if (dates.length > 0) { dates.sort(null); emit(dates[dates.length - 1]); }`,
|
|
467
|
+
'date'
|
|
468
|
+
)
|
|
437
469
|
}
|
|
470
|
+
}
|
|
438
471
|
|
|
472
|
+
export class BoundingBoxSearchField extends SimpleSearchField {
|
|
439
473
|
getAvailableValues(): Observable<FieldAvailableValue[]> {
|
|
440
|
-
// TODO: return an array of spatial extents to show which ones are available in the dropdown
|
|
441
474
|
return of([])
|
|
442
475
|
}
|
|
443
476
|
|
|
477
|
+
getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
|
|
478
|
+
return of({
|
|
479
|
+
[this.esFieldName]: values.map(Number) as BoundingBox,
|
|
480
|
+
})
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
|
|
484
|
+
const filter = filters[this.esFieldName]
|
|
485
|
+
return of(isBoundingBox(filter) ? filter : [])
|
|
486
|
+
}
|
|
487
|
+
|
|
444
488
|
getType(): FieldType {
|
|
445
489
|
return 'spatialExtent'
|
|
446
490
|
}
|
|
@@ -128,7 +128,8 @@ export class ServiceCapabilitiesComponent implements OnInit {
|
|
|
128
128
|
this.loading = true
|
|
129
129
|
this.availableLayers = await getLayers(
|
|
130
130
|
this.apiLinks[0].url.href,
|
|
131
|
-
this.apiLinks[0].accessServiceProtocol
|
|
131
|
+
this.apiLinks[0].accessServiceProtocol,
|
|
132
|
+
true
|
|
132
133
|
)
|
|
133
134
|
this.loading = false
|
|
134
135
|
this.cdr.detectChanges()
|
|
@@ -83,7 +83,16 @@
|
|
|
83
83
|
>
|
|
84
84
|
@for (suggestion of suggestions$ | async; track suggestion) {
|
|
85
85
|
<mat-option [value]="suggestion" class="p-2 suggestion text-start">
|
|
86
|
-
|
|
86
|
+
@if (displayWithTemplate) {
|
|
87
|
+
<ng-container
|
|
88
|
+
*ngTemplateOutlet="
|
|
89
|
+
displayWithTemplate;
|
|
90
|
+
context: { $implicit: suggestion }
|
|
91
|
+
"
|
|
92
|
+
></ng-container>
|
|
93
|
+
} @else {
|
|
94
|
+
{{ displayWithFnInternal(suggestion) }}
|
|
95
|
+
}
|
|
87
96
|
</mat-option>
|
|
88
97
|
}
|
|
89
98
|
</mat-autocomplete>
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
OnInit,
|
|
12
12
|
Output,
|
|
13
13
|
SimpleChanges,
|
|
14
|
+
TemplateRef,
|
|
14
15
|
ViewChild,
|
|
15
16
|
inject,
|
|
16
17
|
} from '@angular/core'
|
|
@@ -97,6 +98,13 @@ export class AutocompleteComponent
|
|
|
97
98
|
@ViewChild(MatAutocompleteTrigger) triggerRef: MatAutocompleteTrigger
|
|
98
99
|
@ViewChild(MatAutocomplete) autocomplete: MatAutocomplete
|
|
99
100
|
@ViewChild('searchInput') inputRef: ElementRef<HTMLInputElement>
|
|
101
|
+
/**
|
|
102
|
+
* Custom template to render each suggestion. Takes precedence over
|
|
103
|
+
* `displayWithFn` when set.
|
|
104
|
+
*/
|
|
105
|
+
@Input() displayWithTemplate?: TemplateRef<{
|
|
106
|
+
$implicit: AutocompleteItem
|
|
107
|
+
}>
|
|
100
108
|
|
|
101
109
|
searching: boolean
|
|
102
110
|
control = new UntypedFormControl()
|
|
@@ -20,10 +20,13 @@
|
|
|
20
20
|
</div>
|
|
21
21
|
}
|
|
22
22
|
</div>
|
|
23
|
-
<button
|
|
23
|
+
<button
|
|
24
|
+
class="h-6 w-6 flex items-center justify-center"
|
|
25
|
+
data-test="dropdown-clear"
|
|
26
|
+
>
|
|
24
27
|
@if (hasSelectedChoices && !overlayOpen) {
|
|
25
28
|
<ng-icon
|
|
26
|
-
class="shrink-0 opacity-40
|
|
29
|
+
class="shrink-0 opacity-40 hover:opacity-80 transition-colors clear-btn"
|
|
27
30
|
(click)="clearSelection($event)"
|
|
28
31
|
name="matClose"
|
|
29
32
|
></ng-icon>
|
|
@@ -61,13 +64,13 @@
|
|
|
61
64
|
#overlayContainer
|
|
62
65
|
>
|
|
63
66
|
<div
|
|
64
|
-
class="border border-gray-300 rounded mb-2 mx-2 min-h-[44px] flex flex-row gap-
|
|
67
|
+
class="border border-gray-300 rounded mb-2 mx-2 min-h-[44px] flex flex-row gap-1 flex-wrap p-2 focus-within:rounded focus-within:border-2 focus-within:border-primary"
|
|
65
68
|
>
|
|
66
69
|
@for (selected of selectedChoices; track selected) {
|
|
67
70
|
<button
|
|
68
71
|
type="button"
|
|
69
72
|
[title]="selected.label"
|
|
70
|
-
class="max-w-full bg-main text-white rounded pr-[7px] flex gap-1 items-center opacity-70 hover:opacity-100 focus:opacity-100 transition-opacity
|
|
73
|
+
class="max-w-full bg-main text-white rounded pr-[7px] flex gap-1 items-center opacity-70 hover:opacity-100 focus:opacity-100 transition-opacity"
|
|
71
74
|
(click)="select(selected, false)"
|
|
72
75
|
>
|
|
73
76
|
<div class="text-sm truncate leading-[26px] px-2">
|
|
@@ -24,7 +24,7 @@ import {
|
|
|
24
24
|
propagateToDocumentOnly,
|
|
25
25
|
} from '../../../../../../libs/util/shared/src'
|
|
26
26
|
import { ButtonComponent } from '../button/button.component'
|
|
27
|
-
import { NgIcon, provideIcons } from '@ng-icons/core'
|
|
27
|
+
import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
|
|
28
28
|
import { FormsModule } from '@angular/forms'
|
|
29
29
|
import { TranslatePipe } from '@ngx-translate/core'
|
|
30
30
|
|
|
@@ -46,19 +46,22 @@ import {
|
|
|
46
46
|
matExpandMore,
|
|
47
47
|
matExpandLess,
|
|
48
48
|
}),
|
|
49
|
+
provideNgIconsConfig({
|
|
50
|
+
size: '1.5rem',
|
|
51
|
+
}),
|
|
49
52
|
],
|
|
50
53
|
standalone: true,
|
|
51
54
|
})
|
|
52
|
-
export class DropdownMultiselectComponent {
|
|
55
|
+
export class DropdownMultiselectComponent<T = unknown> {
|
|
53
56
|
private scrollStrategies = inject(ScrollStrategyOptions)
|
|
54
57
|
|
|
55
58
|
@Input() title: string
|
|
56
|
-
@Input() choices: Choice[]
|
|
57
|
-
@Input() selected:
|
|
59
|
+
@Input() choices: Choice<T>[]
|
|
60
|
+
@Input() selected: T[] = []
|
|
58
61
|
@Input() allowSearch = true
|
|
59
62
|
@Input() maxRows: number
|
|
60
63
|
@Input() searchInputValue = ''
|
|
61
|
-
@Output() selectValues = new EventEmitter<
|
|
64
|
+
@Output() selectValues = new EventEmitter<T[]>()
|
|
62
65
|
@ViewChild('overlayOrigin') overlayOrigin: CdkOverlayOrigin
|
|
63
66
|
@ViewChild(CdkConnectedOverlay) overlay: CdkConnectedOverlay
|
|
64
67
|
@ViewChild('overlayContainer', { read: ElementRef })
|
|
@@ -115,7 +118,7 @@ export class DropdownMultiselectComponent {
|
|
|
115
118
|
|
|
116
119
|
private setFocus() {
|
|
117
120
|
setTimeout(() => {
|
|
118
|
-
this.searchFieldInput
|
|
121
|
+
this.searchFieldInput?.nativeElement.focus()
|
|
119
122
|
}, 0)
|
|
120
123
|
}
|
|
121
124
|
|
|
@@ -194,18 +197,18 @@ export class DropdownMultiselectComponent {
|
|
|
194
197
|
this.checkboxes.get(newIndex).nativeElement.focus()
|
|
195
198
|
}
|
|
196
199
|
|
|
197
|
-
isSelected(choice: Choice) {
|
|
200
|
+
isSelected(choice: Choice<T>) {
|
|
198
201
|
return this.selected.indexOf(choice.value) > -1
|
|
199
202
|
}
|
|
200
203
|
|
|
201
|
-
select(choice: Choice
|
|
204
|
+
select(choice: Choice<T>, selected: boolean) {
|
|
202
205
|
this.selected = selected
|
|
203
206
|
? [...this.selected.filter((v) => v !== choice.value), choice.value]
|
|
204
207
|
: this.selected.filter((v) => v !== choice.value)
|
|
205
208
|
this.selectValues.emit(this.selected)
|
|
206
209
|
}
|
|
207
210
|
|
|
208
|
-
toggle(choice: Choice) {
|
|
211
|
+
toggle(choice: Choice<T>) {
|
|
209
212
|
this.select(choice, !this.isSelected(choice))
|
|
210
213
|
}
|
|
211
214
|
|
package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.html
CHANGED
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
[class]="
|
|
59
59
|
(hasSelection
|
|
60
60
|
? 'border-b-[1px] border-gray-400 pb-[20px]'
|
|
61
|
-
: 'pb-[
|
|
61
|
+
: 'pb-[12px]') + ' text-black'
|
|
62
62
|
"
|
|
63
63
|
>
|
|
64
64
|
<gn-ui-drag-and-drop-file-input
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
[showFileName]="false"
|
|
69
69
|
textClass="text-black truncate"
|
|
70
70
|
dropzoneBackgroundColor="transparent"
|
|
71
|
-
icon="
|
|
71
|
+
icon="iconoirUpload"
|
|
72
72
|
extraClass="gn-ui-gray-outline-input w-full !h-[32px] px-[8px] py-[4px] justify-between"
|
|
73
73
|
(fileChange)="handleFileSelected($event)"
|
|
74
74
|
(errorChange)="handleFileError($event)"
|
|
@@ -79,11 +79,7 @@
|
|
|
79
79
|
@if (hasSelection) {
|
|
80
80
|
<gn-ui-button
|
|
81
81
|
[type]="'primary-light'"
|
|
82
|
-
[title]="
|
|
83
|
-
('search.filters.spatialExtent.bboxDelete' | translate) +
|
|
84
|
-
' ' +
|
|
85
|
-
fileName
|
|
86
|
-
"
|
|
82
|
+
[title]="selectionDeleteLabelKey | translate: selectionLabelParams"
|
|
87
83
|
(buttonClick)="removeSelection($event)"
|
|
88
84
|
extraClass="group gap-x-2 w-full h-[28px] px-[8px] py-[4px] mb-[12px] bg-primary-lighter text-white"
|
|
89
85
|
data-test="spatial-extent-selected-item"
|
|
@@ -94,12 +90,10 @@
|
|
|
94
90
|
size="15px"
|
|
95
91
|
></ng-icon>
|
|
96
92
|
<span class="group-hover:hidden truncate text-sm m-auto">
|
|
97
|
-
{{
|
|
98
|
-
{{ fileName }}
|
|
93
|
+
{{ selectionLabelKey | translate: selectionLabelParams }}
|
|
99
94
|
</span>
|
|
100
95
|
<span class="hidden group-hover:block truncate text-sm m-auto">
|
|
101
|
-
{{
|
|
102
|
-
{{ fileName }}
|
|
96
|
+
{{ selectionDeleteLabelKey | translate: selectionLabelParams }}
|
|
103
97
|
</span>
|
|
104
98
|
<ng-icon
|
|
105
99
|
name="iconoirCheckCircle"
|
package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.ts
CHANGED
|
@@ -20,9 +20,9 @@ import { ButtonComponent } from '../button/button.component'
|
|
|
20
20
|
import { NgIcon, provideIcons } from '@ng-icons/core'
|
|
21
21
|
import {
|
|
22
22
|
iconoirCheckCircle,
|
|
23
|
-
iconoirImport,
|
|
24
23
|
iconoirSquareDashed,
|
|
25
24
|
iconoirTrash,
|
|
25
|
+
iconoirUpload,
|
|
26
26
|
} from '@ng-icons/iconoir'
|
|
27
27
|
import {
|
|
28
28
|
matClose,
|
|
@@ -35,6 +35,7 @@ import {
|
|
|
35
35
|
BoundingBox,
|
|
36
36
|
getGeometryBoundingBox,
|
|
37
37
|
getGeometryFromGeoJSON,
|
|
38
|
+
isBoundingBoxWithinWorldExtent,
|
|
38
39
|
propagateToDocumentOnly,
|
|
39
40
|
readFileAsText,
|
|
40
41
|
} from '../../../../../../libs/util/shared/src'
|
|
@@ -46,13 +47,21 @@ import {
|
|
|
46
47
|
marker('search.filters.spatialExtent.import')
|
|
47
48
|
marker('search.filters.spatialExtent.helpText')
|
|
48
49
|
marker('search.filters.spatialExtent.error.title')
|
|
49
|
-
marker('search.filters.spatialExtent.
|
|
50
|
+
marker('search.filters.spatialExtent.error.outOfBounds')
|
|
51
|
+
|
|
52
|
+
const LABEL_FROM_FILE = marker('search.filters.spatialExtent.bboxFromFile')
|
|
53
|
+
const LABEL_FROM_FILE_DELETE = marker(
|
|
54
|
+
'search.filters.spatialExtent.bboxFromFileDelete'
|
|
55
|
+
)
|
|
56
|
+
const LABEL_INITIAL = marker('search.filters.spatialExtent.bboxInitial')
|
|
57
|
+
const LABEL_INITIAL_DELETE = marker(
|
|
58
|
+
'search.filters.spatialExtent.bboxInitialDelete'
|
|
59
|
+
)
|
|
50
60
|
|
|
51
61
|
export interface SpatialExtentDropdownError {
|
|
52
62
|
key: string
|
|
53
63
|
params?: Record<string, string | number>
|
|
54
64
|
}
|
|
55
|
-
marker('search.filters.spatialExtent.bboxDelete')
|
|
56
65
|
|
|
57
66
|
@Component({
|
|
58
67
|
selector: 'gn-ui-spatial-extent-dropdown',
|
|
@@ -67,9 +76,9 @@ marker('search.filters.spatialExtent.bboxDelete')
|
|
|
67
76
|
providers: [
|
|
68
77
|
provideIcons({
|
|
69
78
|
iconoirCheckCircle,
|
|
70
|
-
iconoirImport,
|
|
71
79
|
iconoirSquareDashed,
|
|
72
80
|
iconoirTrash,
|
|
81
|
+
iconoirUpload,
|
|
73
82
|
matClose,
|
|
74
83
|
matExpandLess,
|
|
75
84
|
matExpandMore,
|
|
@@ -85,6 +94,11 @@ export class SpatialExtentDropdownComponent {
|
|
|
85
94
|
|
|
86
95
|
@Input() title: string
|
|
87
96
|
@Input() maxFileSizeMb: number | null = null
|
|
97
|
+
@Input() set initialBbox(value: BoundingBox | null) {
|
|
98
|
+
if (!this.bbox && value) {
|
|
99
|
+
this.bbox = value
|
|
100
|
+
}
|
|
101
|
+
}
|
|
88
102
|
|
|
89
103
|
@Output() bboxChange = new EventEmitter<BoundingBox | null>()
|
|
90
104
|
@Output() errorChange = new EventEmitter<SpatialExtentDropdownError>()
|
|
@@ -123,6 +137,18 @@ export class SpatialExtentDropdownComponent {
|
|
|
123
137
|
return !!this.bbox
|
|
124
138
|
}
|
|
125
139
|
|
|
140
|
+
get selectionLabelKey() {
|
|
141
|
+
return this.fileName ? LABEL_FROM_FILE : LABEL_INITIAL
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
get selectionDeleteLabelKey() {
|
|
145
|
+
return this.fileName ? LABEL_FROM_FILE_DELETE : LABEL_INITIAL_DELETE
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
get selectionLabelParams() {
|
|
149
|
+
return { fileName: this.fileName }
|
|
150
|
+
}
|
|
151
|
+
|
|
126
152
|
openOverlay() {
|
|
127
153
|
this.overlayMinWidth =
|
|
128
154
|
this.overlayOrigin.elementRef.nativeElement.getBoundingClientRect()
|
|
@@ -154,6 +180,10 @@ export class SpatialExtentDropdownComponent {
|
|
|
154
180
|
return
|
|
155
181
|
}
|
|
156
182
|
const bbox = getGeometryBoundingBox(geometry)
|
|
183
|
+
if (!isBoundingBoxWithinWorldExtent(bbox)) {
|
|
184
|
+
this.setError(marker('search.filters.spatialExtent.error.outOfBounds'))
|
|
185
|
+
return
|
|
186
|
+
}
|
|
157
187
|
this.bbox = bbox
|
|
158
188
|
this.fileName = file.name
|
|
159
189
|
this.bboxChange.emit(bbox)
|
|
@@ -58,6 +58,8 @@ import { transformExtent } from 'ol/proj.js'
|
|
|
58
58
|
export const DEFAULT_BASEMAP_LAYER: MapContextLayerMapLibreStyle = {
|
|
59
59
|
type: 'maplibre-style',
|
|
60
60
|
styleUrl: `https://basemaps.cartocdn.com/gl/positron-gl-style/style.json`,
|
|
61
|
+
clickable: false,
|
|
62
|
+
hoverable: false,
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
const DEFAULT_VIEW: MapContextView = {
|
|
@@ -253,6 +253,8 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
|
|
|
253
253
|
'advanced_filters',
|
|
254
254
|
'limit',
|
|
255
255
|
'spatial_extent_max_file_size',
|
|
256
|
+
'geocoding_provider',
|
|
257
|
+
'geocoding_provider_options',
|
|
256
258
|
],
|
|
257
259
|
warnings,
|
|
258
260
|
errors
|
|
@@ -265,6 +267,14 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
|
|
|
265
267
|
warnings,
|
|
266
268
|
errors
|
|
267
269
|
)
|
|
270
|
+
const parsedCustomFilters = parseMultiConfigSection(
|
|
271
|
+
parsed,
|
|
272
|
+
'custom_filter',
|
|
273
|
+
['name', 'base_filter'],
|
|
274
|
+
['exclude_values', 'include_values', 'label_key'],
|
|
275
|
+
warnings,
|
|
276
|
+
errors
|
|
277
|
+
)
|
|
268
278
|
searchConfig =
|
|
269
279
|
parsedSearchSection === null
|
|
270
280
|
? null
|
|
@@ -281,9 +291,19 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
|
|
|
281
291
|
filters: param.filters,
|
|
282
292
|
})),
|
|
283
293
|
ADVANCED_FILTERS: parsedSearchSection.advanced_filters,
|
|
294
|
+
CUSTOM_FILTERS: parsedCustomFilters.map((customFilter) => ({
|
|
295
|
+
name: customFilter.name,
|
|
296
|
+
baseFilter: customFilter.base_filter,
|
|
297
|
+
excludeValues: customFilter.exclude_values,
|
|
298
|
+
includeValues: customFilter.include_values,
|
|
299
|
+
labelKey: customFilter.label_key,
|
|
300
|
+
})),
|
|
284
301
|
LIMIT: parsedSearchSection.limit,
|
|
285
302
|
SPATIAL_EXTENT_MAX_FILE_SIZE:
|
|
286
303
|
parsedSearchSection.spatial_extent_max_file_size,
|
|
304
|
+
GEOCODING_PROVIDER: parsedSearchSection.geocoding_provider,
|
|
305
|
+
GEOCODING_PROVIDER_OPTIONS:
|
|
306
|
+
parsedSearchSection.geocoding_provider_options,
|
|
287
307
|
} as SearchConfig)
|
|
288
308
|
|
|
289
309
|
const parsedMetadataQualitySection = parseConfigSection(
|
|
@@ -41,7 +41,22 @@ fonts_stylesheet_url = "https://fonts.googleapis.com/css2?family=Open+Sans"
|
|
|
41
41
|
record_kind_quick_filter = false
|
|
42
42
|
filter_geometry_url = 'https://my.domain.org/geom.json'
|
|
43
43
|
do_not_use_default_search_preset = false
|
|
44
|
-
|
|
44
|
+
geocoding_provider = "geoplateforme"
|
|
45
|
+
geocoding_provider_options.category = "administratif"
|
|
46
|
+
geocoding_provider_options.limit = 5
|
|
47
|
+
advanced_filters = ['publicationYear', 'documentStandard', 'inspireKeyword', 'topic', 'license', 'myOrg:firstCustomFilter', 'myOrg:secondCustomFilter']
|
|
48
|
+
|
|
49
|
+
[[custom_filter]]
|
|
50
|
+
name = 'myOrg:firstCustomFilter'
|
|
51
|
+
base_filter = 'keyword'
|
|
52
|
+
exclude_values = ['my keyword 1', 'my keyword 2']
|
|
53
|
+
label_key = 'myOrg.firstCustomFilter'
|
|
54
|
+
|
|
55
|
+
[[custom_filter]]
|
|
56
|
+
name = 'myOrg:secondCustomFilter'
|
|
57
|
+
base_filter = 'keyword'
|
|
58
|
+
include_values = ['my keyword 3', 'my keyword 4']
|
|
59
|
+
label_key = 'myOrg.secondCustomFilter'
|
|
45
60
|
|
|
46
61
|
[[search_preset]]
|
|
47
62
|
sort = "-createDate"
|
|
@@ -55,15 +55,28 @@ export interface SearchPreset {
|
|
|
55
55
|
filters: Record<string, string[] | string>
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
+
export type GeocodingProviderName = 'geoadmin' | 'geonames' | 'geoplateforme'
|
|
59
|
+
|
|
60
|
+
export interface CustomSearchFilterField {
|
|
61
|
+
name: string
|
|
62
|
+
baseFilter: string
|
|
63
|
+
excludeValues?: string[]
|
|
64
|
+
includeValues?: string[]
|
|
65
|
+
labelKey?: string
|
|
66
|
+
}
|
|
67
|
+
|
|
58
68
|
export interface SearchConfig {
|
|
59
69
|
RECORD_KIND_QUICK_FILTER?: boolean
|
|
60
70
|
FILTER_GEOMETRY_URL?: string
|
|
61
71
|
FILTER_GEOMETRY_DATA?: string
|
|
62
72
|
DO_NOT_USE_DEFAULT_SEARCH_PRESET?: boolean
|
|
63
73
|
SEARCH_PRESET?: SearchPreset[]
|
|
64
|
-
ADVANCED_FILTERS?: []
|
|
74
|
+
ADVANCED_FILTERS?: string[]
|
|
75
|
+
CUSTOM_FILTERS?: CustomSearchFilterField[]
|
|
65
76
|
LIMIT?: number
|
|
66
77
|
SPATIAL_EXTENT_MAX_FILE_SIZE?: number
|
|
78
|
+
GEOCODING_PROVIDER?: GeocodingProviderName
|
|
79
|
+
GEOCODING_PROVIDER_OPTIONS?: Record<string, string | number>
|
|
67
80
|
}
|
|
68
81
|
|
|
69
82
|
export interface MetadataQualityConfig {
|
|
@@ -344,7 +344,11 @@ export function getLinkLabel(
|
|
|
344
344
|
return format ? `${label} (${format})` : label
|
|
345
345
|
}
|
|
346
346
|
|
|
347
|
-
export async function getLayers(
|
|
347
|
+
export async function getLayers(
|
|
348
|
+
url: string,
|
|
349
|
+
serviceProtocol: ServiceProtocol,
|
|
350
|
+
deep = false
|
|
351
|
+
) {
|
|
348
352
|
switch (serviceProtocol) {
|
|
349
353
|
case 'ogcFeatures': {
|
|
350
354
|
const layers = await new OgcApiEndpoint(url).allCollections
|
|
@@ -352,7 +356,10 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
|
|
|
352
356
|
}
|
|
353
357
|
case 'wfs': {
|
|
354
358
|
const endpointWfs = await new WfsEndpoint(url).isReady()
|
|
355
|
-
const featureTypes =
|
|
359
|
+
const featureTypes = endpointWfs.getFeatureTypes()
|
|
360
|
+
if (!deep) {
|
|
361
|
+
return featureTypes
|
|
362
|
+
}
|
|
356
363
|
const layers = (
|
|
357
364
|
await Promise.allSettled(
|
|
358
365
|
featureTypes.map((collection) => {
|
|
@@ -366,14 +373,16 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
|
|
|
366
373
|
}
|
|
367
374
|
case 'wms': {
|
|
368
375
|
const endpointWms = await new WmsEndpoint(url).isReady()
|
|
369
|
-
const
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
376
|
+
const layersSummary = endpointWms
|
|
377
|
+
.getLayers()
|
|
378
|
+
.flatMap(wmsLayerFlatten)
|
|
379
|
+
.filter((l) => l.name)
|
|
380
|
+
if (!deep) {
|
|
381
|
+
return layersSummary
|
|
382
|
+
}
|
|
383
|
+
const layers = layersSummary.map((collection) =>
|
|
384
|
+
endpointWms.getLayerByName(collection.name)
|
|
385
|
+
)
|
|
377
386
|
return layers
|
|
378
387
|
}
|
|
379
388
|
case 'wmts': {
|
|
@@ -38,6 +38,30 @@ export function getGeometryFromGeoJSON(
|
|
|
38
38
|
// FIXME: this type should be more generic across the project
|
|
39
39
|
export type BoundingBox = [number, number, number, number]
|
|
40
40
|
|
|
41
|
+
export function isBoundingBox(value: unknown): value is BoundingBox {
|
|
42
|
+
return (
|
|
43
|
+
Array.isArray(value) &&
|
|
44
|
+
value.length === 4 &&
|
|
45
|
+
value.every((item) => typeof item === 'number')
|
|
46
|
+
)
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Checks that a bounding box's coordinates stay within the valid
|
|
51
|
+
* longitude (-180/180) and latitude (-90/90) ranges.
|
|
52
|
+
*/
|
|
53
|
+
export function isBoundingBoxWithinWorldExtent(bbox: BoundingBox): boolean {
|
|
54
|
+
const [minX, minY, maxX, maxY] = bbox
|
|
55
|
+
return (
|
|
56
|
+
minX >= -180 &&
|
|
57
|
+
maxX <= 180 &&
|
|
58
|
+
minY >= -90 &&
|
|
59
|
+
maxY <= 90 &&
|
|
60
|
+
minX <= maxX &&
|
|
61
|
+
minY <= maxY
|
|
62
|
+
)
|
|
63
|
+
}
|
|
64
|
+
|
|
41
65
|
export function getGeometryBoundingBox(geometry: Geometry): BoundingBox {
|
|
42
66
|
// use the bounding box if specified in the GeoJSON object
|
|
43
67
|
if (geometry.bbox) {
|
package/translations/de.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "Aus WMS",
|
|
426
426
|
"map.addFromFile.placeholder": "Klicke hier oder ziehe eine Datei herein",
|
|
427
427
|
"map.dropdown.placeholder": "Kein Vorschaulayer verfügbar",
|
|
428
|
-
"map.geocoding.placeholder": "Nach einem Ort suchen",
|
|
429
428
|
"map.help.addFromFile": "Klicke oder ziehe eine Datei herein um eine Karte hinzuzufügen (momentan wird nur das GeoJSON-Format unterstützt).",
|
|
430
429
|
"map.layer.add": "Hinzufügen",
|
|
431
430
|
"map.layers.available": "Verfügbare Layer",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "Wiederverwendungen",
|
|
691
690
|
"search.filters.recordKind.service": "Dienste",
|
|
692
691
|
"search.filters.representationType": "Repräsentationstyp",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "Ressourcendatum",
|
|
693
693
|
"search.filters.resourceType": "Ressourcentyp",
|
|
694
|
-
"search.filters.spatialExtent": "",
|
|
695
|
-
"search.filters.spatialExtent.
|
|
696
|
-
"search.filters.spatialExtent.
|
|
694
|
+
"search.filters.spatialExtent.bboxFromFile": "",
|
|
695
|
+
"search.filters.spatialExtent.bboxFromFileDelete": "",
|
|
696
|
+
"search.filters.spatialExtent.bboxInitial": "",
|
|
697
|
+
"search.filters.spatialExtent.bboxInitialDelete": "",
|
|
697
698
|
"search.filters.spatialExtent.error.fileTooLarge": "",
|
|
698
699
|
"search.filters.spatialExtent.error.invalidFormat": "",
|
|
699
700
|
"search.filters.spatialExtent.error.noGeometry": "",
|
|
701
|
+
"search.filters.spatialExtent.error.outOfBounds": "",
|
|
700
702
|
"search.filters.spatialExtent.error.title": "",
|
|
703
|
+
"search.filters.spatialExtent": "",
|
|
701
704
|
"search.filters.spatialExtent.helpText": "",
|
|
702
705
|
"search.filters.spatialExtent.import": "",
|
|
703
706
|
"search.filters.standard": "Standard",
|
|
704
707
|
"search.filters.summaryLabel.changeDate": "Geändert am: ",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "Ressourcendatum: ",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "Zeitlicher Umfang: ",
|
|
705
710
|
"search.filters.summaryLabel.user": "Geändert von: ",
|
|
711
|
+
"search.filters.temporalExtent": "Zeitlicher Umfang",
|
|
706
712
|
"search.filters.title": "Ergebnisse filtern",
|
|
707
713
|
"search.filters.topic": "Themen",
|
|
708
714
|
"search.filters.useSpatialFilter": "Zuerst Ressourcen im Interessenbereich anzeigen",
|
package/translations/en.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "From WMS",
|
|
426
426
|
"map.addFromFile.placeholder": "Click or drop a file here",
|
|
427
427
|
"map.dropdown.placeholder": "No preview layer available",
|
|
428
|
-
"map.geocoding.placeholder": "Search for a place",
|
|
429
428
|
"map.help.addFromFile": "Click or drag and drop a file to add to the map (currently supports GeoJSON format only).",
|
|
430
429
|
"map.layer.add": "Add",
|
|
431
430
|
"map.layers.available": "Available Layers",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "Reuses",
|
|
691
690
|
"search.filters.recordKind.service": "Services",
|
|
692
691
|
"search.filters.representationType": "Representation type",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "Resource date",
|
|
693
693
|
"search.filters.resourceType": "Resource type",
|
|
694
|
-
"search.filters.spatialExtent": "
|
|
695
|
-
"search.filters.spatialExtent.
|
|
696
|
-
"search.filters.spatialExtent.
|
|
694
|
+
"search.filters.spatialExtent.bboxFromFile": "Extent from {fileName}",
|
|
695
|
+
"search.filters.spatialExtent.bboxFromFileDelete": "Delete {fileName}",
|
|
696
|
+
"search.filters.spatialExtent.bboxInitial": "Pre-selected extent",
|
|
697
|
+
"search.filters.spatialExtent.bboxInitialDelete": "Delete selection",
|
|
697
698
|
"search.filters.spatialExtent.error.fileTooLarge": "The file exceeds the maximum allowed size ({maxSize} MB)",
|
|
698
699
|
"search.filters.spatialExtent.error.invalidFormat": "The file could not be read as a valid GeoJSON",
|
|
699
700
|
"search.filters.spatialExtent.error.noGeometry": "No geometry could be found in the file",
|
|
701
|
+
"search.filters.spatialExtent.error.outOfBounds": "The geometry of the GeoJSON file is not compliant; either some coordinates are out of bounds ([-180, 180] for longitude and [-90, 90] for latitude), or the file uses projected coordinates instead of longitude and latitude",
|
|
700
702
|
"search.filters.spatialExtent.error.title": "GeoJSON import error",
|
|
701
|
-
"search.filters.spatialExtent
|
|
703
|
+
"search.filters.spatialExtent": "Spatial extent",
|
|
704
|
+
"search.filters.spatialExtent.helpText": "The extent of the selected geometry will be used",
|
|
702
705
|
"search.filters.spatialExtent.import": "Import a GeoJSON",
|
|
703
706
|
"search.filters.standard": "Standard",
|
|
704
707
|
"search.filters.summaryLabel.changeDate": "Updated: ",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "Resource date: ",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "Temporal extent: ",
|
|
705
710
|
"search.filters.summaryLabel.user": "Editor: ",
|
|
711
|
+
"search.filters.temporalExtent": "Temporal extent",
|
|
706
712
|
"search.filters.title": "Filter your results",
|
|
707
713
|
"search.filters.topic": "Topics",
|
|
708
714
|
"search.filters.useSpatialFilter": "Show records in the area of interest first",
|