adding filters to app

app.py

@@ -35,7 +35,8 @@ def to_streamlit(
         raise Exception(e)
 
 
-ca_pmtiles = "https://huggingface.co/datasets/boettiger-lab/ca-30x30/resolve/main/ca2024.pmtiles"
+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_area_acres = 1.014e8 #acres 
@@ -48,8 +49,6 @@ ca = (con
       .cast({"geom": "geometry"})
      )
 
-# gdf = ca.head(250).execute() #workaround since the data is too large...
-
 private_color = "#DE881E" # orange #"#850101" # red
 tribal_color = "#BF40BF" # purple
 mixed_color = "#005a00" # green
@@ -99,17 +98,42 @@ def pad_style(paint, alpha):
             "url": "pmtiles://" + ca_pmtiles,
         }},
     "layers": [{
-            "id": "layer1",
+            "id": "ca30x30",
+            "source": "ca",
+            "source-layer": "ca2024",
+            "type": "fill",
+            "paint": {
+                "fill-color": paint,
+                "fill-opacity": alpha
+            }
+        }]}
+
+def filter_pmtiles(paint, alpha, column, items):
+    return {
+    "version": 8,
+    "sources": {
+        "ca": {
+            "type": "vector",
+            "url": "pmtiles://" + ca_pmtiles,
+        }},
+    "layers": [{
+            "id": "ca30x30",
             "source": "ca",
             "source-layer": "ca2024",
-            # "source-layer": "CA_Cons_Areas_parentlyr_Merge_ecofix",
             "type": "fill",
+            "filter": ["match", ["get", column], items, True, False],
             "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
+            
 
 manager = {
             'property': 'manager_type',
@@ -117,21 +141,19 @@ manager = {
             'stops': [
                 ['Federal', "darkblue"],
                 ['State', public_color],
-                ['Non Profit', "lightblue"],
+                ['Non Profit', "orange"],
                 ['Special District', "darkgreen"],
-                ['', "grey"],
+                ['Unknown', "grey"],
+                ['County', "lightblue"],
+                ['City', "pink"],
                 ['Joint', "green"],
                 ['Tribal', tribal_color],
                 ['Private', "darkred"],
-                ['City', "pink"],
-                ['County', "blue"],
                 ['Home Owners Association', "lightgreen"]
             ]
             }
 
 
-
-
 easement = {
             'property': 'Easement',
             'type': 'categorical',
@@ -144,7 +166,6 @@ easement = {
 
 year = {
             'property': 'established',
-            # 'property': 'Release_Year',
             'type': 'categorical',
             'stops': [
                 [2023, year2023_color],
@@ -187,7 +208,6 @@ style_options = {
                     }
 
 
-
 st.set_page_config(layout="wide", page_title="CA Protected Areas Explorer", page_icon=":globe:")
 
 '''
@@ -198,17 +218,20 @@ st.set_page_config(layout="wide", page_title="CA Protected Areas Explorer", page
 m = leafmap.Map(style="positron")
 
 with st.sidebar:
-
+    
     if st.toggle("Protected Areas", True):
-        
-        style_choice = st.radio("Color by:", style_options)
         alpha = st.slider("transparency", 0.0, 1.0, 0.5)
-        # style = style_options[style_choice]
-        # paint = {"fill-color": style, "fill-opacity": alpha}
-        # m.add_gdf(gdf,layer_type="fill",name = "CA 30x30",paint = paint)
-        style = pad_style(style_options[style_choice], alpha)
-        m.add_pmtiles(ca_pmtiles, style=style, visible=True, opacity=alpha, tooltip=True)
-        m.add_layer_control()
+        style_choice = st.radio("Color by:", style_options)
+
+
+        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)
 
 
 
@@ -217,12 +240,9 @@ select_column = {
                 "Management Agency": "manager_type",
                 "Easement": "Easement",
                 "Year": "established",
-                # "Year": "Release_Year",
                 "Public Access": "access_type"}
 
 
-
-
 column = select_column[style_choice]
 
 select_colors = {

ca2024.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff6aa87ade59c9811346e1dd2eb68626d6b9de95bc4ee8071c7bef43a73396ec
-size 137445912
+oid sha256:10bbe99e2b1b732cbc21ace67c38a0d1c16a1e638a17bd25a5686b3052379552
+size 137419604