...

app.py

@@ -31,6 +31,7 @@ st.set_page_config(layout="wide", page_title="GBIF Biodiversity Demo", page_icon
 
 
 
+# +
 # LOAD DATA ONCE
 @st.cache_resource
 def load_data():
@@ -42,8 +43,28 @@ def load_data():
     SET s3_endpoint='minio.carlboettiger.info';
     CREATE VIEW gb AS SELECT * FROM read_parquet('s3://shared-data/gbif_gb/**');
     ''')
-    return con.table("gb")
 
+    hzoom = "h3z" + str(6)
+    
+    data =  (
+        con.table("gb").
+        select(_[hzoom], _.species, _.year).
+        distinct().
+        group_by([_[hzoom], _.year]).
+        aggregate(n = _.count()).
+        mutate(color = 255 * _.n / _.n.max()).
+        to_pandas()
+    )
+    return data
+
+
+@st.cache_data
+def filterdata(df, year):
+    return df[df.year == year]
+
+
+
+# -
 
 def map(data, lat, lon, zoom):
     st.write(
@@ -70,34 +91,12 @@ def map(data, lat, lon, zoom):
     )
 
 
-# +
-# FILTER DATA FOR A SPECIFIC YEAR. ibis lazytable not cache-able..
-
-# @st.cache_data
-def filterdata(df, year):
-    hzoom = "h3z" + str(6)
-    data =  (
-        df.
-        filter(_.year == year).
-        select(_[hzoom], _.species).
-        distinct().
-        group_by(_[hzoom]).
-        aggregate(n = _.count()).
-        mutate(color = 255 * _.n / _.n.max()).
-        to_pandas()
-    )
-    return data
-
-
-# -
-
 # CALCULATE MIDPOINT FOR GIVEN SET OF DATA
 @st.cache_data
 def mpoint(lat, lon):
     return (np.average(lat), np.average(lon))
 
 
-
 # STREAMLIT APP LAYOUT
 data = load_data()