adding data filters

app.py

@@ -48,7 +48,11 @@ def to_streamlit(
     except Exception as e:
         raise Exception(e)
 
-
+# gap codes 3 and 4 are off by default. 
+default_gap = {
+    3: False,
+    4: False,
+}
 
 
 
@@ -56,7 +60,8 @@ def to_streamlit(
 #pad_pmtiles = "https://data.source.coop/cboettig/pad-us-3/pad-stats.pmtiles"
 #parquet = "https://data.source.coop/cboettig/pad-us-3/pad-stats.parquet"
 pad_pmtiles = "https://huggingface.co/datasets/boettiger-lab/pad-us-3/resolve/main/pad-stats.pmtiles"
-parquet = "https://huggingface.co/datasets/boettiger-lab/pad-us-3/resolve/main/pad-stats.parquet"
+# parquet = "https://huggingface.co/datasets/boettiger-lab/pad-us-3/resolve/main/pad-stats.parquet"
+parquet = "pad-stats.parquet"
 
 # adding this to test out git 
 
@@ -70,7 +75,7 @@ public_color = "#3388ff" # blue
 low = 2
 high = 3
 alpha = .5
-style_choice = "Manager Type"
+color_choice = "Manager Type"
 us_lower_48_area_m2 = 7.8e+12
 
 
@@ -147,9 +152,58 @@ def pad_style(paint, alpha):
         }]}
 
 
+def get_pmtiles_style(paint, alpha, cols, values): #style depends on the filters selected. 
+    filters = []
+    for col, val in zip(cols, values):
+        filter_condition = ["match", ["get", col], val, True, False]
+        filters.append(filter_condition)
+    combined_filter = ["all"] + filters
+    return {
+        "version": 8,
+        "sources": {
+            "pad": {
+                "type": "vector",
+                "url": "pmtiles://" + pad_pmtiles,
+            "attribution": "US PAD v3",
+            }
+        },
+        "layers": [{
+            "id": "public",
+            "source": "pad",
+            "source-layer": "pad-stats",
+            "type": "fill",
+            "filter": combined_filter,  # Use the combined filter
+            "paint": {
+                "fill-color": paint,
+                "fill-opacity": alpha
+            }
+        }]
+    }
+
 
 # +
-
+def getButtons(style_options, color_choice, default_gap=None): #finding the buttons selected to use as filters 
+    column = style_options[color_choice]['property']
+    opts = [style[0] for style in style_options[color_choice]['stops']]   
+    default_gap = default_gap or {}  
+    buttons = {
+        name: st.checkbox(f"{name}", value=default_gap.get(name, True), key=column + str(name))
+        for name in opts
+    }
+    filter_choice = [key for key, value in buttons.items() if value]  # return only selected
+    d = {}
+    d[column] = filter_choice
+    return d
+
+
+def getColorVals(style_options, color_choice): 
+    #df_tab only includes filters selected, we need to manually add "color_by" column (if it's not already a filter). 
+    column = style_options[color_choice]['property']
+    opts = [style[0] for style in style_options[color_choice]['stops']]   
+    d = {}
+    d[column] = opts
+    return d
+    
 custom_style = '''
 "blue"
 '''
@@ -303,7 +357,14 @@ st.set_page_config(layout="wide", page_title="Protected Areas Explorer", page_ic
 '''
 # US Conservation Atlas Prototype
 
+An interactive cloud-native geospatial tool for exploring and visualizing the United States' protected lands with open data.
+- ❌ Safari/iOS not yet supported
+- ⬅️ Use the left sidebar to color-code the map by different attributes, toggle on data layers and view summary charts, or filter data.
+
+
 '''
+st.divider()
+filters = {}
 
 m = leafmap.Map(style="positron")
 
@@ -319,6 +380,12 @@ with st.sidebar:
             m.add_basemap("Esri.WorldImagery")
 
 
+    # if st.toggle("Protected Areas", True):
+    
+    color_choice = st.radio("Color by:", style_options)
+    alpha = st.slider("transparency", 0.0, 1.0, 0.5)
+
+    "Data layers:"
     with st.expander("🦜 Biodiversity"):
         show_richness = st.toggle("Species Richness", False)
         if show_richness:
@@ -369,14 +436,7 @@ with st.sidebar:
             m.add_cog_layer("https://data.source.coop/vizzuality/lg-land-carbon-data/natcrop_fii_100m_cog.tif",
                             palette="reds", name="forest integrity loss", transparent_bg=True, opacity = 0.8, fit_bounds=False)
 
-    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 = pad_style(style_options[style_choice], alpha)
-        m.add_pmtiles(pad_pmtiles, style=style, visible=True, opacity=alpha, tooltip=True)
-
-
+    
     with st.expander("💰 Conservation Investment"):
         if st.toggle("Bipartisan Infrastructure Law"):
             m.add_geojson(bil_url, layer_type="fill-extrusion", paint=bil_fill, name="BIL", fit_bounds=False)
@@ -388,6 +448,32 @@ with st.sidebar:
                                 value = code_ex, 
                                 height = 100)
             eval(compile(code, "<string>", "exec"))
+    st.divider()
+    
+    "Filters:"
+    for label in style_options: # get selected filters (based on the buttons selected)
+        with st.expander(label): 
+            if label == "GAP Status Code": # gap code 1 and 2 are on by default
+                opts = getButtons(style_options, label, default_gap)
+            else: # other buttons are not on by default.
+                opts = getButtons(style_options, label) 
+            filters.update(opts)
+            
+        selected = {k: v for k, v in filters.items() if v}
+        if selected: 
+            filter_cols = list(selected.keys())
+            filter_vals = list(selected.values())
+        else: 
+            filter_cols = []
+            filter_vals = []
+
+    style = get_pmtiles_style(style_options[color_choice], alpha, filter_cols, filter_vals)
+    legend_d = {cat: color for cat, color in style_options[color_choice]['stops']}
+    m.add_legend(legend_dict = legend_d, position = 'bottom-left')
+    m.add_pmtiles(pad_pmtiles, style=style, name="PAD", opacity=alpha, tooltip=True)
+
+        # style = get_pmtiles_style(style_options[color_choice], alpha)
+    # m.add_pmtiles(pad_pmtiles, style=style, visible=True, opacity=alpha, tooltip=True)
 
 #    "## Boundaries"
 #    boundaries = st.radio("Boundaries:",
@@ -411,7 +497,7 @@ select_column = {
                 "Mean Richness": "gap_code",
                 "Mean RSR": "gap_code",
                  "custom": "gap_code"}
-column = select_column[style_choice]
+column = select_column[color_choice]
 
 # Map radio buttons to corresponding color-scheme:
 select_colors = {
@@ -425,7 +511,7 @@ select_colors = {
                 "custom": gap["stops"]}
                 
 colors = (ibis
-          .memtable(select_colors[style_choice], columns = [column, "color"])
+          .memtable(select_colors[color_choice], columns = [column, "color"])
           .to_pandas()
          )
 
@@ -507,7 +593,7 @@ with footer:
     '''
     ## Credits
 
-    Author: Carl Boettiger, UC Berkeley
+    Author: Cassie Buhler & Carl Boettiger, UC Berkeley
     License: BSD-2-clause
 
     ### Data sources