Merge pull request #31 from mchlln/heat-map

HeatMap view + custom color pallet + format fix

Author: Vjonquiere

environment-dev.yml

@@ -13,4 +13,5 @@ dependencies:
   - r-arrow
   - r-geosphere
   - r-sf
-  - rstudio-desktop
+  - rstudio-desktop
+  - r-shinyWidgets

environment.yml

@@ -12,4 +12,5 @@ dependencies:
   - r-bslib
   - r-arrow
   - r-geosphere
-  - r-sf
+  - r-sf
+  - r-shinyWidgets

global.R

@@ -7,44 +7,50 @@ db_name <- Sys.getenv("DB_NAME")
 db_user <- Sys.getenv("DB_USER")
 db_password <- Sys.getenv("DB_PASSWORD")
 
-tryCatch({
-    conn <- dbConnect(
-        RPostgres::Postgres(),
+
+tryCatch(
+    {
+        conn <- dbConnect(
+            RPostgres::Postgres(),
             dbname = Sys.getenv("DB_NAME", "shiny_db"),
             host = Sys.getenv("DB_HOST", "127.0.0.1"),
             port = Sys.getenv("DB_PORT", 5432),
             user = Sys.getenv("DB_USER", "visualisation"),
             password = Sys.getenv("DB_PASSWORD", "visualisation")
-    )
-    message("Connected successfully")
-
-    
-
-    is_empty <- function(con, table) {
-        tryCatch({
-            query <- sprintf("SELECT COUNT(*) AS n FROM %s;", table)
-            n <- dbGetQuery(con, query)$n
-            return(n == 0)}, 
-            error = function(e){return (TRUE)})
-        
-    }
+        )
+        message("Connected successfully")
+
+
+        is_empty <- function(con, table) {
+            tryCatch(
+                {
+                    query <- sprintf("SELECT COUNT(*) AS n FROM %s;", table)
+                    n <- dbGetQuery(con, query)$n
+                    return(n == 0)
+                },
+                error = function(e) {
+                    return(TRUE)
+                }
+            )
+        }
+
+        if (is_empty(conn, "equipment_access")) {
+            message("Reading Parquet file...")
+            df <- read_parquet("data/donnees-2024-reg94.parquet")
+            df_data_frame <- as.data.frame(df)
+            message("Writing to Database...")
+            dbWriteTable(conn, "equipment_access", df_data_frame, overwrite = TRUE, row.names = FALSE)
+            message("Success! Data loaded.")
+        } else {
+            message("Database already loaded, skipping data load")
+        }
+
+        legend <- read.csv(file = "data/BPE24_table_passage.csv", sep = ";", header = T)
+        # print(legend)
 
-    if(is_empty(conn, "equipment_access")){
-        message("Reading Parquet file...")
-        df <- read_parquet("data/donnees-2024-reg94.parquet")
-        df_data_frame <- as.data.frame(df)
-        message("Writing to Database...")
-        dbWriteTable(conn, "equipment_access", df_data_frame, overwrite = TRUE, row.names = FALSE)
-        message("Success! Data loaded.")
-    }else{
-        message("Database already loaded, skipping data load")
+        # dbDisconnect(conn)
+    },
+    error = function(e) {
+        message("DB ERROR: ", e$message)
     }
-    
-    legend <- read.csv(file = "data/BPE24_table_passage.csv", sep = ";", header = T)
-    print(legend)
-    
-    #dbDisconnect(conn)
-
-}, error = function(e) {
-    message("DB ERROR: ", e$message)
-})
+)