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
package/translations/es.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "",
|
|
426
426
|
"map.addFromFile.placeholder": "",
|
|
427
427
|
"map.dropdown.placeholder": "",
|
|
428
|
-
"map.geocoding.placeholder": "",
|
|
429
428
|
"map.help.addFromFile": "",
|
|
430
429
|
"map.layer.add": "",
|
|
431
430
|
"map.layers.available": "",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "",
|
|
691
690
|
"search.filters.recordKind.service": "",
|
|
692
691
|
"search.filters.representationType": "",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "",
|
|
693
693
|
"search.filters.resourceType": "",
|
|
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": "",
|
|
704
707
|
"search.filters.summaryLabel.changeDate": "",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "",
|
|
705
710
|
"search.filters.summaryLabel.user": "",
|
|
711
|
+
"search.filters.temporalExtent": "",
|
|
706
712
|
"search.filters.title": "",
|
|
707
713
|
"search.filters.topic": "",
|
|
708
714
|
"search.filters.useSpatialFilter": "",
|
package/translations/fr.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "Depuis un service WMS",
|
|
426
426
|
"map.addFromFile.placeholder": "Cliquez ou déposez un fichier ici",
|
|
427
427
|
"map.dropdown.placeholder": "Aucune couche d'aperçu disponible",
|
|
428
|
-
"map.geocoding.placeholder": "Rechercher un lieu",
|
|
429
428
|
"map.help.addFromFile": "Cliquez ou glissez-déposez un fichier pour l'ajouter à la carte (supporte actuellement uniquement le format GeoJSON).",
|
|
430
429
|
"map.layer.add": "Ajouter",
|
|
431
430
|
"map.layers.available": "Couches disponibles",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "Réutilisations",
|
|
691
690
|
"search.filters.recordKind.service": "Services",
|
|
692
691
|
"search.filters.representationType": "Type de représentation",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "Date de la ressource",
|
|
693
693
|
"search.filters.resourceType": "Type de ressource",
|
|
694
|
-
"search.filters.spatialExtent": "Étendue
|
|
695
|
-
"search.filters.spatialExtent.
|
|
696
|
-
"search.filters.spatialExtent.
|
|
694
|
+
"search.filters.spatialExtent.bboxFromFile": "Étendue de {fileName}",
|
|
695
|
+
"search.filters.spatialExtent.bboxFromFileDelete": "Supprimer {fileName}",
|
|
696
|
+
"search.filters.spatialExtent.bboxInitial": "Étendue présélectionnée",
|
|
697
|
+
"search.filters.spatialExtent.bboxInitialDelete": "Supprimer la sélection",
|
|
697
698
|
"search.filters.spatialExtent.error.fileTooLarge": "Le fichier dépasse la taille maximale autorisée ({maxSize} Mo)",
|
|
698
699
|
"search.filters.spatialExtent.error.invalidFormat": "Le fichier n'a pas pu être lu comme un GeoJSON valide",
|
|
699
700
|
"search.filters.spatialExtent.error.noGeometry": "Aucune géométrie n'a pu être trouvée dans le fichier",
|
|
701
|
+
"search.filters.spatialExtent.error.outOfBounds": "La géométrie du fichier GeoJSON n'est pas conforme ; soit certaines coordonnées sont hors limites ([-180, 180] pour la longitude et [-90, 90] pour la latitude), soit le fichier utilise des coordonnées projetées au lieu de la longitude et de la latitude.",
|
|
700
702
|
"search.filters.spatialExtent.error.title": "Erreur d'importation GeoJSON",
|
|
701
|
-
"search.filters.spatialExtent
|
|
703
|
+
"search.filters.spatialExtent": "Étendue spatiale",
|
|
704
|
+
"search.filters.spatialExtent.helpText": "L'étendue de la géométrie sélectionnée sera utilisée",
|
|
702
705
|
"search.filters.spatialExtent.import": "Importer un GeoJSON",
|
|
703
706
|
"search.filters.standard": "Standard",
|
|
704
707
|
"search.filters.summaryLabel.changeDate": "Mise à jour : ",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "Date de la ressource : ",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "Étendue temporelle : ",
|
|
705
710
|
"search.filters.summaryLabel.user": "Éditeur : ",
|
|
711
|
+
"search.filters.temporalExtent": "Étendue temporelle",
|
|
706
712
|
"search.filters.title": "Affiner votre recherche",
|
|
707
713
|
"search.filters.topic": "Thèmes",
|
|
708
714
|
"search.filters.useSpatialFilter": "Mettre en avant les ressources sur la zone d'intérêt",
|
package/translations/it.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "Da un WMS",
|
|
426
426
|
"map.addFromFile.placeholder": "Clicca o trascina un file qui",
|
|
427
427
|
"map.dropdown.placeholder": "Nessun livello di anteprima disponibile",
|
|
428
|
-
"map.geocoding.placeholder": "Cerca un luogo",
|
|
429
428
|
"map.help.addFromFile": "Clicca o trascina un file per aggiungerlo alla mappa (attualmente supporta solo il formato GeoJSON)",
|
|
430
429
|
"map.layer.add": "Aggiungi",
|
|
431
430
|
"map.layers.available": "Layer disponibili",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "Riutilizzi",
|
|
691
690
|
"search.filters.recordKind.service": "Servizi",
|
|
692
691
|
"search.filters.representationType": "Tipo di rappresentazione",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "Data della risorsa",
|
|
693
693
|
"search.filters.resourceType": "Tipo di risorsa",
|
|
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": "Aggiornato: ",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "Data della risorsa: ",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "Estensione temporale: ",
|
|
705
710
|
"search.filters.summaryLabel.user": "Editor: ",
|
|
711
|
+
"search.filters.temporalExtent": "Estensione temporale",
|
|
706
712
|
"search.filters.title": "Affina la sua ricerca",
|
|
707
713
|
"search.filters.topic": "Argomenti",
|
|
708
714
|
"search.filters.useSpatialFilter": "Evidenzia le risorse nell'area di interesse",
|
package/translations/nl.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "",
|
|
426
426
|
"map.addFromFile.placeholder": "",
|
|
427
427
|
"map.dropdown.placeholder": "",
|
|
428
|
-
"map.geocoding.placeholder": "",
|
|
429
428
|
"map.help.addFromFile": "",
|
|
430
429
|
"map.layer.add": "",
|
|
431
430
|
"map.layers.available": "",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "",
|
|
691
690
|
"search.filters.recordKind.service": "",
|
|
692
691
|
"search.filters.representationType": "",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "",
|
|
693
693
|
"search.filters.resourceType": "",
|
|
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": "",
|
|
704
707
|
"search.filters.summaryLabel.changeDate": "",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "",
|
|
705
710
|
"search.filters.summaryLabel.user": "",
|
|
711
|
+
"search.filters.temporalExtent": "",
|
|
706
712
|
"search.filters.title": "",
|
|
707
713
|
"search.filters.topic": "",
|
|
708
714
|
"search.filters.useSpatialFilter": "",
|
package/translations/pt.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "",
|
|
426
426
|
"map.addFromFile.placeholder": "",
|
|
427
427
|
"map.dropdown.placeholder": "",
|
|
428
|
-
"map.geocoding.placeholder": "",
|
|
429
428
|
"map.help.addFromFile": "",
|
|
430
429
|
"map.layer.add": "",
|
|
431
430
|
"map.layers.available": "",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "",
|
|
691
690
|
"search.filters.recordKind.service": "",
|
|
692
691
|
"search.filters.representationType": "",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "",
|
|
693
693
|
"search.filters.resourceType": "",
|
|
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": "",
|
|
704
707
|
"search.filters.summaryLabel.changeDate": "",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "",
|
|
705
710
|
"search.filters.summaryLabel.user": "",
|
|
711
|
+
"search.filters.temporalExtent": "",
|
|
706
712
|
"search.filters.title": "",
|
|
707
713
|
"search.filters.topic": "",
|
|
708
714
|
"search.filters.useSpatialFilter": "",
|
package/translations/sk.json
CHANGED
|
@@ -425,7 +425,6 @@
|
|
|
425
425
|
"map.add.layer.wms": "Z WMS",
|
|
426
426
|
"map.addFromFile.placeholder": "Kliknite na tlačidlo alebo sem vložte súbor",
|
|
427
427
|
"map.dropdown.placeholder": "",
|
|
428
|
-
"map.geocoding.placeholder": "Nájsť miesto",
|
|
429
428
|
"map.help.addFromFile": "Kliknite na tlačidlo alebo sem vložte súbor, ktorý chcete pridať do mapy (v súčasnosti podporuje iba formát GeoJSON).",
|
|
430
429
|
"map.layer.add": "Pridať",
|
|
431
430
|
"map.layers.available": "Dostupné vrsty",
|
|
@@ -690,19 +689,26 @@
|
|
|
690
689
|
"search.filters.recordKind.reuse": "",
|
|
691
690
|
"search.filters.recordKind.service": "",
|
|
692
691
|
"search.filters.representationType": "Typ reprezentácie",
|
|
692
|
+
"search.filters.resourceCreationRevisionDate": "",
|
|
693
693
|
"search.filters.resourceType": "Typ zdroja",
|
|
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": "Štandard",
|
|
704
707
|
"search.filters.summaryLabel.changeDate": "",
|
|
708
|
+
"search.filters.summaryLabel.resourceCreationRevisionDate": "",
|
|
709
|
+
"search.filters.summaryLabel.temporalExtent": "",
|
|
705
710
|
"search.filters.summaryLabel.user": "",
|
|
711
|
+
"search.filters.temporalExtent": "",
|
|
706
712
|
"search.filters.title": "Filtrovanie výsledkov",
|
|
707
713
|
"search.filters.topic": "Témy",
|
|
708
714
|
"search.filters.useSpatialFilter": "Najskôr zobraziť záznamy v oblasti záujmu",
|
|
File without changes
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
<gn-ui-search-input
|
|
2
|
-
[(value)]="searchText"
|
|
3
|
-
(valueChange)="onSearchChange($event)"
|
|
4
|
-
(keyup.enter)="onEnterPress()"
|
|
5
|
-
[placeholder]="'map.geocoding.placeholder' | translate"
|
|
6
|
-
>
|
|
7
|
-
</gn-ui-search-input>
|
|
8
|
-
@if (results && results.length) {
|
|
9
|
-
<ul
|
|
10
|
-
class="bg-gray-50 border border-gray-200 w-full mt-2 shadow-sm rounded-lg"
|
|
11
|
-
>
|
|
12
|
-
@for (result of results; track result) {
|
|
13
|
-
<li
|
|
14
|
-
(click)="zoomToLocation(result)"
|
|
15
|
-
class="flex items-center pl-8 pr-4 py-2 border-b border-gray-200 relative cursor-pointer hover:bg-blue-100 hover:text-gray-800 transition duration-300 ease-in-out"
|
|
16
|
-
>
|
|
17
|
-
<svg
|
|
18
|
-
class="stroke-current text-blue-500 absolute w-5 h-5 left-3 top-3"
|
|
19
|
-
xmlns="http://www.w3.org/2000/svg"
|
|
20
|
-
fill="none"
|
|
21
|
-
viewBox="0 0 24 24"
|
|
22
|
-
stroke="currentColor"
|
|
23
|
-
>
|
|
24
|
-
<path
|
|
25
|
-
stroke-linecap="round"
|
|
26
|
-
stroke-linejoin="round"
|
|
27
|
-
stroke-width="2"
|
|
28
|
-
d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"
|
|
29
|
-
/>
|
|
30
|
-
<path
|
|
31
|
-
stroke-linecap="round"
|
|
32
|
-
stroke-linejoin="round"
|
|
33
|
-
stroke-width="2"
|
|
34
|
-
d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
|
|
35
|
-
/>
|
|
36
|
-
</svg>
|
|
37
|
-
<span class="font-sans font-semibold ml-4">{{ result.label }}</span>
|
|
38
|
-
</li>
|
|
39
|
-
}
|
|
40
|
-
</ul>
|
|
41
|
-
}
|
|
@@ -1,112 +0,0 @@
|
|
|
1
|
-
import { Component, OnDestroy, inject } from '@angular/core'
|
|
2
|
-
import { catchError, firstValueFrom, from, Subject, takeUntil } from 'rxjs'
|
|
3
|
-
import { debounceTime, switchMap } from 'rxjs/operators'
|
|
4
|
-
import { GeocodingService } from '../geocoding.service'
|
|
5
|
-
import { MapFacade } from '../+state/map.facade'
|
|
6
|
-
|
|
7
|
-
import { SearchInputComponent } from '../../../../../../libs/ui/inputs/src'
|
|
8
|
-
import { TranslatePipe } from '@ngx-translate/core'
|
|
9
|
-
import { MapContextView } from '@geospatial-sdk/core'
|
|
10
|
-
|
|
11
|
-
@Component({
|
|
12
|
-
selector: 'gn-ui-geocoding',
|
|
13
|
-
templateUrl: './geocoding.component.html',
|
|
14
|
-
styleUrls: ['./geocoding.component.css'],
|
|
15
|
-
standalone: true,
|
|
16
|
-
imports: [SearchInputComponent, TranslatePipe],
|
|
17
|
-
})
|
|
18
|
-
export class GeocodingComponent implements OnDestroy {
|
|
19
|
-
private mapFacade = inject(MapFacade)
|
|
20
|
-
private geocodingService = inject(GeocodingService)
|
|
21
|
-
|
|
22
|
-
searchText = ''
|
|
23
|
-
results: any[] = []
|
|
24
|
-
searchTextChanged = new Subject<string>()
|
|
25
|
-
destroy$ = new Subject<void>()
|
|
26
|
-
errorMessage: string | null = null
|
|
27
|
-
|
|
28
|
-
constructor() {
|
|
29
|
-
this.searchTextChanged
|
|
30
|
-
.pipe(
|
|
31
|
-
debounceTime(300),
|
|
32
|
-
switchMap((searchText) => {
|
|
33
|
-
return from(this.geocodingService.query(searchText)).pipe(
|
|
34
|
-
catchError((error) => {
|
|
35
|
-
this.errorMessage =
|
|
36
|
-
'An error occurred while searching. Please try again.'
|
|
37
|
-
console.error(error)
|
|
38
|
-
return []
|
|
39
|
-
})
|
|
40
|
-
)
|
|
41
|
-
}),
|
|
42
|
-
takeUntil(this.destroy$)
|
|
43
|
-
)
|
|
44
|
-
.subscribe((results) => {
|
|
45
|
-
this.results = results
|
|
46
|
-
})
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
ngOnDestroy() {
|
|
50
|
-
this.destroy$.next()
|
|
51
|
-
this.destroy$.complete()
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
onSearchChange(searchText: string) {
|
|
55
|
-
if (!searchText) {
|
|
56
|
-
this.clearSearch()
|
|
57
|
-
return
|
|
58
|
-
} else {
|
|
59
|
-
this.searchTextChanged.next(searchText)
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
clearSearch() {
|
|
64
|
-
this.searchText = ''
|
|
65
|
-
this.results = []
|
|
66
|
-
this.errorMessage = null
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
async zoomToLocation(result: any) {
|
|
70
|
-
const geometry = result.geom
|
|
71
|
-
|
|
72
|
-
if (geometry.type === 'Point') {
|
|
73
|
-
await this.zoomToPoint(geometry.coordinates)
|
|
74
|
-
} else if (geometry.type === 'Polygon') {
|
|
75
|
-
await this.zoomToPolygon(geometry.coordinates)
|
|
76
|
-
} else {
|
|
77
|
-
console.error(`Unsupported geometry type: ${geometry.type}`)
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
async zoomToPoint(pointCoords: [number, number]) {
|
|
82
|
-
const context = await firstValueFrom(this.mapFacade.context$)
|
|
83
|
-
const view: MapContextView = {
|
|
84
|
-
center: pointCoords,
|
|
85
|
-
zoom: 10,
|
|
86
|
-
}
|
|
87
|
-
this.mapFacade.applyContext({
|
|
88
|
-
...context,
|
|
89
|
-
view,
|
|
90
|
-
})
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
async zoomToPolygon(polygonCoords: [[number, number][]]) {
|
|
94
|
-
const context = await firstValueFrom(this.mapFacade.context$)
|
|
95
|
-
const view: MapContextView = {
|
|
96
|
-
geometry: {
|
|
97
|
-
type: 'Polygon',
|
|
98
|
-
coordinates: polygonCoords,
|
|
99
|
-
},
|
|
100
|
-
}
|
|
101
|
-
this.mapFacade.applyContext({
|
|
102
|
-
...context,
|
|
103
|
-
view,
|
|
104
|
-
})
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
onEnterPress() {
|
|
108
|
-
if (this.results && this.results.length > 0) {
|
|
109
|
-
this.zoomToLocation(this.results[0])
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
import { Circle, Fill, Stroke, Style } from 'ol/style.js'
|
|
2
|
-
|
|
3
|
-
const colorPrimary = 'blue'
|
|
4
|
-
const colorSecondary = 'red'
|
|
5
|
-
const colorStroke = 'white'
|
|
6
|
-
|
|
7
|
-
export const defaultMapStyleFixture = (): Style =>
|
|
8
|
-
new Style({
|
|
9
|
-
image: new Circle({
|
|
10
|
-
fill: new Fill({
|
|
11
|
-
color: colorPrimary,
|
|
12
|
-
}),
|
|
13
|
-
stroke: new Stroke({
|
|
14
|
-
color: colorStroke,
|
|
15
|
-
width: 2,
|
|
16
|
-
}),
|
|
17
|
-
radius: 5,
|
|
18
|
-
}),
|
|
19
|
-
fill: new Fill({
|
|
20
|
-
color: 'rgba(0,0,255,0.25)',
|
|
21
|
-
}),
|
|
22
|
-
stroke: new Stroke({
|
|
23
|
-
color: colorStroke,
|
|
24
|
-
width: 2,
|
|
25
|
-
}),
|
|
26
|
-
})
|
|
27
|
-
|
|
28
|
-
export const defaultMapStyleHlFixture = (): Style =>
|
|
29
|
-
new Style({
|
|
30
|
-
image: new Circle({
|
|
31
|
-
fill: new Fill({
|
|
32
|
-
color: colorSecondary,
|
|
33
|
-
}),
|
|
34
|
-
stroke: new Stroke({
|
|
35
|
-
color: colorStroke,
|
|
36
|
-
width: 3,
|
|
37
|
-
}),
|
|
38
|
-
radius: 6,
|
|
39
|
-
}),
|
|
40
|
-
fill: new Fill({
|
|
41
|
-
color: 'rgba(255,0,0,0.25)',
|
|
42
|
-
}),
|
|
43
|
-
stroke: new Stroke({
|
|
44
|
-
color: colorSecondary,
|
|
45
|
-
width: 3,
|
|
46
|
-
}),
|
|
47
|
-
})
|
|
@@ -1,108 +0,0 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core'
|
|
2
|
-
import { getThemeConfig, isConfigLoaded } from '../../../../../../libs/util/app-config/src'
|
|
3
|
-
import chroma from 'chroma-js'
|
|
4
|
-
import Feature from 'ol/Feature.js'
|
|
5
|
-
import { Fill, Stroke, Style } from 'ol/style.js'
|
|
6
|
-
import CircleStyle from 'ol/style/Circle.js'
|
|
7
|
-
import { StyleLike } from 'ol/style/Style.js'
|
|
8
|
-
|
|
9
|
-
export interface CreateStyleOptions {
|
|
10
|
-
color: string
|
|
11
|
-
isFocused?: boolean
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
export type StyleByGeometryType = {
|
|
15
|
-
line: Style | Style[]
|
|
16
|
-
polygon: Style | Style[]
|
|
17
|
-
point: Style | Style[]
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
@Injectable({
|
|
21
|
-
providedIn: 'root',
|
|
22
|
-
})
|
|
23
|
-
export class MapStyleService {
|
|
24
|
-
styles = {
|
|
25
|
-
default: this.createStyleFunction(
|
|
26
|
-
this.createGeometryStyles({
|
|
27
|
-
color: isConfigLoaded() ? getThemeConfig().PRIMARY_COLOR : 'blue',
|
|
28
|
-
})
|
|
29
|
-
),
|
|
30
|
-
defaultHL: this.createStyleFunction(
|
|
31
|
-
this.createGeometryStyles({
|
|
32
|
-
color: isConfigLoaded() ? getThemeConfig().SECONDARY_COLOR : 'red',
|
|
33
|
-
isFocused: true,
|
|
34
|
-
})
|
|
35
|
-
),
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
createGeometryStyles(options: CreateStyleOptions): StyleByGeometryType {
|
|
39
|
-
const { color, isFocused } = options
|
|
40
|
-
const zIndex = isFocused ? 10 : undefined
|
|
41
|
-
return {
|
|
42
|
-
polygon: new Style({
|
|
43
|
-
fill: new Fill({
|
|
44
|
-
color: this.computeTransparentFillColor(color),
|
|
45
|
-
}),
|
|
46
|
-
stroke: new Stroke({
|
|
47
|
-
color: 'white',
|
|
48
|
-
width: 2,
|
|
49
|
-
}),
|
|
50
|
-
zIndex,
|
|
51
|
-
}),
|
|
52
|
-
point: new Style({
|
|
53
|
-
image: new CircleStyle({
|
|
54
|
-
fill: new Fill({
|
|
55
|
-
color,
|
|
56
|
-
}),
|
|
57
|
-
stroke: new Stroke({
|
|
58
|
-
color: 'white',
|
|
59
|
-
width: isFocused ? 3 : 2,
|
|
60
|
-
}),
|
|
61
|
-
radius: isFocused ? 8 : 7,
|
|
62
|
-
}),
|
|
63
|
-
zIndex,
|
|
64
|
-
}),
|
|
65
|
-
line: [
|
|
66
|
-
new Style({
|
|
67
|
-
stroke: new Stroke({
|
|
68
|
-
color: 'white',
|
|
69
|
-
width: isFocused ? 8 : 6,
|
|
70
|
-
}),
|
|
71
|
-
zIndex,
|
|
72
|
-
}),
|
|
73
|
-
new Style({
|
|
74
|
-
stroke: new Stroke({
|
|
75
|
-
color,
|
|
76
|
-
width: isFocused ? 3 : 2,
|
|
77
|
-
}),
|
|
78
|
-
zIndex,
|
|
79
|
-
}),
|
|
80
|
-
],
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
createStyleFunction(styleByGeometryType: StyleByGeometryType): StyleLike {
|
|
85
|
-
return (feature: Feature): Style | Style[] => {
|
|
86
|
-
const geometryType = feature?.getGeometry()?.getType()
|
|
87
|
-
switch (geometryType) {
|
|
88
|
-
case 'LinearRing':
|
|
89
|
-
case 'LineString':
|
|
90
|
-
case 'MultiLineString':
|
|
91
|
-
return styleByGeometryType.line
|
|
92
|
-
case 'Point':
|
|
93
|
-
case 'MultiPoint':
|
|
94
|
-
return styleByGeometryType.point
|
|
95
|
-
case 'Circle':
|
|
96
|
-
case 'Polygon':
|
|
97
|
-
case 'MultiPolygon':
|
|
98
|
-
return styleByGeometryType.polygon
|
|
99
|
-
default:
|
|
100
|
-
return styleByGeometryType.point
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
private computeTransparentFillColor(color: string, alpha = 0.25): string {
|
|
106
|
-
return chroma(color).alpha(alpha).css()
|
|
107
|
-
}
|
|
108
|
-
}
|