Merge pull request #8 from ThinkR-open/dev

feat: Improve naming data leaflet

Author: MurielleDelmotte

NAMESPACE

@@ -45,6 +45,7 @@ importFrom(golem,bundle_resources)
 importFrom(golem,favicon)
 importFrom(golem,with_golem_options)
 importFrom(lubridate,year)
+importFrom(purrr,set_names)
 importFrom(shiny,NS)
 importFrom(shiny,shinyApp)
 importFrom(shiny,tagList)

R/mod_carto_leaflet.R

@@ -71,7 +71,7 @@ mod_carto_leaflet_server <- function(id, global) {
 
         if (isTRUE(input$missingdata)) {
           thedata <- local$df_prep$data_prep |>
-            purrr::keep(\(x) (x[8] == "1"))
+            purrr::keep(\(x) (x["info_missing"] == "1"))
           thereens <- 0
         } else {
           thedata <- local$df_prep$data_prep

R/prepare_leaflet.R

@@ -7,6 +7,7 @@
 #' @param dbtruffle A data frame containing information about truffles.
 #' @param dbreens A data frame containing information about reensemencement.
 #' @importFrom dplyr filter mutate distinct full_join
+#' @importFrom purrr set_names
 #' @return A list suitable for passing to Leaflet JavaScript for visualization.
 #'
 #' @export
@@ -51,7 +52,8 @@ prepare_leaflet <- function(dboak, dbtruffle, dbreens) {
   data_prep <- lapply(
     1:nrow(c),
     function(i) {
-      unname(as.list(as.character(c[i, ])))
+      unname(as.list(as.character(c[i, ]))) |> 
+      set_names(names(c))
     }
   )
 

inst/app/www/leaflet_.js

@@ -5,20 +5,20 @@ $(document).ready(function () {
     var locations = arg.data;
     var reens = arg.reens;
     var mean_lat = locations.length
-      ? locations.reduce((sum, loc) => sum + Number(loc[2] || 0), 0) /
+      ? locations.reduce((sum, loc) => sum + Number(loc.lat || 0), 0) /
         locations.length
       : 0;
 
     var mean_lon = locations.length
-      ? locations.reduce((sum, loc) => sum + Number(loc[1] || 0), 0) /
+      ? locations.reduce((sum, loc) => sum + Number(loc.lon || 0), 0) /
         locations.length
       : 0;
 
     // Calculer les coordonnées min/max comme avant
-    var minLat = Math.min(...locations.map((loc) => Number(loc[2] || 0)));
-    var maxLat = Math.max(...locations.map((loc) => Number(loc[2] || 0)));
-    var minLon = Math.min(...locations.map((loc) => Number(loc[1] || 0)));
-    var maxLon = Math.max(...locations.map((loc) => Number(loc[1] || 0)));
+    var minLat = Math.min(...locations.map((loc) => Number(loc.lat || 0)));
+    var maxLat = Math.max(...locations.map((loc) => Number(loc.lat || 0)));
+    var minLon = Math.min(...locations.map((loc) => Number(loc.lon || 0)));
+    var maxLon = Math.max(...locations.map((loc) => Number(loc.lon || 0)));
     // Calculer l'étendue géographique
     var latDiff = maxLat - minLat;
     var lonDiff = maxLon - minLon;
@@ -59,15 +59,15 @@ $(document).ready(function () {
     }
 
     for (var i = 0; i < locations.length; i++) {
-      marker = new L.circleMarker([locations[i][2], locations[i][1]])
+      marker = new L.circleMarker([locations[i].lat, locations[i].lon])
         .unbindPopup()
         .addTo(map)
         .on("click", onClick);
 
-      marker.id = locations[i][0];
+      marker.id = locations[i].idoak;
 
       if (reens === 0) {
-        if (locations[i][3] === "Normal") {
+        if (locations[i].type === "Normal") {
           marker.setStyle({
             color: "#FF0000",
             fillColor: "#FF0000",
@@ -81,7 +81,7 @@ $(document).ready(function () {
           });
         }
       } else {
-        if (locations[i][7] === "1") {
+        if (locations[i].info_reens === "1") {
           marker.setStyle({
             color: "#00AEEF",
             fillColor: "#00AEEF",