Update submodule, add FeatureSearch plugin config

qgis · Oct 16, 2023 · c2dd760 · c2dd760
1 parent 473c5d2
commit c2dd760
Show file tree

Hide file tree

Showing 17 changed files with 106 additions and 2 deletions.
diff --git a/js/appConfig.js b/js/appConfig.js
@@ -55,6 +55,7 @@ import RedliningPlugin from 'qwc2/plugins/Redlining';
 import RoutingPlugin from 'qwc2/plugins/Routing';
 import ScratchDrawingPlugin from 'qwc2/plugins/ScratchDrawing';
 import SearchBox from 'qwc2/components/SearchBox';
+import FeatureSearchPlugin from 'qwc2/plugins/FeatureSearch';
 import SettingsPlugin from 'qwc2/plugins/Settings';
 import SharePlugin from 'qwc2/plugins/Share';
 import StartupMarkerPlugin from 'qwc2/plugins/StartupMarker';
@@ -119,6 +120,7 @@ export default {
                 BufferSupport: BufferSupport
             }),
             RoutingPlugin: RoutingPlugin(SearchProviders),
+            FeatureSearchPlugin: FeatureSearchPlugin,
             ScratchDrawingPlugin: ScratchDrawingPlugin,
             SettingsPlugin: SettingsPlugin,
             SharePlugin: SharePlugin,

diff --git a/qwc2 b/qwc2
diff --git a/static/config.json b/static/config.json
@@ -130,6 +130,7 @@
             {"key": "LayerTree", "icon": "layers", "shortcut": "alt+shift+l"},
             {"key": "MapLegend", "icon": "list-alt"},
             {"key": "LayerCatalog", "icon": "catalog", "shortcut": "alt+shift+c"},
+            {"key": "FeatureSearch", "icon": "search"},
             {"key": "Share", "icon": "share", "shortcut": "alt+shift+s"},
             {"key": "Bookmark", "icon": "bookmark", "shortcut": "alt+shift+b"},
             {"key": "Tools", "icon": "tools", "subitems": [
@@ -391,6 +392,9 @@
       },
       {
         "name": "Routing"
+      },
+      {
+        "name": "FeatureSearch"
       }
     ],
     "mobile": [

diff --git a/static/translations/cs-CZ.json b/static/translations/cs-CZ.json
@@ -9,6 +9,7 @@
         "DxfExport": "DXF Export",
         "Editing": "Úpravy",
         "FeatureForm": "Editační formulář",
+        "FeatureSearch": "",
         "Help": "Nápověda",
         "IdentifyPoint": "Informace o bodu",
         "IdentifyRegion": "Informace o oblasti",
@@ -151,6 +152,12 @@
       "querying": "Načítání...",
       "title": "Editační formulář"
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "Soubory",
       "placeholder": "Vybrat soubor..."

diff --git a/static/translations/de-CH.json b/static/translations/de-CH.json
@@ -9,6 +9,7 @@
         "DxfExport": "DXF-Export",
         "Editing": "Editieren",
         "FeatureForm": "Objektformular",
+        "FeatureSearch": "Objektsuche",
         "Help": "Hilfe",
         "IdentifyPoint": "Punkt abfragen",
         "IdentifyRegion": "Region abfragen",
@@ -151,6 +152,12 @@
       "querying": "Objekte werden abgefragt...",
       "title": "Objektformular"
     },
+    "featuresearch": {
+      "noresults": "Keine Ergebnisse",
+      "query": "Begriff",
+      "select": "Auswählen...",
+      "title": "Objektsuche"
+    },
     "fileselector": {
       "files": "Dateien",
       "placeholder": "Datei auswählen"

diff --git a/static/translations/de-DE.json b/static/translations/de-DE.json
@@ -9,6 +9,7 @@
         "DxfExport": "DXF-Export",
         "Editing": "Editieren",
         "FeatureForm": "Objektformular",
+        "FeatureSearch": "Objektsuche",
         "Help": "Hilfe",
         "IdentifyPoint": "Punkt abfragen",
         "IdentifyRegion": "Region abfragen",
@@ -151,6 +152,12 @@
       "querying": "Objekte werden abgefragt...",
       "title": "Objektformular"
     },
