testing

app.py

@@ -35,17 +35,14 @@ st.set_page_config(layout="wide", page_title="GBIF Biodiversity Demo", page_icon
 @st.cache_resource
 def load_data():
     con = ibis.duckdb.connect()
-    path = "butterflies_gb.parquet"
-    if os.path.isfile(path):
-        return con.read_parquet(path)
-    df = con.read_parquet("s3://anonymous@gbif-open-data-us-east-1/occurrence/2023-06-01/occurrence.parquet")
-    data = (df
-            .dropna(["decimallongitude", "decimallatitude", "year"], how="any")
-            .filter([_.order == "Lepidoptera", _.countrycode=="GB"])
-            .filter(_.year >= 2010)
-            .select(['year', 'decimallongitude', 'decimallatitude'])
-           )
-    return data
+    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/**');
+    ''')
+    return con.table("gb")
 
 
 def map(data, lat, lon, zoom):
@@ -60,7 +57,7 @@ def map(data, lat, lon, zoom):
             },
             layers=[
                 pdk.Layer(
-                    "HexagonLayer",
+                    "H3HexagonLayer",
                     data=data,
                     get_position=["decimallongitude", "decimallatitude"],
                     radius=1000,
@@ -78,7 +75,18 @@ def map(data, lat, lon, zoom):
 
 # @st.cache_data
 def filterdata(df, year):
-    return df.filter(_.year == year).to_pandas()
+    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
 
 
 # -
@@ -130,7 +138,7 @@ with row1_2:
     )
 
 # LAYING OUT THE MIDDLE SECTION OF THE APP WITH THE MAPS
-row2_1, row2_2, row2_3, row2_4 = st.columns((2, 1, 1, 1))
+row2_1 = st.columns((2))
 
 # +
 # SETTING THE ZOOM LOCATIONS FOR THE AIRPORTS
@@ -145,23 +153,3 @@ with row2_1:
         f"""**Large Map**"""
     )
     map(filterdata(data, year_selected), midpoint[0], midpoint[1], 4)
-
-with row2_2:
-    st.write("**Panel 1**")
-    map(filterdata(data, year_selected), midpoint[0], midpoint[1], 3)
-
-with row2_3:
-    st.write("**Panel 2**")
-    map(filterdata(data, year_selected), midpoint[0], midpoint[1], 2)
-
-with row2_4:
-    st.write("**Panel 3**")
-    map(filterdata(data, year_selected), midpoint[0], midpoint[1], 1)
-
-
-
-
-
-
-
-

uk.csv.gz

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