adding type

app.py

@@ -39,6 +39,7 @@ ca_pmtiles = "https://huggingface.co/datasets/boettiger-lab/ca-30x30/resolve/mai
 ca_parquet = "https://huggingface.co/datasets/boettiger-lab/ca-30x30/resolve/main/ca2024-30m.parquet"
 
 
+
 ca_area_acres = 1.014e8 #acres 
 style_choice = "GAP Status Code"
 
@@ -48,8 +49,10 @@ ca = (con
       .read_parquet(ca_parquet)
       .cast({"geom": "geometry"})
      )
+ 
+
 
-private_access_color = "#DE881E" # orange #"#850101" # red
+private_access_color = "#DE881E" # orange 
 public_access_color = "#3388ff" # blue
 tribal_color = "#BF40BF" # purple
 mixed_color = "#005a00" # green
@@ -67,19 +70,21 @@ city_color = "#BDC368" #green
 hoa_color = "#A89BBC" # purple
 nonprofit_color =  "#D77031" #orange
 
+
 from functools import reduce
+
 def summary_table(column, colors, filter_cols, filter_vals):
-    filters = [_.reGAP < 3]
+    filters = [_.reGAP < 3] #only compute with gap codes 1 and 2
     
-    if filter_cols and filter_vals:
+    if filter_cols and filter_vals: #if a filter is selected, add to list of filters 
         for filter_col, filter_val in zip(filter_cols, filter_vals):
             if len(filter_val) > 1:
                 filters.append(getattr(_, filter_col).isin(filter_val))
             else:
                 filters.append(getattr(_, filter_col) == filter_val[0])
-    
+                
     combined_filter = reduce(lambda x, y: x & y, filters)
-
+    
     df = (ca
         .filter(combined_filter)
         .group_by(column)
@@ -87,12 +92,12 @@ def summary_table(column, colors, filter_cols, filter_vals):
         .mutate(percent_protected=_.percent_protected.round(1))
         .inner_join(colors, column)
     )
-    
     df = df.to_pandas()
     df[column] = df[column].astype(str)
-    
     return df
 
+
+
 def area_plot(df, column):
     base = alt.Chart(df).encode(
         alt.Theta("percent_protected:Q").stack(True),
@@ -110,28 +115,8 @@ def area_plot(df, column):
     return plot.properties(width="container", height=300)
 
 
-
-# def pad_style(paint, alpha):
-#     return {
-#     "version": 8,
-#     "sources": {
-#         "ca": {
-#             "type": "vector",
-#             "url": "pmtiles://" + ca_pmtiles,
-#         }},
-#     "layers": [{
-#             "id": "ca30x30",
-#             "source": "ca",
-#             "source-layer": "ca202430m",
-#             "type": "fill",
-#             "paint": {
-#                 "fill-color": paint,
-#                 "fill-opacity": alpha
-#             }
-#         }]}
-
-
-def filter_pmtiles(paint, alpha, cols, values):
+    
+def get_pmtiles_style(paint, alpha, cols, values):
     filters = []
     
     for col, val in zip(cols, values):
@@ -151,6 +136,7 @@ def filter_pmtiles(paint, alpha, cols, values):
             "id": "ca30x30",
             "source": "ca",
             "source-layer": "ca202430m",
+            # "source-layer": "ca2024",
             "type": "fill",
             "filter": combined_filter,  # Use the combined filter
             "paint": {
@@ -161,27 +147,15 @@ def filter_pmtiles(paint, alpha, cols, values):
     }
 
 
-# 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 = 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
-
 def getButtons(style_options, style_choice, default_gap=None):
     column = style_options[style_choice]['property']
-    opts = [style[0] for style in style_options[style_choice]['stops']]
-    
-    default_gap = default_gap or {}
-    
+    opts = [style[0] for style in style_options[style_choice]['stops']]   
+    default_gap = default_gap or {}  
     buttons = {
         name: st.checkbox(f"{name}", value=default_gap.get(name, 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
+    filter_choice = [key for key, value in buttons.items() if value]  # return only selected
     d = {}
     d[column] = filter_choice
     return d
@@ -256,12 +230,23 @@ gap = {
         }
 
 
+area_type = {
+        'property': 'type',
+        'type': 'categorical',
+        'stops': [
+            ["Land", "green"],
+            ["Water", "blue"]
+        ]
+        }
+
+
 style_options = {
                     "GAP Status Code": gap,
                     "Manager Type": manager,
                     "Easement": easement,
                     "Public Access": access,
-                    "Year": year
+                    "Year": year,
+                    "Type": area_type
                     }
 
 
@@ -278,26 +263,26 @@ filters = {}
 with st.sidebar:
     color_choice = st.radio("Color by:", style_options)
     alpha = st.slider("transparency", 0.0, 1.0, 0.5)
-    st.text("Filters:")
-
+    # st.text("Filters:")
+    "Filters:"
     for label in style_options:
         with st.expander(label): 
-            
-            if label == "GAP Status Code":# gap code 1 and 2 are on by default 
+             
+            if label == "GAP Status Code": # gap code 1 and 2 are on by default
                 opts = getButtons(style_options, label, default_gap)
             else:
                 opts = getButtons(style_options, label)
             filters.update(opts)
             
-        selected = {k: v for k, v in filters.items() if v}
-        if selected:
+        selected = {k: v for k, v in filters.items() if v} #get selected filters
+        if selected: 
             filter_cols = list(selected.keys())
             filter_vals = list(selected.values())
-        else:
+        else: 
             filter_cols = []
             filter_vals = []
-
-    style = filter_pmtiles(style_options[color_choice], alpha, filter_cols, filter_vals)
+            
+    style = get_pmtiles_style(style_options[color_choice], alpha, filter_cols, filter_vals)
     m.add_pmtiles(ca_pmtiles, style=style, visible=True, name="CA", opacity=alpha, tooltip=True)
 
 
@@ -306,7 +291,8 @@ select_column = {
                 "Manager Type": "manager_type",
                 "Easement": "Easement",
                 "Year": "established",
-                "Public Access": "access_type"}
+                "Public Access": "access_type",
+                "Type": "type"}
 
 
 column = select_column[color_choice]
@@ -316,7 +302,8 @@ select_colors = {
                 "Easement": easement["stops"],
                 "Public Access": access["stops"],
                 "Year": year["stops"],
-                "GAP Status Code": gap["stops"]}
+                "GAP Status Code": gap["stops"],
+                "Type": area_type["stops"]}
 
 colors = (ibis
           .memtable(select_colors[color_choice], columns = [column, "color"])
@@ -327,7 +314,6 @@ main = st.container()
     
 with main:
     map_col, stats_col = st.columns([2,1])
-
     with map_col:
         to_streamlit(m, height=700)
     df = summary_table(column, colors, filter_cols, filter_vals)