+    "featuresearch": {
+      "noresults": "Keine Ergebnisse",
+      "query": "Begriff",
+      "select": "Auswählen...",
+      "title": "Objektsuche"
+    },
     "fileselector": {
       "files": "Dateien",
       "placeholder": "Datei auswählen"

diff --git a/static/translations/en-US.json b/static/translations/en-US.json
@@ -9,6 +9,7 @@
         "DxfExport": "DXF Export",
         "Editing": "Editing",
         "FeatureForm": "Feature Form",
+        "FeatureSearch": "Feature Search",
         "Help": "Help",
         "IdentifyPoint": "Identify Point",
         "IdentifyRegion": "Identify Region",
@@ -151,6 +152,12 @@
       "querying": "Querying...",
       "title": "Feature form"
     },
+    "featuresearch": {
+      "noresults": "No results",
+      "query": "Query",
+      "select": "Select...",
+      "title": "Feature search"
+    },
     "fileselector": {
       "files": "files",
       "placeholder": "Select file..."

diff --git a/static/translations/es-ES.json b/static/translations/es-ES.json
@@ -9,6 +9,7 @@
         "DxfExport": "Exportar DXF",
         "Editing": "Editando",
         "FeatureForm": "Formulario de Elemento",
+        "FeatureSearch": "",
         "Help": "Ayuda",
         "IdentifyPoint": "Identificar punto",
         "IdentifyRegion": "Identificar zona",
@@ -151,6 +152,12 @@
       "querying": "Consultando...",
       "title": "Formulario de elemento"
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "archivos",
       "placeholder": "Seleccionar archivo..."

diff --git a/static/translations/fr-FR.json b/static/translations/fr-FR.json
@@ -9,6 +9,7 @@
         "DxfExport": "Export DXF",
         "Editing": "Editer",
         "FeatureForm": "Formulaire d'objet",
+        "FeatureSearch": "Recherche objet",
         "Help": "Aide",
         "IdentifyPoint": "Interroger point",
         "IdentifyRegion": "Interroger la région",
@@ -146,11 +147,17 @@
       "unsavedchanged": "Il y a des modifications non enregistrées. Faut-il quand même quitter la page?"
     },
     "featureform": {
-      "feature": "Object",
+      "feature": "Objet",
       "noresults": "Pas de résultats",
       "querying": "Identification en cours...",
       "title": "Formulaire d'objet"
     },
+    "featuresearch": {
+      "noresults": "Pas de résultats",
+      "query": "Terme",
+      "select": "Sélectionner",
+      "title": "Recherche objet"
+    },
     "fileselector": {
       "files": "Fichiers",
       "placeholder": "Choisir un fichier..."

diff --git a/static/translations/it-IT.json b/static/translations/it-IT.json
@@ -9,6 +9,7 @@
         "DxfExport": "Esporta su DXF",
         "Editing": "Strumenti di modifica",
         "FeatureForm": "Formulario oggetto",
+        "FeatureSearch": "Ricerca oggetto",
         "Help": "Aiuto",
         "IdentifyPoint": "Identifica punto",
         "IdentifyRegion": "Identifica in un poligono",
@@ -151,6 +152,12 @@
       "querying": "Caricando...",
       "title": "Formulario oggetto"
     },
