refactor popup

MedicalCentres/app.R

@@ -18,7 +18,7 @@ DHBs <- sort(unique(Geo2017$dhb_name))
 DHBs <- c(DHBs[DHBs != "Missing"], "Missing")
 
 # dhbcols <- leafcols[1:length(DHBs)]
-dhbcols <- rainbow(length(DHBs))
+dhbcols <- hcl.colors(length(DHBs))
 names(dhbcols) <- DHBs
 dhbcol <- function(DHB) {
     sdf <- dhbcols[DHB]
@@ -34,6 +34,18 @@ snargcol <- function(snarg) {
 }
 
 
+popups <- function(data) {
+sprintf("<strong>%s</strong><br/>%s<br/>DHB: %s<br/>%s",
+        htmlEscape(data$name),
+        htmlEscape(data$address),
+        htmlEscape(ifelse(data$dhb_name == "Missing",
+                          "None", data$dhb_name)),
+        ifelse(data$Snargle,
+               "Snargleflagen practice",
+               "Non-snargleflagen practice"))
+}
+
+
 ui <- fillPage(title = "New Zealand GP Practice Locations 2017",
     tags$style(type = "text/css", 
                "#medmap {
@@ -70,9 +82,9 @@ ui <- fillPage(title = "New Zealand GP Practice Locations 2017",
                   width = "100%"),
       hr(),
       radioButtons("selcol", "Colour by",
-                   choices = c("None",
-                               "DHB",
-                               "Snargleflagen")),
+                   choices = c("None" = "None",
+                               "DHB affiliation" = "DHB",
+                               "Snargleflagen" = "Snargleflagen")),
       hr(),
       checkboxInput("dhboverlay", "Show DHB boundaries"),
       hr(),
@@ -91,39 +103,21 @@ server <- function(input, output) {
         if (input$selcol == "Snargleflagen") {
             gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                        lat = Geo2017$lat,
-                       popup = sprintf("<strong>%s</strong><br/>%s<br/>DHB: %s<br/>%s",
-                                       htmlEscape(Geo2017$name),
-                                       htmlEscape(Geo2017$address),
-                                       htmlEscape(Geo2017$dhb_name),
-                                       ifelse(Geo2017$Snargle,
-                                              "Snargleflagen",
-                                              "Non-snargleflagen")),
+                       popup = popups(Geo2017),
                        # color = snargcols[as.character(Geo2017$dhb_name)]
                        col = snargcol(Geo2017$Snargle)
                        )
         } else if (input$selcol == "DHB") {
             gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                        lat = Geo2017$lat,
-                       popup = sprintf("<strong>%s</strong><br/>%s<br/>DHB: %s<br/>%s",
-                                       htmlEscape(Geo2017$name),
-                                       htmlEscape(Geo2017$address),
-                                       htmlEscape(Geo2017$dhb_name),
-                                       ifelse(Geo2017$Snargle,
-                                              "Snargleflagen",
-                                              "Non-snargleflagen")),
+                       popup = popups(Geo2017),
                        # color = dhbcols[Geo2017$dhb_name]
                        col = dhbcol(Geo2017$dhb_name)
                        )
         } else {
             gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                        lat = Geo2017$lat,
-                       popup = sprintf("<strong>%s</strong><br/>%s<br/>DHB: %s<br/>%s",
-                                       htmlEscape(Geo2017$name),
-                                       htmlEscape(Geo2017$address),
-                                       htmlEscape(Geo2017$dhb_name),
-                                       ifelse(Geo2017$Snargle,
-                                              "Snargleflagen",
-                                              "Non-snargleflagen")),
+                       popup = popups(Geo2017),
                        col= "blue")
         }
         gl