added multiple filters

app.py

@@ -34,10 +34,12 @@ def to_streamlit(
     except Exception as e:
         raise Exception(e)
 
+from huggingface_hub import create_branch, create_tag
+create_branch("boettiger-lab/ca-30x30", repo_type="space", branch="feat")
 
 ca_pmtiles = "https://huggingface.co/datasets/boettiger-lab/ca-30x30/resolve/main/ca2024-tippe.pmtiles"
-# ca_parquet = "https://huggingface.co/datasets/boettiger-lab/ca-30x30/resolve/main/ca2024.parquet"
-ca_parquet = "ca2024.parquet"
+ca_parquet = "https://huggingface.co/datasets/boettiger-lab/ca-30x30/resolve/main/ca2024.parquet"
+# ca_parquet = "ca2024.parquet"
 
 ca_area_acres = 1.014e8 #acres 
 style_choice = "GAP Status Code"
@@ -49,17 +51,29 @@ ca = (con
       .cast({"geom": "geometry"})
      )
 
-private_color = "#DE881E" # orange #"#850101" # red
+private_access_color = "#DE881E" # orange #"#850101" # red
+public_access_color = "#3388ff" # blue
 tribal_color = "#BF40BF" # purple
 mixed_color = "#005a00" # green
-public_color = "#3388ff" # blue
 year2023_color = "#26542C" # green
 year2024_color = "#F3AB3D" # orange 
 
+federal_color = "#529642" # green
+state_color = "#A1B03D" # light green
+local_color = "#365591" # blue
+special_color = "#529642" # brown
+private_color = "#7A3F1A" # brown
+joint_color = "#DAB0AE" # pink
+county_color = "#BFD76B" # green
+city_color = "#BDC368" #green
+hoa_color = "#A89BBC" # purple
+nonprofit_color =  "#D77031" #orange
+
 
 def summary_table(column, colors):
         
     df = (ca
+        .filter(_.reGAP <3)
         .group_by(column)
         .aggregate(percent_protected =  100 * _.Acres.sum() / ca_area_acres)
         .mutate(percent_protected = _.percent_protected.round(1),
@@ -128,28 +142,63 @@ def filter_pmtiles(paint, alpha, column, items):
             }
         }]}
 
+
+def filter_pmtiles(paint, alpha, cols, values):
+    filters = []
+    
+    for col, val in zip(cols, values):
+        # Create the filter for each column
+        filter_condition = ["match", ["get", col], val, True, False]
+        filters.append(filter_condition)
+    combined_filter = ["all"] + filters
+
+    return {
+        "version": 8,
+        "sources": {
+            "ca": {
+                "type": "vector",
+                "url": "pmtiles://" + ca_pmtiles,
+            }
+        },
+        "layers": [{
+            "id": "ca30x30",
+            "source": "ca",
+            "source-layer": "ca2024",
+            "type": "fill",
+            "filter": combined_filter,  # Use the combined filter
+            "paint": {
+                "fill-color": paint,
+                "fill-opacity": alpha
+            }
+        }]
+    }
+
+
 def getButtons(style_options, style_choice):
     column = style_options[style_choice]['property']
     opts = [style[0] for style in style_options[style_choice]['stops']]
-    buttons = {name: st.checkbox(f"{name}", value = True) for name in opts} 
-    return column, buttons
-            
+    buttons = {name: st.checkbox(f"{name}", value = False, key = column+str(name)) for name in opts} 
+    filter_choice = [key for key, value in buttons.items() if value] #return only the options selected
+    d = {}
+    d[column] = filter_choice
+    return d
+
 
 manager = {
             'property': 'manager_type',
             'type': 'categorical',
             'stops': [
-                ['Federal', "darkblue"],
-                ['State', public_color],
-                ['Non Profit', "orange"],
-                ['Special District', "darkgreen"],
+                ['Federal', federal_color],
+                ['State', state_color],
+                ['Non Profit', nonprofit_color],
+                ['Special District', special_color],
                 ['Unknown', "grey"],
-                ['County', "lightblue"],
-                ['City', "pink"],
-                ['Joint', "green"],
+                ['County', county_color],
+                ['City', city_color],
+                ['Joint', joint_color],
                 ['Tribal', tribal_color],
-                ['Private', "darkred"],
-                ['Home Owners Association', "lightgreen"]
+                ['Private', private_color],
+                ['Home Owners Association', hoa_color]
             ]
             }
 
