Squared with Galiano 2023 BioBlitz, Xetthecum and core framework upda…

…tes for BBEAS

build.js

@@ -66,6 +66,7 @@ const buildIndex = {
     ],
     // Source for simplified environments such as Xetthecum without features like tabs, polygon drawing, etc.
     newCoreSource: [
+        "src/utils/utils.js",
         "node_modules/papaparse/papaparse.min.js",
         "src/client/css/maplibre-gl.css",
         "node_modules/maplibre-gl/dist/maplibre-gl-dev.js",
@@ -84,7 +85,6 @@ const buildIndex = {
         "src/lib/jquery-ui-widgets-tabs.js",
         "src/lib/point-in-polygon.js",
         "src/geom/geoJSON.js",
-        "src/utils/utils.js",
         "src/client/js/new/filters.js",
         "src/client/js/new/polygon-draw.js",
         "src/client/js/autocomplete.js",
@@ -116,6 +116,9 @@ const buildIndex = {
     }, {
         src: "src/client/js/new/imerss-viz.js",
         dest: "docs/js/imerss-viz.js"
+    }, {
+        src: "src/client/js/new/imerss-blitz.js",
+        dest: "docs/js/imerss-blitz.js"
     }, {
         src: "src/lib/vizjs.js",
         dest: "docs/js/vizjs.js"
@@ -171,8 +174,8 @@ const buildIndex = {
         src: "data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared.csv",
         dest: "docs/data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared.csv"
     }, {
-        src: "data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-assigned-taxa.csv",
-        dest: "docs/data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-assigned-taxa.csv"
+        src: "data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared-taxa.csv",
+        dest: "docs/data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared-taxa.csv"
     }]
 };
 

data/Galiano 2023 BioBlitz/filter-bioblitz.R

@@ -5,7 +5,7 @@ source("./utils.R")
 
 raw <- timedFread("Galiano_Island_vascular_plant_records_consolidated.csv")
 
-# Load the BioBlitz catalogue and assign a column inBioBlitz
+# Load the iNaturalist BioBlitz catalogue and assign a column inBioBlitz
 bioblitzObs <- timedFread("iNaturalist_GalianoBioBlitz2023_Catalogue_2024_11_06.csv")
 bioblitzIds <- data.frame(id = bioblitzObs$id, inBioBlitz = 1)
 

data/Galiano 2023 BioBlitz/prepare-bioblitz.R

@@ -2,14 +2,14 @@ library(dplyr)
 
 source("./utils.R")
 
-raw <- timedFread("Galiano_Island_vascular_plant_records_consolidated-assigned.csv")
+rawRecords <- timedFread("Galiano_Island_vascular_plant_records_consolidated-assigned.csv")
 # To check against all summary
 # raw <- timedFread("Galiano_Island_vascular_plant_records_consolidated-filtered.csv")
 
 summary <- timedFread("Galiano_Tracheophyta_review_summary_reviewed_2024-10-07-assigned_revised.csv")
-summaryIds <- data.frame(id = summary$ID, inSummary = 1)
+inSummary <- data.frame(id = summary$ID, inSummary = 1)
 
-joined <- raw %>% left_join(summaryIds, by = join_by(taxonID == id))
+joined <- rawRecords %>% left_join(inSummary, by = join_by(taxonID == id))
 
 notInSummary <- joined %>% filter(inSummary != 1)
 
@@ -37,3 +37,10 @@ emptyCols <- colSums(is.na(filteredDown)) == nrow(filteredDown)
 filteredDown2 <- filteredDown[!emptyCols]
 
 timedWrite(filteredDown2, "Galiano_Island_vascular_plant_records_consolidated-prepared.csv")
+
+rawSummary <- timedFread("Galiano_Island_vascular_plant_records_consolidated-assigned-taxa.csv")
+
+summaryFields <- data.frame(id = summary$ID, reportingStatus = summary$Reporting.Status, observation = summary$Observation, inSummary = 1)
+joinedSummary <- rawSummary %>% left_join(summaryFields, by = join_by(id))
+
+timedWrite(joinedSummary, "Galiano_Island_vascular_plant_records_consolidated-prepared-taxa.csv")

docs/css/imerss-blitz.css

@@ -27,6 +27,10 @@ body {
     height: 30%;
 }
 
+.imerss-filters {
+    overflow: visible;
+}
+
 .imerss-blitz-content {
     height: 40%;
 }
@@ -43,17 +47,44 @@ body {
 
 .imerss-main-tabs {
     width: 100%;
-    height: 100%;
+    min-height: 0;
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
 }
 
 .ui-tabs .ui-tabs-panel {
     /* Remove height of tabs from parent */
-    height: calc(100% - 7em)
+    height: calc(100% - 8em)
 }
 
 .imerss-tooltip div.text {
     max-width: 20rem;
-}
+}
+
+.autocomplete__menu {
+    top: 1.5em;
+    width: calc(35vw);
+    border-top: 2px solid #0b0c0c;
+}
+
+.imerss-blitz-records {
+    display: flex;
+}
+
+.imerss-blitz-records > * {
+    padding: 1rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.imerss-blitz-records .records-label {
+    font-weight: bold;
+    text-align: center;
+}
+
+.imerss-blitz-records .records-value {
+    color: blue;
+    font-size: 24px;
+}

docs/css/imerss-core.css

@@ -2,6 +2,12 @@
     --imerss-scrollbar-width: 12px;
 }
 
+.imerss-container *,
+.imerss-container *:before,
+.imerss-container *:after {
+    box-sizing: border-box;
+}
+
 .imerss-container ::-webkit-scrollbar {
     -webkit-appearance: none;
     width: var(--imerss-scrollbar-width);

docs/css/imerss-viz-all.css

@@ -698,6 +698,12 @@ a.ui-button:active,
     --imerss-scrollbar-width: 12px;
 }
 
+.imerss-container *,
+.imerss-container *:before,
+.imerss-container *:after {
+    box-sizing: border-box;
+}
+
 .imerss-container ::-webkit-scrollbar {
     -webkit-appearance: none;
     width: var(--imerss-scrollbar-width);

docs/css/imerss-viz-lib.css

@@ -698,6 +698,12 @@ a.ui-button:active,
     --imerss-scrollbar-width: 12px;
 }
 
+.imerss-container *,
+.imerss-container *:before,
+.imerss-container *:after {
+    box-sizing: border-box;
+}
+
 .imerss-container ::-webkit-scrollbar {
     -webkit-appearance: none;
     width: var(--imerss-scrollbar-width);