From 9e0ee8723d49e3455866d7d6b7734855f5fe089d Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Sun, 26 May 2024 19:08:48 -0400
Subject: [PATCH] Better layer click logic

---
 app/static/app/js/components/LayersControlLayer.jsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/static/app/js/components/LayersControlLayer.jsx b/app/static/app/js/components/LayersControlLayer.jsx
index 8a0405a2d..765417881 100644
--- a/app/static/app/js/components/LayersControlLayer.jsx
+++ b/app/static/app/js/components/LayersControlLayer.jsx
@@ -109,7 +109,7 @@ export default class LayersControlLayer extends React.Component {
     }
   }
 
-  handleLayerClick = () => {
+  handleZoomToClick = () => {
     const { layer } = this.props;
 
     const bounds = layer.options.bounds !== undefined ? 
@@ -120,6 +120,14 @@ export default class LayersControlLayer extends React.Component {
     if (layer.getPopup()) layer.openPopup();
   }
 
+  handleLayerClick = () => {
+    if (this.props.overlay){
+        this.setState({visible: !this.state.visible});
+    }else{
+        this.setState({expanded: !this.state.expanded});
+    }
+  }
+
   handleSelectColor = e => {
     this.setState({colorMap: e.target.value});
   }
@@ -289,7 +297,7 @@ export default class LayersControlLayer extends React.Component {
     return (<div className="layers-control-layer">
         <div className="layer-control-title">
             {!this.props.overlay ? <ExpandButton bind={[this, 'expanded']} /> : <div className="paddingSpace"></div>}<Checkbox bind={[this, 'visible']}/>
-            <a title={meta.name} className="layer-label" href="javascript:void(0);" onClick={this.handleLayerClick}><i className={"layer-icon " + (meta.icon || "fa fa-vector-square fa-fw")}></i><div className="layer-title">{meta.name}</div></a>
+            <a title={meta.name} className="layer-label" href="javascript:void(0);" onClick={this.handleLayerClick}><i className={"layer-icon " + (meta.icon || "fa fa-vector-square fa-fw")}></i><div className="layer-title">{meta.name}</div></a> <a href="javascript:void(0)" onClick={this.handleZoomToClick}><i title={_("Zoom To")} className="fa fa-expand"></i></a>
         </div>
 
         {this.state.expanded ?