preprocessed data and using pmtiles. map is working and displays all data.

app.py

@@ -7,6 +7,7 @@ import ibis
 from ibis import _
 import ibis.selectors as s
 
+
 from typing import Optional
 def to_streamlit(
     self,
@@ -34,38 +35,20 @@ def to_streamlit(
         raise Exception(e)
 
 
-
-ca_pmtiles = "https://data.source.coop/cboettig/ca30x30/ca_areas.pmtiles"
-# ca_pmtiles = "ca_areas.pmtiles"
-
-# ca_parquet = "https://data.source.coop/cboettig/ca30x30/ca_areas.parquet"
-ca_parquet = "ca_areas.parquet"
+ca_pmtiles = "https://huggingface.co/datasets/boettiger-lab/ca-30x30/resolve/main/ca2024.pmtiles"
+ca_parquet = "ca2024.parquet"
 
 ca_area_acres = 1.014e8 #acres 
-
 style_choice = "GAP Status Code"
 
 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())
-      .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)
+      .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
@@ -75,17 +58,11 @@ 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
-        .filter(_.Release_Year == 2024)
         .group_by(column)
-        .aggregate(hectares_protected =  (_.area.sum() / 10000).round(),
-                   percent_protected =  100 * _.Acres.sum() / ca_area_acres
-                  )
+        .aggregate(percent_protected =  100 * _.Acres.sum() / ca_area_acres)
         .mutate(percent_protected = _.percent_protected.round(1),
                )
         .inner_join(colors, column)
@@ -102,7 +79,7 @@ def area_plot(df, column):
     pie = ( base
            .mark_arc(innerRadius= 40, outerRadius=100)
            .encode(alt.Color("color:N").scale(None).legend(None),
-                   tooltip=['percent_protected', 'hectares_protected', column])
+                   tooltip=['percent_protected', column])
     )
     text = ( base
             .mark_text(radius=80, size=14, color="white")
@@ -113,25 +90,25 @@ 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": "ca2024",
+            # "source-layer": "CA_Cons_Areas_parentlyr_Merge_ecofix",
+            "type": "fill",
+            "paint": {
+                "fill-color": paint,
+                "fill-opacity": alpha
+            }
+        }]}
 
 
 manager = {
@@ -226,9 +203,11 @@ with st.sidebar:
         
         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 = 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()
 
 

ca2024.parquet

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