@@ -158,8 +207,8 @@ easement = {
             'property': 'Easement',
             'type': 'categorical',
             'stops': [
-                [0, public_color],
-                [1, private_color]
+                [0, public_access_color],
+                [1, private_access_color]
             ]
             }
 
@@ -178,8 +227,8 @@ access = {
     'property': 'access_type',
     'type': 'categorical',
     'stops': [
-        ['Open Access', public_color],
-        ['No Public Access', private_color],
+        ['Open Access', public_access_color],
+        ['No Public Access', private_access_color],
         ['Unknown Access', "grey"],
         ['Restricted Access', tribal_color]
     ]
@@ -192,16 +241,16 @@ gap = {
         'type': 'categorical',
         'stops': [
             [1, "#26633d"],
-            [2, "#879647"]
-            # [3, "#BBBBBB"],
-            # [4, "#F8F8F8"]
+            [2, "#879647"],
+            [3, "#BBBBBB"],
+            [4, "#F8F8F8"]
         ]
         }
 
 
 style_options = {
                     "GAP Status Code": gap,
-                    "Management Agency": manager,
+                    "Manager Type": manager,
                     "Easement": easement,
                     "Public Access": access,
                     "Year": year
@@ -216,44 +265,46 @@ st.set_page_config(layout="wide", page_title="CA Protected Areas Explorer", page
 '''
 
 m = leafmap.Map(style="positron")
+filters = {}
 
 with st.sidebar:
-    
-    if st.toggle("Protected Areas", True):
-        alpha = st.slider("transparency", 0.0, 1.0, 0.5)
-        style_choice = st.radio("Color by:", style_options)
+    color_choice = st.radio("Color by:", style_options)
+    alpha = st.slider("transparency", 0.0, 1.0, 0.5)
+    st.text("Filters:")
 
+    for label in style_options:
+        with st.expander(label):
+            opts = getButtons(style_options, label)
+            filters.update(opts)
 
-        with st.expander(style_choice, expanded=True):
-            column, buttons = getButtons(style_options, style_choice)
-            option_choice = [key for key, value in buttons.items() if value] #return only the options selected
-            
-            # If any options are selected, apply the filter
-            if option_choice:
-                style = filter_pmtiles(style_options[style_choice], alpha, column, option_choice)
-                m.add_pmtiles(ca_pmtiles, style=style, visible=True, name="CA", opacity=alpha, tooltip=True)
+    selected = {k: v for k, v in filters.items() if v}
+    if selected:
+        cols = list(selected.keys())
+        vals = list(selected.values())
+        style = filter_pmtiles(style_options[color_choice], alpha, cols, vals)
+        m.add_pmtiles(ca_pmtiles, style=style, visible=True, name="CA", opacity=alpha, tooltip=True)
 
 
 
 select_column = {
                 "GAP Status Code": "reGAP",
-                "Management Agency": "manager_type",
+                "Manager Type": "manager_type",
                 "Easement": "Easement",
                 "Year": "established",
                 "Public Access": "access_type"}
 
 
-column = select_column[style_choice]
+column = select_column[color_choice]
 
 select_colors = {
-                "Management Agency": manager["stops"],
+                "Manager Type": manager["stops"],
                 "Easement": easement["stops"],
                 "Public Access": access["stops"],
                 "Year": year["stops"],
                 "GAP Status Code": gap["stops"]}
 
 colors = (ibis
-          .memtable(select_colors[style_choice], columns = [column, "color"])
+          .memtable(select_colors[color_choice], columns = [column, "color"])
           .to_pandas()
          )