test

app.py

@@ -32,37 +32,30 @@ st.set_page_config(layout="wide", page_title="GBIF Biodiversity Demo", page_icon
 
 
 # +
-# LOAD DATA ONCE
-@st.cache_resource
-def load_data():
+
+@st.cache_data
+def load_data(zoom=7):
     con = ibis.duckdb.connect()
-    con.raw_sql('''
-    INSTALL httpfs;
-    LOAD httpfs;
-    SET s3_url_style='path';
-    SET s3_endpoint='minio.carlboettiger.info';
-    CREATE VIEW gb AS SELECT * FROM read_parquet('s3://shared-data/gbif_gb/**');
-    ''')
-
-    hzoom = "h3z" + str(6)
-    
-    data =  (
-        con.table("gb").
-        select(_[hzoom], _.species, _.year).
-        distinct().
-        group_by([_[hzoom], _.year]).
-        aggregate(n = _.count()).
+    path = "gbif-vert-gb-h3z" + str(zoom) + .csv
+    df_all = (
+        con.
+        read_csv(path).
+        group_by(_.h3).
+        aggregate(n = _.n.sum()).
         mutate(color = 255 * _.n / _.n.max()).
         to_pandas()
-    )
-    return data
-
-
-
+        )
 
 @st.cache_data
-def filterdata(df, year):
-    return df[df.year == year]
+def load_class(df, taxa="Amphibia", zoom=7):
+    con = ibis.duckdb.connect()
+    path = "gbif-vert-gb-h3z" + str(zoom) + .csv
+    df = (con.
+      read_csv(path).
+      filter(_['class']==taxa).
+      mutate(color = 255 * _.n / _.n.max()).
+      to_pandas()
+     )
 
 
 
@@ -127,8 +120,10 @@ def update_query_params():
 
 with row1_1:
     st.title("GBIF Species Richness")
-    year_selected = st.slider(
-        "Select year", 2015, 2023, key="year", on_change=update_query_params
+    taxa = st.text_input('taxonomic class (Chordates only)')
+
+    zoom = st.slider(
+        "Select hex resolution", 4, 7, key="zoom"
     )
 
 
@@ -136,7 +131,7 @@ with row1_2:
     st.write(
     """
     ##
-    By sliding the slider on the left you can view different slices of time and explore different trends.
+    Testing 
     """
     )
 
@@ -149,7 +144,24 @@ midpoint =  (52.0, -1.0)  #mpoint(data["lat"], data["lon"])
 # STREAMLIT APP LAYOUT
 data = load_data()
 
-st.write(
-    f"""**Large Map**"""
-)
-map(filterdata(data, year_selected), midpoint[0], midpoint[1], 4)
+# +
+row2_1, row2_2, row2_3, row2_4 = st.columns((2, 1, 1, 1))
+
+with row2_1:
+    st.write(
+        f"""**All**"""
+    )
+    map(filterdata(data, taxa), midpoint[0], midpoint[1], 10)
+
+with row2_2:
+    st.write("**Amphibians**")
+    map(load_class(df, taxa="Amphibia", zoom=7),  midpoint[0], midpoint[1], 11)
+
+with row2_3:
+    st.write("**Mammals**")
+    map(filterdata(data, "Mammalia"),  midpoint[0], midpoint[1], 9)
+
+with row2_4:
+    st.write("**Birds**")
+    map(filterdata(data, "Aves"), midpoint[0], midpoint[1], 11)
+