Remove DHB boundary overlay

MedicalCentres/app.R

@@ -4,9 +4,6 @@ library(leaflet)
 library(dplyr)
 library(shinyWidgets)
 library(htmltools)
-library(rgdal)
-library(rgeos)
-library(ggfortify)
 
 leafcols <- c("blue", "red", "darkred", "lightred",
           "orange", "beige", "green", "darkgreen",
@@ -36,8 +33,6 @@ snargcol <- function(snarg) {
     sdf
 }
 
-dhb2015 <- readRDS("dhb2015.rds")
-
 popups <- function(data) {
 sprintf("<strong>%s</strong><br/>%s<br/>DHB: %s<br/>%s",
         htmlEscape(data$name),
@@ -70,7 +65,6 @@ ui <- fillPage(title = "New Zealand GP Practice Locations 2017",
                }"),
     div(class = "dropdowncont",
     dropdownButton(
-      strong("Not Implemented"), hr(),
       searchInput("mapsearch",
                   placeholder = "Search GP practices by name",
                   btnSearch = icon("search"), 
@@ -82,8 +76,6 @@ ui <- fillPage(title = "New Zealand GP Practice Locations 2017",
                                "DHB affiliation" = "DHB",
                                "Snargleflagen" = "Snargleflagen")),
       hr(),
-      checkboxInput("dhboverlay", "Show DHB boundaries"),
-      hr(),
       actionLink("closedrop", label = "close", icon = icon("close"),
                  style="float:right"),
       circle=FALSE, inputId = "ddown", right = TRUE,
@@ -94,15 +86,12 @@ ui <- fillPage(title = "New Zealand GP Practice Locations 2017",
 
 server <- function(input, output, session) {
     output$medmap <- renderLeaflet({
-        gl <- leaflet(Geo2017) %>%
-          addMapPane("polygons", zIndex = 420) %>%
-          addMapPane("markers", zIndex = 430)
+        gl <- leaflet(Geo2017)
         gl <- addTiles(gl)
         gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                    lat = Geo2017$lat,
                    popup = popups(Geo2017),
-                   col= "blue",
-                   #pathOptions(pane = "markers")
+                   col= "blue"
                    )
         gl
     })
@@ -118,24 +107,19 @@ server <- function(input, output, session) {
           gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                      lat = Geo2017$lat,
                      popup = popups(Geo2017),
-                     # color = snargcols[as.character(Geo2017$dhb_name)]
-                     col = snargcol(Geo2017$Snargle),
-                     #pathOptions(pane = "markers")
+                     col = snargcol(Geo2017$Snargle)
                      )
       } else if (input$selcol == "DHB") {
           gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                      lat = Geo2017$lat,
                      popup = popups(Geo2017),
-                     # color = dhbcols[Geo2017$dhb_name]
-                     col = dhbcol(Geo2017$dhb_name),
-                     #pathOptions(pane = "markers")
+                     col = dhbcol(Geo2017$dhb_name)
                      )
       } else {
           gl <- addCircleMarkers(gl, lng = Geo2017$lon,
                      lat = Geo2017$lat,
                      popup = popups(Geo2017),
-                     col= "blue",
-                     #pathOptions(pane = "markers")
+                     col= "blue"
                      )
       }
     })
@@ -155,17 +139,6 @@ server <- function(input, output, session) {
                                          zoom = 13)
       }
     })
-    observeEvent(input$dhboverlay, {
-      if (input$dhboverlay) {
-        leafletProxy("medmap") %>% addPolygons(data = dhbsub, fill = FALSE,
-                                               color = "#000000",
-                                               weight = 2,
-                                               #pathOptions(pane = "polygons")
-                                               )
-      } else {
-        leafletProxy("medmap") %>% clearShapes()
-      }
-    })
 
 }