Merge pull request #15 from reflejar/dev

actualizamos
reflejar · Jan 18, 2024 · 5f34602 · 5f34602
2 parents 649f61b + f8aece4
commit 5f34602
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/apps/testeos/data/ambientales.parquet b/apps/testeos/data/ambientales.parquet
diff --git a/apps/testeos/data/hexagonos.parquet b/apps/testeos/data/hexagonos.parquet
diff --git a/apps/testeos/data/puntos.parquet b/apps/testeos/data/puntos.parquet
diff --git a/apps/testeos/server.R b/apps/testeos/server.R
@@ -26,10 +26,11 @@ oceanIcons <- awesomeIconList(
   agua_superficial = makeAwesomeIcon(text = fa("water"),markerColor="lightblue"),
   agua_lluvia = makeAwesomeIcon(text = fa("cloud-rain"),markerColor="lightblue"),
   agua_red = makeAwesomeIcon(text = fa("faucet"),markerColor="lightblue"),
-  sedimento=makeAwesomeIcon(text = fa("mound"),markerColor="lightgreen"),
+  sedimento=makeAwesomeIcon(text = fa("mountain"),markerColor="lightgreen"),
   vegetal=makeAwesomeIcon(text = fa("leaf"),markerColor="lightgreen"),
-  suelo=makeAwesomeIcon(text = fa("mountain"),markerColor="lightgreen"),
-  aire=makeAwesomeIcon(text = fa("wind"),markerColor="gray")
+  suelo=makeAwesomeIcon(text = fa("mound"),markerColor="lightgreen"),
+  aire=makeAwesomeIcon(text = fa("wind"),markerColor="gray"),
+  peces=makeAwesomeIcon(text = fa("fish"),markerColor="beige")
 
 )
 
@@ -249,7 +250,7 @@ shinyServer(function(input, output, session) {
     if (input$switch2) {
       proxy %>% clearGroup("Ambientales2")
 
-      proxy %>% addAwesomeMarkers(data=amb,lat=~Lat,lng=~Long,label=hover_markers,icon = ~oceanIcons[type],
+      proxy %>% addAwesomeMarkers(data=amb,lat=~Lat,lng=~Long,label=hover_markers, popup=hover_markers,icon = ~oceanIcons[type],
                                  group = "Ambientales",clusterOptions = markerClusterOptions(spiderfyOnMaxZoom=T,disableClusteringAtZoom=11,
                                                                                              removeOutsideVisibleBounds=T))
     } else {

diff --git a/apps/testeos/ui.R b/apps/testeos/ui.R
@@ -64,7 +64,7 @@ shinyUI(fluidPage(
 
           tags$div(
             materialSwitch(inputId = "switch1", label = "Testeos Humanos", status = "danger",value=T, right = T),
-            materialSwitch(inputId = "switch2", label = "Testeos Ambientales", status = "primary",value=F, right = T),
+            materialSwitch(inputId = "switch2", label = "Testeos Ambientales", status = "primary",value=T, right = T),
             class="mt-3 mb-5 text-white"
           ),
           tags$img(alt="Línea", src="img/linea.svg", class="mt-5 mb-3"),

diff --git a/assets/data/Testeos.xlsx b/assets/data/Testeos.xlsx