geonetwork-ui 2.1.0 → 2.2.0-dev.0eef2738
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/esm2022/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.mjs +2 -1
- package/esm2022/libs/api/repository/src/index.mjs +2 -1
- package/esm2022/libs/feature/auth/src/lib/feature-auth.module.mjs +2 -2
- package/esm2022/libs/feature/catalog/src/lib/feature-catalog.module.mjs +2 -2
- package/esm2022/libs/feature/catalog/src/lib/organisations/organisations.component.mjs +4 -15
- package/esm2022/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.mjs +1 -1
- package/esm2022/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.mjs +106 -0
- package/esm2022/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.mjs +64 -0
- package/esm2022/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.mjs +63 -0
- package/esm2022/libs/feature/map/src/lib/feature-map.module.mjs +11 -2
- package/esm2022/libs/feature/map/src/lib/layers-panel/layers-panel.component.mjs +6 -3
- package/esm2022/libs/feature/map/src/lib/map-context/map-context.service.mjs +3 -1
- package/esm2022/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.mjs +9 -6
- package/esm2022/libs/feature/search/src/lib/feature-search.module.mjs +2 -2
- package/esm2022/libs/feature/search/src/lib/results-list/results-list.container.component.mjs +1 -1
- package/esm2022/libs/feature/search/src/lib/state/effects.mjs +3 -3
- package/esm2022/libs/feature/search/src/lib/utils/service/fields.mjs +2 -2
- package/esm2022/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.mjs +4 -4
- package/esm2022/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.mjs +1 -1
- package/esm2022/libs/ui/elements/src/index.mjs +3 -1
- package/esm2022/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.mjs +27 -0
- package/esm2022/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.mjs +17 -0
- package/esm2022/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.mjs +10 -3
- package/esm2022/libs/ui/elements/src/lib/metadata-info/metadata-info.component.mjs +12 -6
- package/esm2022/libs/ui/elements/src/lib/related-record-card/related-record-card.component.mjs +3 -3
- package/esm2022/libs/ui/elements/src/lib/thumbnail/thumbnail.component.mjs +7 -3
- package/esm2022/libs/ui/elements/src/lib/ui-elements.module.mjs +13 -3
- package/esm2022/libs/ui/inputs/src/lib/button/button.component.mjs +19 -40
- package/esm2022/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.mjs +6 -3
- package/esm2022/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.mjs +3 -3
- package/esm2022/libs/ui/inputs/src/lib/star-toggle/star-toggle.component.mjs +2 -2
- package/esm2022/libs/ui/layout/src/lib/carousel/carousel.component.mjs +2 -2
- package/esm2022/libs/ui/search/src/lib/record-preview-card/record-preview-card.component.mjs +1 -1
- package/esm2022/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.mjs +1 -1
- package/esm2022/libs/ui/search/src/lib/record-preview-list/record-preview-list.component.mjs +1 -1
- package/esm2022/libs/ui/search/src/lib/record-preview-row/record-preview-row.component.mjs +1 -1
- package/esm2022/libs/ui/search/src/lib/record-preview-title/record-preview-title.component.mjs +1 -1
- package/esm2022/libs/util/app-config/src/lib/app-config.mjs +5 -1
- package/esm2022/libs/util/app-config/src/lib/model.mjs +1 -1
- package/esm2022/libs/util/i18n/src/index.mjs +2 -1
- package/esm2022/libs/util/shared/src/lib/services/theme.service.mjs +8 -1
- package/esm2022/libs/util/shared/src/lib/utils/fuzzy-filter.mjs +27 -0
- package/esm2022/libs/util/shared/src/lib/utils/index.mjs +2 -1
- package/esm2022/translations/de.json +101 -84
- package/esm2022/translations/en.json +39 -22
- package/esm2022/translations/es.json +17 -0
- package/esm2022/translations/fr.json +25 -8
- package/esm2022/translations/it.json +26 -6
- package/esm2022/translations/nl.json +17 -0
- package/esm2022/translations/pt.json +17 -0
- package/fesm2022/geonetwork-ui.mjs +634 -233
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.d.ts.map +1 -1
- package/libs/api/repository/src/index.d.ts +1 -0
- package/libs/api/repository/src/index.d.ts.map +1 -1
- package/libs/feature/catalog/src/lib/organisations/organisations.component.d.ts +0 -1
- package/libs/feature/catalog/src/lib/organisations/organisations.component.d.ts.map +1 -1
- package/libs/feature/dataviz/src/lib/chart-view/chart-view.component.d.ts +2 -2
- package/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.d.ts +22 -0
- package/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.d.ts.map +1 -0
- package/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.d.ts +22 -0
- package/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.d.ts.map +1 -0
- package/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.d.ts +22 -0
- package/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.d.ts.map +1 -0
- package/libs/feature/map/src/lib/feature-map.module.d.ts +15 -12
- package/libs/feature/map/src/lib/feature-map.module.d.ts.map +1 -1
- package/libs/feature/map/src/lib/map-context/map-context.service.d.ts +1 -0
- package/libs/feature/map/src/lib/map-context/map-context.service.d.ts.map +1 -1
- package/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.d.ts +3 -2
- package/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.d.ts.map +1 -1
- package/libs/feature/search/src/lib/state/effects.d.ts +1 -1
- package/libs/feature/search/src/lib/state/effects.d.ts.map +1 -1
- package/libs/feature/search/src/lib/utils/service/fields.d.ts +1 -1
- package/libs/feature/search/src/lib/utils/service/fields.d.ts.map +1 -1
- package/libs/ui/dataviz/src/lib/chart/chart.component.d.ts +1 -1
- package/libs/ui/elements/src/index.d.ts +2 -0
- package/libs/ui/elements/src/index.d.ts.map +1 -1
- package/libs/ui/elements/src/lib/downloads-list/downloads-list.component.d.ts +1 -1
- package/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.d.ts +10 -0
- package/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.d.ts.map +1 -0
- package/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.d.ts +8 -0
- package/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.d.ts.map +1 -0
- package/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.d.ts +1 -0
- package/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.d.ts.map +1 -1
- package/libs/ui/elements/src/lib/metadata-info/metadata-info.component.d.ts +1 -0
- package/libs/ui/elements/src/lib/metadata-info/metadata-info.component.d.ts.map +1 -1
- package/libs/ui/elements/src/lib/thumbnail/thumbnail.component.d.ts +3 -2
- package/libs/ui/elements/src/lib/thumbnail/thumbnail.component.d.ts.map +1 -1
- package/libs/ui/elements/src/lib/ui-elements.module.d.ts +13 -11
- package/libs/ui/elements/src/lib/ui-elements.module.d.ts.map +1 -1
- package/libs/ui/inputs/src/lib/button/button.component.d.ts +2 -4
- package/libs/ui/inputs/src/lib/button/button.component.d.ts.map +1 -1
- package/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.d.ts.map +1 -1
- package/libs/ui/inputs/src/lib/form-field/form-field.component.d.ts +1 -1
- package/libs/util/app-config/src/lib/app-config.d.ts.map +1 -1
- package/libs/util/app-config/src/lib/model.d.ts +2 -0
- package/libs/util/app-config/src/lib/model.d.ts.map +1 -1
- package/libs/util/i18n/src/index.d.ts +1 -0
- package/libs/util/i18n/src/index.d.ts.map +1 -1
- package/libs/util/shared/src/lib/services/theme.service.d.ts +1 -0
- package/libs/util/shared/src/lib/services/theme.service.d.ts.map +1 -1
- package/libs/util/shared/src/lib/utils/fuzzy-filter.d.ts +9 -0
- package/libs/util/shared/src/lib/utils/fuzzy-filter.d.ts.map +1 -0
- package/libs/util/shared/src/lib/utils/index.d.ts +1 -0
- package/libs/util/shared/src/lib/utils/index.d.ts.map +1 -1
- package/package.json +8 -6
- package/src/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.ts +1 -0
- package/src/libs/api/repository/src/index.ts +1 -0
- package/src/libs/feature/auth/src/lib/feature-auth.module.ts +1 -1
- package/src/libs/feature/catalog/src/lib/feature-catalog.module.ts +1 -1
- package/src/libs/feature/catalog/src/lib/organisations/organisations.component.ts +3 -17
- package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.css +0 -0
- package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.html +21 -0
- package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.ts +107 -0
- package/src/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.css +0 -0
- package/src/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.html +37 -0
- package/src/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.ts +64 -0
- package/src/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.css +0 -0
- package/src/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.html +55 -0
- package/src/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.ts +63 -0
- package/src/libs/feature/map/src/lib/feature-map.module.ts +6 -0
- package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.html +9 -3
- package/src/libs/feature/map/src/lib/map-context/map-context.service.ts +6 -0
- package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.html +12 -4
- package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.ts +2 -4
- package/src/libs/feature/search/src/lib/feature-search.module.ts +1 -1
- package/src/libs/feature/search/src/lib/state/effects.ts +1 -1
- package/src/libs/feature/search/src/lib/utils/service/fields.ts +1 -1
- package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.html +1 -0
- package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.ts +1 -1
- package/src/libs/ui/elements/src/index.ts +2 -0
- package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.css +0 -0
- package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.html +29 -0
- package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.ts +15 -0
- package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.css +264 -0
- package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.html +1 -0
- package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts +16 -0
- package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.html +93 -27
- package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.ts +7 -0
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.css +4 -0
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +59 -32
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts +5 -0
- package/src/libs/ui/elements/src/lib/related-record-card/related-record-card.component.html +1 -1
- package/src/libs/ui/elements/src/lib/thumbnail/thumbnail.component.ts +4 -0
- package/src/libs/ui/elements/src/lib/ui-elements.module.ts +6 -0
- package/src/libs/ui/inputs/src/lib/button/button.component.css +1 -1
- package/src/libs/ui/inputs/src/lib/button/button.component.ts +22 -42
- package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.ts +7 -4
- package/src/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.html +8 -3
- package/src/libs/ui/inputs/src/lib/star-toggle/star-toggle.component.css +1 -0
- package/src/libs/ui/layout/src/lib/carousel/carousel.component.css +1 -1
- package/src/libs/util/app-config/src/lib/app-config.ts +4 -0
- package/src/libs/util/app-config/src/lib/model.ts +2 -0
- package/src/libs/util/i18n/src/index.ts +1 -0
- package/src/libs/util/shared/src/lib/services/theme.service.ts +9 -0
- package/src/libs/util/shared/src/lib/utils/fuzzy-filter.ts +32 -0
- package/src/libs/util/shared/src/lib/utils/index.ts +1 -0
- package/tailwind.base.css +31 -1
- package/translations/de.json +101 -84
- package/translations/en.json +39 -22
- package/translations/es.json +17 -0
- package/translations/fr.json +25 -8
- package/translations/it.json +26 -6
- package/translations/nl.json +17 -0
- package/translations/pt.json +17 -0
- package/translations/sk.json +17 -0
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
type FuzzyFilter = (input: string) => boolean;
|
|
2
|
+
/**
|
|
3
|
+
* This creates a filter function based on a pattern (typically a user-input
|
|
4
|
+
* search text).
|
|
5
|
+
* @param pattern
|
|
6
|
+
*/
|
|
7
|
+
export declare function createFuzzyFilter(pattern: string): FuzzyFilter;
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=fuzzy-filter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fuzzy-filter.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/fuzzy-filter.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;AAkB7C;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAQ9D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "geonetwork-ui",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0-dev.0eef2738",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=14.17.0"
|
|
6
6
|
},
|
|
@@ -39,7 +39,6 @@
|
|
|
39
39
|
"@ngrx/router-store": "16.x || 17.x",
|
|
40
40
|
"@ngrx/store": "16.x || 17.x",
|
|
41
41
|
"@ngrx/store-devtools": "16.x || 17.x",
|
|
42
|
-
"@nguniversal/express-engine": "16.x || 17.x",
|
|
43
42
|
"@ngx-translate/core": "14.x",
|
|
44
43
|
"@ngx-translate/http-loader": "7.x",
|
|
45
44
|
"rxjs": "7.x",
|
|
@@ -47,14 +46,14 @@
|
|
|
47
46
|
"tailwindcss": "3.x"
|
|
48
47
|
},
|
|
49
48
|
"dependencies": {
|
|
49
|
+
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
|
|
50
50
|
"@camptocamp/ogc-client": "^0.4.0",
|
|
51
51
|
"@ltd/j-toml": "~1.35.2",
|
|
52
52
|
"@messageformat/core": "^3.0.1",
|
|
53
|
-
"@rgrove/parse-xml": "~4.0.1",
|
|
54
53
|
"@nx/angular": "16.6.0",
|
|
55
|
-
"@
|
|
54
|
+
"@rgrove/parse-xml": "~4.0.1",
|
|
56
55
|
"alasql": "^3.1.0",
|
|
57
|
-
"axios": "^1.
|
|
56
|
+
"axios": "^1.6.0",
|
|
58
57
|
"chart.js": "^4.2.0",
|
|
59
58
|
"chroma-js": "^2.1.2",
|
|
60
59
|
"date-fns": "^2.29.3",
|
|
@@ -62,15 +61,18 @@
|
|
|
62
61
|
"duration-relativetimeformat": "^2.0.3",
|
|
63
62
|
"embla-carousel": "^8.0.0-rc14",
|
|
64
63
|
"express": "^4.17.1",
|
|
64
|
+
"geojson-validation": "^1.0.2",
|
|
65
65
|
"moment": "^2.29.4",
|
|
66
66
|
"ng-table-virtual-scroll": "^1.4.1",
|
|
67
67
|
"ngx-chips": "3.0.0",
|
|
68
68
|
"ngx-dropzone": "^3.0.0",
|
|
69
69
|
"ngx-translate-messageformat-compiler": "~6.5.0",
|
|
70
|
-
"ol": "^
|
|
70
|
+
"ol": "^8.2.0",
|
|
71
71
|
"papaparse": "^5.3.1",
|
|
72
72
|
"pg": "^8.9.0",
|
|
73
|
+
"proj4": "^2.9.2",
|
|
73
74
|
"reflect-metadata": "^0.1.13",
|
|
75
|
+
"semver": "^7.5.4",
|
|
74
76
|
"tippy.js": "^6.3.7",
|
|
75
77
|
"tslib": "^2.3.0",
|
|
76
78
|
"typeorm": "^0.3.14",
|
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
OrganizationsFromGroupsService,
|
|
21
21
|
OrganizationsFromMetadataService,
|
|
22
22
|
OrganizationsStrategy,
|
|
23
|
-
} from '../../../../../libs/api/repository/src
|
|
23
|
+
} from '../../../../../libs/api/repository/src'
|
|
24
24
|
import { PlatformServiceInterface } from '../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
25
25
|
|
|
26
26
|
// expects the replacement key ${name}
|
|
@@ -13,6 +13,7 @@ import { map, startWith, tap } from 'rxjs/operators'
|
|
|
13
13
|
import { ORGANIZATION_URL_TOKEN } from '../feature-catalog.module'
|
|
14
14
|
import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
|
|
15
15
|
import { SortByField } from '../../../../../../libs/common/domain/src/lib/model/search'
|
|
16
|
+
import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
|
|
16
17
|
|
|
17
18
|
@Component({
|
|
18
19
|
selector: 'gn-ui-organisations',
|
|
@@ -84,23 +85,8 @@ export class OrganisationsComponent {
|
|
|
84
85
|
|
|
85
86
|
private filterOrganisations(organisations: Organization[], filterBy: string) {
|
|
86
87
|
if (!filterBy) return organisations
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
.replace(/[^a-z0-9\s]/g, ' ') //ignore special characters (also without spaces like l')
|
|
90
|
-
.replace(/\s(?=.)/g, '.*') //replace whitespaces by "AND" separator
|
|
91
|
-
.replace(/\s/g, ''), //remove potential whitespaces left
|
|
92
|
-
'i'
|
|
93
|
-
)
|
|
94
|
-
return [...organisations].filter((org) => {
|
|
95
|
-
return this.normalizeString(org.name).match(filterRegex)
|
|
96
|
-
})
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
private normalizeString(str: string) {
|
|
100
|
-
return str
|
|
101
|
-
.normalize('NFD')
|
|
102
|
-
.replace(/[\u0300-\u036f]/g, '')
|
|
103
|
-
.toLowerCase()
|
|
88
|
+
const filter = createFuzzyFilter(filterBy)
|
|
89
|
+
return organisations.filter((org) => filter(org.name))
|
|
104
90
|
}
|
|
105
91
|
|
|
106
92
|
private sortOrganisations(
|
|
File without changes
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
<div class="flex flex-col gap-2 my-2">
|
|
2
|
+
<div class="flex items-center gap-4">
|
|
3
|
+
<div class="flex-grow rounded-md border-2 border-gray-200">
|
|
4
|
+
<gn-ui-drag-and-drop-file-input
|
|
5
|
+
(fileChange)="handleFileChange($event)"
|
|
6
|
+
[accept]="acceptedMimeType.join(',')"
|
|
7
|
+
[placeholder]="'map.addFromFile.placeholder' | translate"
|
|
8
|
+
class="placeholder-grey"
|
|
9
|
+
></gn-ui-drag-and-drop-file-input>
|
|
10
|
+
</div>
|
|
11
|
+
</div>
|
|
12
|
+
<p class="text-sm text-gray-600" translate>map.help.addFromFile</p>
|
|
13
|
+
</div>
|
|
14
|
+
|
|
15
|
+
<div *ngIf="errorMessage" class="text-red-500 mt-2">
|
|
16
|
+
{{ errorMessage }}
|
|
17
|
+
</div>
|
|
18
|
+
|
|
19
|
+
<div *ngIf="successMessage" class="text-green-500 mt-2">
|
|
20
|
+
{{ successMessage }}
|
|
21
|
+
</div>
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { ChangeDetectorRef, Component } from '@angular/core'
|
|
2
|
+
import { MapContextLayerModel } from '../map-context/map-context.model'
|
|
3
|
+
import { MapFacade } from '../+state/map.facade'
|
|
4
|
+
|
|
5
|
+
const INVALID_FILE_FORMAT_ERROR_MESSAGE = 'Invalid file format'
|
|
6
|
+
|
|
7
|
+
@Component({
|
|
8
|
+
selector: 'gn-ui-add-layer-from-file',
|
|
9
|
+
templateUrl: './add-layer-from-file.component.html',
|
|
10
|
+
styleUrls: ['./add-layer-from-file.component.css'],
|
|
11
|
+
})
|
|
12
|
+
export class AddLayerFromFileComponent {
|
|
13
|
+
errorMessage: string | null = null
|
|
14
|
+
successMessage: string | null = null
|
|
15
|
+
loading = false
|
|
16
|
+
readonly acceptedMimeType = ['.geojson']
|
|
17
|
+
readonly maxFileSize = 5000000
|
|
18
|
+
|
|
19
|
+
constructor(
|
|
20
|
+
private mapFacade: MapFacade,
|
|
21
|
+
private changeDetectorRef: ChangeDetectorRef
|
|
22
|
+
) {}
|
|
23
|
+
|
|
24
|
+
async handleFileChange(file: File) {
|
|
25
|
+
if (!file) {
|
|
26
|
+
this.displayMessage(INVALID_FILE_FORMAT_ERROR_MESSAGE, 'error')
|
|
27
|
+
return
|
|
28
|
+
}
|
|
29
|
+
if (file.size > this.maxFileSize) {
|
|
30
|
+
this.displayMessage('File size exceeds the limit of 5MB', 'error')
|
|
31
|
+
return
|
|
32
|
+
}
|
|
33
|
+
await this.addLayer(file)
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
private async addLayer(file: File) {
|
|
37
|
+
this.errorMessage = null
|
|
38
|
+
this.loading = true
|
|
39
|
+
try {
|
|
40
|
+
if (!this.isFileFormatValid(file)) {
|
|
41
|
+
this.displayMessage(INVALID_FILE_FORMAT_ERROR_MESSAGE, 'error')
|
|
42
|
+
return
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
const fileExtension = this.getFileExtension(file)
|
|
46
|
+
switch (fileExtension) {
|
|
47
|
+
case 'geojson':
|
|
48
|
+
await this.addGeoJsonLayer(file)
|
|
49
|
+
break
|
|
50
|
+
default:
|
|
51
|
+
this.displayMessage(INVALID_FILE_FORMAT_ERROR_MESSAGE, 'error')
|
|
52
|
+
break
|
|
53
|
+
}
|
|
54
|
+
} catch (error) {
|
|
55
|
+
const err = error as Error
|
|
56
|
+
this.displayMessage('Error loading file: ' + err.message, 'error')
|
|
57
|
+
} finally {
|
|
58
|
+
this.loading = false
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
private addGeoJsonLayer(file: File) {
|
|
63
|
+
return new Promise<void>((resolve, reject) => {
|
|
64
|
+
try {
|
|
65
|
+
const reader = new FileReader()
|
|
66
|
+
reader.onload = () => {
|
|
67
|
+
const result = reader.result as string
|
|
68
|
+
const title = file.name.split('.').slice(0, -1).join('.')
|
|
69
|
+
const layerToAdd: MapContextLayerModel = {
|
|
70
|
+
type: 'geojson',
|
|
71
|
+
data: result,
|
|
72
|
+
}
|
|
73
|
+
this.mapFacade.addLayer({ ...layerToAdd, title: title })
|
|
74
|
+
this.displayMessage('File successfully added to map', 'success')
|
|
75
|
+
resolve()
|
|
76
|
+
}
|
|
77
|
+
reader.onerror = reject
|
|
78
|
+
reader.readAsText(file)
|
|
79
|
+
} catch (error) {
|
|
80
|
+
reject(error)
|
|
81
|
+
}
|
|
82
|
+
})
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
private isFileFormatValid(file: File): boolean {
|
|
86
|
+
const fileExtension = this.getFileExtension(file)
|
|
87
|
+
return this.acceptedMimeType.includes(`.${fileExtension}`)
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
private getFileExtension(file: File): string | undefined {
|
|
91
|
+
return file.name.split('.').pop()
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
private displayMessage(message: string, type: 'success' | 'error') {
|
|
95
|
+
if (type === 'success') {
|
|
96
|
+
this.successMessage = message
|
|
97
|
+
} else if (type === 'error') {
|
|
98
|
+
this.errorMessage = message
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
setTimeout(() => {
|
|
102
|
+
this.successMessage = null
|
|
103
|
+
this.errorMessage = null
|
|
104
|
+
this.changeDetectorRef.detectChanges()
|
|
105
|
+
}, 5000)
|
|
106
|
+
}
|
|
107
|
+
}
|
|
File without changes
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
<div class="flex items-center mb-5">
|
|
2
|
+
<gn-ui-text-input
|
|
3
|
+
[(value)]="wfsUrl"
|
|
4
|
+
(valueChange)="urlChange.next($event)"
|
|
5
|
+
[hint]="'map.wfs.urlInput.hint' | translate"
|
|
6
|
+
class="w-96"
|
|
7
|
+
>
|
|
8
|
+
</gn-ui-text-input>
|
|
9
|
+
</div>
|
|
10
|
+
|
|
11
|
+
<div *ngIf="errorMessage" class="text-red-500 mt-2">
|
|
12
|
+
{{ errorMessage }}
|
|
13
|
+
</div>
|
|
14
|
+
|
|
15
|
+
<div *ngIf="loading">
|
|
16
|
+
<p class="loading-message" translate>map.loading.service</p>
|
|
17
|
+
</div>
|
|
18
|
+
|
|
19
|
+
<div *ngIf="!loading && layers.length > 0">
|
|
20
|
+
<h2 class="font-bold" translate>map.layers.available</h2>
|
|
21
|
+
<ng-container *ngFor="let layer of layers">
|
|
22
|
+
<div class="flex items-center justify-between my-2 layer-item-tree">
|
|
23
|
+
<p class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap">
|
|
24
|
+
{{ layer.title }}
|
|
25
|
+
</p>
|
|
26
|
+
<gn-ui-button
|
|
27
|
+
*ngIf="layer.name"
|
|
28
|
+
class="layer-add-btn"
|
|
29
|
+
type="primary"
|
|
30
|
+
(buttonClick)="addLayer(layer)"
|
|
31
|
+
extraClass="text-sm !px-2 !py-1"
|
|
32
|
+
translate
|
|
33
|
+
><span translate> map.layer.add </span></gn-ui-button
|
|
34
|
+
>
|
|
35
|
+
</div>
|
|
36
|
+
</ng-container>
|
|
37
|
+
</div>
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { ChangeDetectorRef, Component, OnInit } from '@angular/core'
|
|
2
|
+
import { WfsEndpoint, WfsFeatureTypeBrief } from '@camptocamp/ogc-client'
|
|
3
|
+
import { Subject } from 'rxjs'
|
|
4
|
+
import {
|
|
5
|
+
MapContextLayerModel,
|
|
6
|
+
MapContextLayerTypeEnum,
|
|
7
|
+
} from '../map-context/map-context.model'
|
|
8
|
+
import { MapFacade } from '../+state/map.facade'
|
|
9
|
+
import { debounceTime } from 'rxjs/operators'
|
|
10
|
+
|
|
11
|
+
@Component({
|
|
12
|
+
selector: 'gn-ui-add-layer-from-wfs',
|
|
13
|
+
templateUrl: './add-layer-from-wfs.component.html',
|
|
14
|
+
styleUrls: ['./add-layer-from-wfs.component.css'],
|
|
15
|
+
})
|
|
16
|
+
export class AddLayerFromWfsComponent implements OnInit {
|
|
17
|
+
wfsUrl = ''
|
|
18
|
+
loading = false
|
|
19
|
+
layers: WfsFeatureTypeBrief[] = []
|
|
20
|
+
wfsEndpoint: WfsEndpoint | null = null
|
|
21
|
+
urlChange = new Subject<string>()
|
|
22
|
+
errorMessage: string | null = null
|
|
23
|
+
|
|
24
|
+
constructor(
|
|
25
|
+
private mapFacade: MapFacade,
|
|
26
|
+
private changeDetectorRef: ChangeDetectorRef
|
|
27
|
+
) {}
|
|
28
|
+
|
|
29
|
+
ngOnInit() {
|
|
30
|
+
this.urlChange.pipe(debounceTime(700)).subscribe(() => this.loadLayers())
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
async loadLayers() {
|
|
34
|
+
this.errorMessage = null
|
|
35
|
+
try {
|
|
36
|
+
this.loading = true
|
|
37
|
+
|
|
38
|
+
if (this.wfsUrl.trim() === '') {
|
|
39
|
+
this.layers = []
|
|
40
|
+
return
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
this.wfsEndpoint = await new WfsEndpoint(this.wfsUrl).isReady()
|
|
44
|
+
this.layers = this.wfsEndpoint.getFeatureTypes()
|
|
45
|
+
console.log(this.layers)
|
|
46
|
+
} catch (error) {
|
|
47
|
+
const err = error as Error
|
|
48
|
+
this.layers = []
|
|
49
|
+
this.errorMessage = 'Error loading layers: ' + err.message
|
|
50
|
+
} finally {
|
|
51
|
+
this.loading = false
|
|
52
|
+
this.changeDetectorRef.markForCheck()
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
addLayer(layer: WfsFeatureTypeBrief) {
|
|
57
|
+
const layerToAdd: MapContextLayerModel = {
|
|
58
|
+
name: layer.name,
|
|
59
|
+
url: this.wfsUrl.toString(),
|
|
60
|
+
type: MapContextLayerTypeEnum.WFS,
|
|
61
|
+
}
|
|
62
|
+
this.mapFacade.addLayer({ ...layerToAdd, title: layer.title })
|
|
63
|
+
}
|
|
64
|
+
}
|
|
File without changes
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
<div class="flex items-center mb-5">
|
|
2
|
+
<gn-ui-text-input
|
|
3
|
+
[(value)]="wmsUrl"
|
|
4
|
+
(valueChange)="urlChange.next($event)"
|
|
5
|
+
[hint]="'map.wms.urlInput.hint' | translate"
|
|
6
|
+
class="w-96"
|
|
7
|
+
>
|
|
8
|
+
</gn-ui-text-input>
|
|
9
|
+
</div>
|
|
10
|
+
|
|
11
|
+
<div *ngIf="errorMessage" class="text-red-500 mt-2">
|
|
12
|
+
{{ errorMessage }}
|
|
13
|
+
</div>
|
|
14
|
+
|
|
15
|
+
<div *ngIf="loading">
|
|
16
|
+
<p class="loading-message" translate>map.loading.service</p>
|
|
17
|
+
</div>
|
|
18
|
+
|
|
19
|
+
<div *ngIf="!loading && layers.length > 0">
|
|
20
|
+
<h2 class="font-bold" translate>map.layers.available</h2>
|
|
21
|
+
<ng-container
|
|
22
|
+
*ngFor="let layer of layers"
|
|
23
|
+
[ngTemplateOutlet]="layerTreeItem"
|
|
24
|
+
[ngTemplateOutletContext]="{
|
|
25
|
+
layer: layer
|
|
26
|
+
}"
|
|
27
|
+
></ng-container>
|
|
28
|
+
</div>
|
|
29
|
+
|
|
30
|
+
<ng-template #layerTreeItem let-layer="layer">
|
|
31
|
+
<div class="flex items-center justify-between layer-tree-item my-2">
|
|
32
|
+
<p class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap">
|
|
33
|
+
{{ layer.title }}
|
|
34
|
+
</p>
|
|
35
|
+
<gn-ui-button
|
|
36
|
+
*ngIf="layer.name"
|
|
37
|
+
class="layer-add-btn"
|
|
38
|
+
type="primary"
|
|
39
|
+
(buttonClick)="addLayer(layer)"
|
|
40
|
+
extraClass="text-sm !px-2 !py-1"
|
|
41
|
+
translate
|
|
42
|
+
><span translate> map.layer.add </span></gn-ui-button
|
|
43
|
+
>
|
|
44
|
+
</div>
|
|
45
|
+
<div *ngIf="layer.children?.length > 0" class="ml-4">
|
|
46
|
+
<ng-container
|
|
47
|
+
*ngFor="let child of layer.children"
|
|
48
|
+
[ngTemplateOutlet]="layerTreeItem"
|
|
49
|
+
[ngTemplateOutletContext]="{
|
|
50
|
+
layer: child
|
|
51
|
+
}"
|
|
52
|
+
>
|
|
53
|
+
</ng-container>
|
|
54
|
+
</div>
|
|
55
|
+
</ng-template>
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { Component, ChangeDetectorRef, OnInit } from '@angular/core'
|
|
2
|
+
import { WmsEndpoint, WmsLayerSummary } from '@camptocamp/ogc-client'
|
|
3
|
+
import { MapFacade } from '../+state/map.facade'
|
|
4
|
+
import {
|
|
5
|
+
MapContextLayerModel,
|
|
6
|
+
MapContextLayerTypeEnum,
|
|
7
|
+
} from '../map-context/map-context.model'
|
|
8
|
+
import { Subject } from 'rxjs'
|
|
9
|
+
import { debounceTime } from 'rxjs/operators'
|
|
10
|
+
|
|
11
|
+
@Component({
|
|
12
|
+
selector: 'gn-ui-add-layer-from-wms',
|
|
13
|
+
templateUrl: './add-layer-from-wms.component.html',
|
|
14
|
+
styleUrls: ['./add-layer-from-wms.component.css'],
|
|
15
|
+
})
|
|
16
|
+
export class AddLayerFromWmsComponent implements OnInit {
|
|
17
|
+
wmsUrl = ''
|
|
18
|
+
loading = false
|
|
19
|
+
layers: WmsLayerSummary[] = []
|
|
20
|
+
wmsEndpoint: WmsEndpoint | null = null
|
|
21
|
+
urlChange = new Subject<string>()
|
|
22
|
+
errorMessage: string | null = null
|
|
23
|
+
|
|
24
|
+
constructor(
|
|
25
|
+
private mapFacade: MapFacade,
|
|
26
|
+
private changeDetectorRef: ChangeDetectorRef
|
|
27
|
+
) {}
|
|
28
|
+
|
|
29
|
+
ngOnInit() {
|
|
30
|
+
this.urlChange.pipe(debounceTime(700)).subscribe(() => this.loadLayers())
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
async loadLayers() {
|
|
34
|
+
this.errorMessage = null
|
|
35
|
+
try {
|
|
36
|
+
this.loading = true
|
|
37
|
+
|
|
38
|
+
if (this.wmsUrl.trim() === '') {
|
|
39
|
+
this.layers = []
|
|
40
|
+
return
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
this.wmsEndpoint = await new WmsEndpoint(this.wmsUrl).isReady()
|
|
44
|
+
this.layers = this.wmsEndpoint.getLayers()
|
|
45
|
+
} catch (error) {
|
|
46
|
+
const err = error as Error
|
|
47
|
+
this.layers = []
|
|
48
|
+
this.errorMessage = 'Error loading layers: ' + err.message
|
|
49
|
+
} finally {
|
|
50
|
+
this.loading = false
|
|
51
|
+
this.changeDetectorRef.markForCheck()
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
addLayer(layer: WmsLayerSummary) {
|
|
56
|
+
const layerToAdd: MapContextLayerModel = {
|
|
57
|
+
name: layer.name,
|
|
58
|
+
url: this.wmsUrl.toString(),
|
|
59
|
+
type: MapContextLayerTypeEnum.WMS,
|
|
60
|
+
}
|
|
61
|
+
this.mapFacade.addLayer({ ...layerToAdd, title: layer.title })
|
|
62
|
+
}
|
|
63
|
+
}
|
|
@@ -20,6 +20,9 @@ import { MapContainerComponent } from './map-container/map-container.component'
|
|
|
20
20
|
import { AddLayerRecordPreviewComponent } from './add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component'
|
|
21
21
|
import { UiElementsModule } from '../../../../../libs/ui/elements/src'
|
|
22
22
|
import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
|
|
23
|
+
import { AddLayerFromWmsComponent } from './add-layer-from-wms/add-layer-from-wms.component'
|
|
24
|
+
import { AddLayerFromFileComponent } from './add-layer-from-file/add-layer-from-file.component'
|
|
25
|
+
import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wfs.component'
|
|
23
26
|
|
|
24
27
|
@NgModule({
|
|
25
28
|
declarations: [
|
|
@@ -29,6 +32,9 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
|
|
|
29
32
|
AddLayerFromCatalogComponent,
|
|
30
33
|
MapContainerComponent,
|
|
31
34
|
AddLayerRecordPreviewComponent,
|
|
35
|
+
AddLayerFromWmsComponent,
|
|
36
|
+
AddLayerFromFileComponent,
|
|
37
|
+
AddLayerFromWfsComponent,
|
|
32
38
|
],
|
|
33
39
|
exports: [
|
|
34
40
|
MapContextComponent,
|
|
@@ -31,13 +31,19 @@
|
|
|
31
31
|
</div>
|
|
32
32
|
</mat-tab>
|
|
33
33
|
<mat-tab [label]="'map.add.layer.wms' | translate" bodyClass="h-full">
|
|
34
|
-
<div class="p-3
|
|
34
|
+
<div class="p-3">
|
|
35
|
+
<gn-ui-add-layer-from-wms></gn-ui-add-layer-from-wms>
|
|
36
|
+
</div>
|
|
35
37
|
</mat-tab>
|
|
36
38
|
<mat-tab [label]="'map.add.layer.wfs' | translate" bodyClass="h-full">
|
|
37
|
-
<div class="p-3
|
|
39
|
+
<div class="p-3">
|
|
40
|
+
<gn-ui-add-layer-from-wfs></gn-ui-add-layer-from-wfs>
|
|
41
|
+
</div>
|
|
38
42
|
</mat-tab>
|
|
39
43
|
<mat-tab [label]="'map.add.layer.file' | translate" bodyClass="h-full">
|
|
40
|
-
<div class="p-3
|
|
44
|
+
<div class="p-3">
|
|
45
|
+
<gn-ui-add-layer-from-file></gn-ui-add-layer-from-file>
|
|
46
|
+
</div>
|
|
41
47
|
</mat-tab>
|
|
42
48
|
</mat-tab-group>
|
|
43
49
|
</gn-ui-expandable-panel-button>
|
|
@@ -40,6 +40,8 @@ export const DEFAULT_VIEW: MapContextViewModel = {
|
|
|
40
40
|
zoom: 2,
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
+
export const WFS_MAX_FEATURES = 10000
|
|
44
|
+
|
|
43
45
|
@Injectable({
|
|
44
46
|
providedIn: 'root',
|
|
45
47
|
})
|
|
@@ -111,6 +113,10 @@ export class MapContextService {
|
|
|
111
113
|
urlObj.searchParams.set('typename', layerModel.name)
|
|
112
114
|
urlObj.searchParams.set('srsname', 'EPSG:3857')
|
|
113
115
|
urlObj.searchParams.set('bbox', `${extent.join(',')},EPSG:3857`)
|
|
116
|
+
urlObj.searchParams.set(
|
|
117
|
+
'maxFeatures',
|
|
118
|
+
WFS_MAX_FEATURES.toString()
|
|
119
|
+
)
|
|
114
120
|
return urlObj.toString()
|
|
115
121
|
},
|
|
116
122
|
strategy: bboxStrategy,
|
package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.html
CHANGED
|
@@ -1,10 +1,18 @@
|
|
|
1
|
-
<div>
|
|
2
|
-
<span
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
<div class="flex flex-row content-center">
|
|
2
|
+
<span
|
|
3
|
+
class="align-text-top mr-1.5 mt-1.5 favorite-count"
|
|
4
|
+
*ngIf="hasFavoriteCount && displayCount"
|
|
5
|
+
>{{ favoriteCount }}</span
|
|
6
|
+
>
|
|
5
7
|
<gn-ui-star-toggle
|
|
6
8
|
[toggled]="isFavorite$ | async"
|
|
7
9
|
(newValue)="toggleFavorite($event)"
|
|
8
10
|
[disabled]="loading || (isAnonymous$ | async)"
|
|
11
|
+
class="mt-1"
|
|
9
12
|
></gn-ui-star-toggle>
|
|
13
|
+
<span
|
|
14
|
+
class="align-text-top ml-1.5 favorite-count mt-1.5"
|
|
15
|
+
*ngIf="!displayCount"
|
|
16
|
+
translate="datahub.record.addToFavorites"
|
|
17
|
+
></span>
|
|
10
18
|
</div>
|
|
@@ -14,10 +14,7 @@ import { TranslateService } from '@ngx-translate/core'
|
|
|
14
14
|
import { StarToggleComponent } from '../../../../../../../libs/ui/inputs/src'
|
|
15
15
|
import { Observable, Subscription } from 'rxjs'
|
|
16
16
|
import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
17
|
-
import {
|
|
18
|
-
AuthService,
|
|
19
|
-
FavoritesService,
|
|
20
|
-
} from '../../../../../../../libs/api/repository/src/lib/gn4'
|
|
17
|
+
import { AuthService, FavoritesService } from '../../../../../../../libs/api/repository/src'
|
|
21
18
|
import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
22
19
|
|
|
23
20
|
@Component({
|
|
@@ -27,6 +24,7 @@ import { PlatformServiceInterface } from '../../../../../../../libs/common/domai
|
|
|
27
24
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
28
25
|
})
|
|
29
26
|
export class FavoriteStarComponent implements AfterViewInit, OnDestroy {
|
|
27
|
+
@Input() displayCount? = true
|
|
30
28
|
@Input() set record(value) {
|
|
31
29
|
this.record_ = value
|
|
32
30
|
this.favoriteCount =
|
|
@@ -23,7 +23,7 @@ import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.compo
|
|
|
23
23
|
import { Geometry } from 'geojson'
|
|
24
24
|
import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
|
|
25
25
|
import { RecordsRepositoryInterface } from '../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
|
|
26
|
-
import { Gn4Repository } from '../../../../../libs/api/repository/src
|
|
26
|
+
import { Gn4Repository } from '../../../../../libs/api/repository/src'
|
|
27
27
|
|
|
28
28
|
// this geometry will be used to filter & boost results accordingly
|
|
29
29
|
export const FILTER_GEOMETRY = new InjectionToken<Promise<Geometry>>(
|
|
@@ -43,7 +43,7 @@ import { switchMapWithSearchId } from '../utils/operators/search.operator'
|
|
|
43
43
|
import { Geometry } from 'geojson'
|
|
44
44
|
import { FILTER_GEOMETRY } from '../feature-search.module'
|
|
45
45
|
import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
|
|
46
|
-
import { FavoritesService } from '../../../../../../libs/api/repository/src
|
|
46
|
+
import { FavoritesService } from '../../../../../../libs/api/repository/src'
|
|
47
47
|
import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
48
48
|
import { valid as validGeoJson } from 'geojson-validation'
|
|
49
49
|
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
FieldFilters,
|
|
14
14
|
TermBucket,
|
|
15
15
|
} from '../../../../../../../libs/common/domain/src/lib/model/search'
|
|
16
|
-
import { ElasticsearchService } from '../../../../../../../libs/api/repository/src
|
|
16
|
+
import { ElasticsearchService } from '../../../../../../../libs/api/repository/src'
|
|
17
17
|
import { LangService } from '../../../../../../../libs/util/i18n/src'
|
|
18
18
|
|
|
19
19
|
export type FieldValue = string | number
|