icon colours

MedicalCentres/app.R

@@ -3,16 +3,32 @@ library(leaflet)
 library(dplyr)
 library(shinyWidgets)
 
+leafcols <- c("blue", "red", "darkred", "lightred",
+          "orange", "beige", "green", "darkgreen",
+          "lightgreen", "darkblue", "lightblue",
+          "purple", "darkpurple", "pink", "cadetblue",
+          "white", "gray", "lightgray", "black", "pink", "cyan")
+
 Geo2017 <- readRDS("Geo2017.rds")
 Geo2017$Snargle <- c(TRUE, rep(FALSE, 5))
 
 DHBs <- sort(unique(Geo2017$dhb_name))
 DHBs <- c(DHBs[DHBs != "Missing"], "Missing")
 
-dhbcols <- hcl.colors(length(DHBs))
+dhbcols <- leafcols[1:length(DHBs)]
 names(dhbcols) <- DHBs
-snargcols <- hcl.colors(2)
-names(snargcols) <- c(TRUE, FALSE)
+dhbcol <- function(DHB) {
+    sdf <- dhbcols[DHB]
+    names(sdf) <- NULL
+    sdf
+}
+snargcols <- leafcols[1:2]
+names(snargcols) <- c(FALSE, TRUE)
+snargcol <- function(snarg) {
+    sdf <- snargcols[as.character(snarg)]
+    names(sdf) <- NULL
+    sdf
+}
 
 
 ui <- fillPage(title = "New Zealand GP Practice Locations 2017",
@@ -70,21 +86,24 @@ server <- function(input, output) {
         gl <- leaflet(Geo2017)
         gl <- addTiles(gl)
         if (input$selcol == "Snargleflagen") {
-            gl <- addMarkers(gl, lng = Geo2017$lon,
+            gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                        lat = Geo2017$lat,
                        popup = Geo2017$name,
                        # color = snargcols[as.character(Geo2017$dhb_name)]
+                       col = snargcol(Geo2017$Snargle)
                        )
         } else if (input$selcol == "DHB") {
-            gl <- addMarkers(gl, lng = Geo2017$lon,
+            gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                        lat = Geo2017$lat,
                        popup = Geo2017$name,
                        # color = dhbcols[Geo2017$dhb_name]
+                       col = dhbcol(Geo2017$dhb_name)
                        )
         } else {
-            gl <- addMarkers(gl, lng = Geo2017$lon,
+            gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                        lat = Geo2017$lat,
-                       popup = Geo2017$name)
+                       popup = Geo2017$name,
+                       col= "blue")
         }
         gl
     })