Add option to hide map filter geometry

qgis · Apr 22, 2024 · c7cba56 · c7cba56
1 parent cf25a92
commit c7cba56
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 8 deletions.
diff --git a/components/MapSelection.jsx b/components/MapSelection.jsx
@@ -19,22 +19,24 @@ import MeasureUtils from '../utils/MeasureUtils';
 
 class MapSelection extends React.Component {
     static propTypes = {
-        /* Whether the selection tool is active */
+        /** Whether the selection tool is active */
         active: PropTypes.bool,
-        /* Optional, a css-cursor to use when drawing */
+        /** Optional, a css-cursor to use when drawing */
         cursor: PropTypes.string,
-        /* The selection geometry type (Point, LineString, Polygon, Circle, DragBox, Box) */
+        /** The selection geometry type (Point, LineString, Polygon, Circle, DragBox, Box) */
         geomType: PropTypes.string,
-        /* Initial geometry or geometry to update. */
+        /** Initial geometry or geometry to update. */
         geometry: PropTypes.object,
-        /* The callback which is invoked with a drawn geometry. */
+        /** The callback which is invoked with a drawn geometry. */
         geometryChanged: PropTypes.func,
-        /* Whether to show measurements while drawing. */
+        /** Whether to hide the current selection (except while drawing). */
+        hideGeometry: PropTypes.bool,
+        /** Whether to show measurements while drawing. */
         measure: PropTypes.bool,
         projection: PropTypes.string,
-        /* Optional: the selection feature style name. */
+        /** Optional: the selection feature style name. */
         styleName: PropTypes.string,
-        /* Optional: the selection feature style options. */
+        /** Optional: the selection feature style options. */
         styleOptions: PropTypes.object
     };
     static defaultProps = {
@@ -64,6 +66,9 @@ class MapSelection extends React.Component {
         }
     }
     componentDidUpdate(prevProps, prevState) {
+        if (this.props.hideGeometry !== prevProps.hideGeometry) {
+            this.selectionLayer.setVisible(!this.props.hideGeometry);
+        }
         if (this.props.geomType !== prevProps.geomType) {
             this.selectionLayer.getSource().clear();
         }

diff --git a/plugins/MapFilter.jsx b/plugins/MapFilter.jsx
@@ -315,6 +315,7 @@ class MapFilter extends React.Component {
                 geomType={selGeomType}
                 geometry={this.state.geomFilter?.geom}
                 geometryChanged={this.setFilterGeometry}
+                hideGeometry={this.state.geomFilter?.hideFilterGeom}
                 key="MapSelection"
                 styleOptions={this.props.highlightStyle} />
         ];
@@ -545,6 +546,9 @@ class MapFilter extends React.Component {
                 </div>
                 <div className="map-filter-entry-body">
                     <ButtonBar active={active} buttons={filterButtons} onClick={this.triggerGeometryFilter} />
+                    <div>
+                        <label><input checked={!!geomFilter.hideFilterGeom} onChange={this.toggleHideFilterGeom} type="checkbox" /> {LocaleUtils.tr("mapfilter.hidefiltergeom")}</label>
+                    </div>
                 </div>
             </div>
         );
@@ -562,6 +566,9 @@ class MapFilter extends React.Component {
     filterGeomPicked = (layer, feature) => {
         this.setState((state) => ({geomFilter: {...state.geomFilter, geom: feature.geometry, geomType: feature.geometry.type}}));
     };
+    toggleHideFilterGeom = (ev) => {
+        this.setState((state) => ({geomFilter: {...state.geomFilter, hideFilterGeom: ev.target.checked}}));
+    };
     toggleFilter = (filterId, active) => {
         this.setState((state) => ({
             filters: {

diff --git a/translations/ca-ES.json b/translations/ca-ES.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/cs-CZ.json b/translations/cs-CZ.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/de-CH.json b/translations/de-CH.json
@@ -283,6 +283,7 @@
       "brokenrendering": "Die Kartendarstellung könnte aufgrund eines ungültigen Filterausdrucks fehlerhaft sein",
       "cancel": "Abbrechen",
       "geomfilter": "Geometrie",
+      "hidefiltergeom": "Filtergeometrie ausblenden",
       "invalidfilter": "Ungültiger Filterausdruck",
       "save": "Speichern",
       "select": "Auswählen...",

diff --git a/translations/de-DE.json b/translations/de-DE.json
@@ -283,6 +283,7 @@
       "brokenrendering": "Die Kartendarstellung könnte aufgrund eines ungültigen Filterausdrucks fehlerhaft sein",
       "cancel": "Abbrechen",
       "geomfilter": "Geometrie",
+      "hidefiltergeom": "",
       "invalidfilter": "Ungültiger Filterausdruck",
       "save": "Speichern",
       "select": "Auswählen...",

diff --git a/translations/en-US.json b/translations/en-US.json
@@ -283,6 +283,7 @@
       "brokenrendering": "Map rendering may be broken due to an invalid filter expression",
       "cancel": "Cancel",
       "geomfilter": "Geometry",
+      "hidefiltergeom": "Hide filter geometry",
       "invalidfilter": "Invalid filter expression",
       "save": "Save",
       "select": "Select...",

diff --git a/translations/es-ES.json b/translations/es-ES.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/fi-FI.json b/translations/fi-FI.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/fr-FR.json b/translations/fr-FR.json
@@ -283,6 +283,7 @@
       "brokenrendering": "Le rendu de la carte peut être interrompu à cause d'une expression filtre invalide",
       "cancel": "Annuler",
       "geomfilter": "Géométrique",
+      "hidefiltergeom": "Masquer la géométrie du filtre",
       "invalidfilter": "Expression de filtre non valide",
       "save": "Enregistrer",
       "select": "Sélectionner...",

diff --git a/translations/hu-HU.json b/translations/hu-HU.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/it-IT.json b/translations/it-IT.json
@@ -283,6 +283,7 @@
       "brokenrendering": "Il rendering della mappa potrebbe essere interrotto a causa di un'espressione filtro invalida",
       "cancel": "Annulla",
       "geomfilter": "Geometrico",
+      "hidefiltergeom": "Nascondi geometria filtro",
       "invalidfilter": "Espressione filtro non valida",
       "save": "Salva",
       "select": "Seleziona...",

diff --git a/translations/no-NO.json b/translations/no-NO.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/pl-PL.json b/translations/pl-PL.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/pt-BR.json b/translations/pt-BR.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/pt-PT.json b/translations/pt-PT.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/ro-RO.json b/translations/ro-RO.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/ru-RU.json b/translations/ru-RU.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/sv-SE.json b/translations/sv-SE.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/tr-TR.json b/translations/tr-TR.json
@@ -283,6 +283,7 @@
       "brokenrendering": "",
       "cancel": "",
       "geomfilter": "",
+      "hidefiltergeom": "",
       "invalidfilter": "",
       "save": "",
       "select": "",

diff --git a/translations/tsconfig.json b/translations/tsconfig.json
@@ -246,6 +246,7 @@
     "mapfilter.brokenrendering",
     "mapfilter.cancel",
     "mapfilter.geomfilter",
+    "mapfilter.hidefiltergeom",
     "mapfilter.invalidfilter",
     "mapfilter.save",
     "mapfilter.select",