+    "featuresearch": {
+      "noresults": "Nessun risultato",
+      "query": "Ricerca",
+      "select": "Seleziona",
+      "title": "Ricerca oggetto"
+    },
     "fileselector": {
       "files": "File",
       "placeholder": "Seleziona file..."

diff --git a/static/translations/pl-PL.json b/static/translations/pl-PL.json
@@ -9,6 +9,7 @@
         "DxfExport": "Eksport DXF",
         "Editing": "Edycja",
         "FeatureForm": "",
+        "FeatureSearch": "",
         "Help": "Pomoc",
         "IdentifyPoint": "",
         "IdentifyRegion": "Identifikuj Obszar",
@@ -151,6 +152,12 @@
       "querying": "",
       "title": ""
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "",
       "placeholder": "Wybierz plik..."

diff --git a/static/translations/pt-BR.json b/static/translations/pt-BR.json
@@ -9,6 +9,7 @@
         "DxfExport": "Exportar DXF",
         "Editing": "Editando",
         "FeatureForm": "",
+        "FeatureSearch": "",
         "Help": "Ajuda",
         "IdentifyPoint": "",
         "IdentifyRegion": "Identificar zona",
@@ -151,6 +152,12 @@
       "querying": "",
       "title": ""
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "",
       "placeholder": "Selecione ficheiro..."

diff --git a/static/translations/pt-PT.json b/static/translations/pt-PT.json
@@ -9,6 +9,7 @@
         "DxfExport": "Exportar DXF",
         "Editing": "Editando",
         "FeatureForm": "",
+        "FeatureSearch": "",
         "Help": "Ajuda",
         "IdentifyPoint": "",
         "IdentifyRegion": "Identificar zona",
@@ -151,6 +152,12 @@
       "querying": "",
       "title": ""
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "",
       "placeholder": "Selecione ficheiro..."

diff --git a/static/translations/ro-RO.json b/static/translations/ro-RO.json
@@ -9,6 +9,7 @@
         "DxfExport": "Export DXF",
         "Editing": "Editare",
         "FeatureForm": "Editare atribute",
+        "FeatureSearch": "",
         "Help": "Ajutor",
         "IdentifyPoint": "Interogare punct",
         "IdentifyRegion": "Interogare regiune",
@@ -151,6 +152,12 @@
       "querying": "Interogare...",
       "title": "Formular obiecte spațiale"
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "fișiere",
       "placeholder": "Selectează fișierul..."

diff --git a/static/translations/ru-RU.json b/static/translations/ru-RU.json
@@ -9,6 +9,7 @@
         "DxfExport": "Экспорт в DXF",
         "Editing": "Правка",
         "FeatureForm": "",
+        "FeatureSearch": "",
         "Help": "Помощь",
         "IdentifyPoint": "",
         "IdentifyRegion": "Определить регион",
@@ -151,6 +152,12 @@
       "querying": "",
       "title": ""
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "",
       "placeholder": "Выберите файл..."

diff --git a/static/translations/sv-SE.json b/static/translations/sv-SE.json
@@ -9,6 +9,7 @@
         "DxfExport": "DXF Export",
         "Editing": "Redigera",
         "FeatureForm": "",
+        "FeatureSearch": "",
         "Help": "Hjälp",
         "IdentifyPoint": "",
         "IdentifyRegion": "Identifiera med område",
@@ -151,6 +152,12 @@
       "querying": "",
       "title": ""
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "",
       "placeholder": "Välj fil..."

diff --git a/static/translations/tr-TR.json b/static/translations/tr-TR.json
@@ -9,6 +9,7 @@
         "DxfExport": "DXF'e Veri Aktar",
         "Editing": "Düzenleme",
         "FeatureForm": "",
+        "FeatureSearch": "",
         "Help": "Yardım",
         "IdentifyPoint": "",
         "IdentifyRegion": "Bölgeden Bilgi Al",
@@ -151,6 +152,12 @@
       "querying": "",
       "title": ""
     },
+    "featuresearch": {
+      "noresults": "",
+      "query": "",
+      "select": "",
+      "title": ""
+    },
     "fileselector": {
       "files": "",
       "placeholder": "Dosya seç..."
+6 −0		.gitignore
+0 −3		.gitmodules
+15 −5		components/IdentifyViewer.jsx
+1 −1		components/Search.jsx
+2 −1		components/SearchBox.jsx
+10 −1		doc/plugins.md
+1 −1		package.json
+182 −0		plugins/FeatureSearch.jsx
+59 −0		plugins/style/FeatureSearch.css
+15 −2		selectors/searchproviders.js
+7 −0		translations/ca-ES.json
+7 −0		translations/cs-CZ.json
+7 −0		translations/de-CH.json
+7 −0		translations/de-DE.json
+7 −0		translations/en-US.json
+7 −0		translations/es-ES.json
+7 −0		translations/fi-FI.json
+8 −1		translations/fr-FR.json
+7 −0		translations/hu-HU.json
+7 −0		translations/it-IT.json
+7 −0		translations/no-NO.json
+7 −0		translations/pl-PL.json
+7 −0		translations/pt-BR.json
+7 −0		translations/pt-PT.json
+7 −0		translations/ro-RO.json
+7 −0		translations/ru-RU.json
+7 −0		translations/sv-SE.json
+7 −0		translations/tr-TR.json
+5 −0		translations/tsconfig.json
+1 −1		utils/IdentifyUtils.js
+12 −1		utils/MiscUtils.js