omitted pmtiles and only showing 110 rows. But the map works and the stats are correct!

app.py

@@ -44,21 +44,28 @@ ca_parquet = "ca_areas.parquet"
 ca_area_acres = 1.014e8 #acres 
 
 style_choice = "GAP Status Code"
-# style_choice = "Easement"
-# style_choice = "Year"
 
 con = ibis.duckdb.connect()
+
+new2024 = (con
+      .read_parquet("new2024.parquet")
+      .select("OBJECTID")
+      .mutate(established = 2024)
+     )
+
+
 ca = (con
       .read_parquet(ca_parquet)
       .cast({"SHAPE": "geometry"})
-      .mutate(
-          area=_.SHAPE.area())
-      # .head()
+      .mutate(area = _.SHAPE.area())
+      .filter(_.reGAP < 3)
+      .left_join(new2024, "OBJECTID")
+      .mutate(established=_.established.fill_null(2023))
+      .mutate(geom = _.SHAPE.convert("epsg:3310","epsg:4326"))
+      .rename(name = "UNIT_NAME", access_type = "ACCESS_TYP", manager = "MNG_AGNCY", manager_type = "MNG_AG_LEV", id = "OBJECTID")
+      .select(_.established, _.reGAP, _.name, _.access_type, _.manager, _.manager_type, _.Easement, _.Acres, _.id,  _.geom, _.area, _.Release_Year)
      )
 
-# print(ca.schema())
-
-# ca = ca.filter(ca.Release_Year == 2024)
 
 private_color = "#DE881E" # orange #"#850101" # red
 tribal_color = "#BF40BF" # purple
@@ -68,11 +75,13 @@ year2023_color = "#26542C" # green
 year2024_color = "#F3AB3D" # orange 
 
 
+gdf = ca.head(110).execute() #workaround since the data is too large...
 
 
 def summary_table(column, colors):
+        
     df = (ca
-        # .rename(area = "area_square_meters")
+        .filter(_.Release_Year == 2024)
         .group_by(column)
         .aggregate(hectares_protected =  (_.area.sum() / 10000).round(),
                    percent_protected =  100 * _.Acres.sum() / ca_area_acres
@@ -104,27 +113,29 @@ def area_plot(df, column):
 
 
 
-def pad_style(paint, alpha):
-    return {
-    "version": 8,
-    "sources": {
-        "ca": {
-            "type": "vector",
-            "url": "pmtiles://" + ca_pmtiles,
-        }},
-    "layers": [{
-            "id": "layer1",
-            "source": "ca",
-            "source-layer": "CA_Cons_Areas_parentlyr_Merge_ecofix",
-            "type": "fill",
-            "paint": {
-                "fill-color": paint,
-                "fill-opacity": alpha
-            }
-        }]}
+# def pad_style(paint, alpha):
+#     return {
+#     "version": 8,
+#     "sources": {
+#         "ca": {
+#             "type": "vector",
+#             "url": "pmtiles://" + ca_pmtiles,
+#         }},
+#     "layers": [{
+#             "id": "layer1",
+#             "source": "ca",
+#             "source-layer": "CA_Cons_Areas_parentlyr_Merge_ecofix",
+#             "type": "fill",
+#             "paint": {
+#                 "fill-color": paint,
+#                 "fill-opacity": alpha
+#             }
+#         }]}
+
+
 
 manager = {
-            'property': 'cpad_MNG_AG_LEV',
+            'property': 'manager_type',
             'type': 'categorical',
             'stops': [
                 ['Federal', "darkblue"],
@@ -155,7 +166,8 @@ easement = {
 
 
 year = {
-            'property': 'Release_Year',
+            'property': 'established',
+            # 'property': 'Release_Year',
             'type': 'categorical',
             'stops': [
                 [2023, year2023_color],
@@ -165,7 +177,7 @@ year = {
 
 
 access = {
-    'property': 'ACCESS_TYP',
+    'property': 'access_type',
     'type': 'categorical',
     'stops': [
         ['Open Access', public_color],
@@ -214,16 +226,20 @@ with st.sidebar:
         
         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(ca_pmtiles, style=style, visible=True, opacity=alpha, tooltip=True)
+        style = style_options[style_choice]
+        paint = {"fill-color": style, "fill-opacity": alpha}
+        m.add_gdf(gdf,layer_type="fill",name = "CA 30x30",paint = paint)
+        m.add_layer_control()
+
 
 
 select_column = {
                 "GAP Status Code": "reGAP",
-                "Management Agency": "cpad_MNG_AG_LEV",
+                "Management Agency": "manager_type",
                 "Easement": "Easement",
-                "Year": "Release_Year",
-                "Public Access": "ACCESS_TYP"}
+                "Year": "established",
+                # "Year": "Release_Year",
+                "Public Access": "access_type"}
 
 
 
@@ -261,3 +277,4 @@ with main:
 st.divider()
 footer = st.container()
 
+