Update

StatisticsNZ · Aug 12, 2020 · 7d6a757 · 7d6a757
1 parent c14e9c0
commit 7d6a757
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: simplevis
 Type: Package
 Title: Simple Visualisation with 'ggplot2' and 'leaflet' Wrappers
-Version: 1.8.2
+Version: 1.8.3
 Authors@R: 
     c(person(given = "David", 
                family = "Hodge", 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# simplevis 1.8.3
+
+* Drop region, TA and sea-draining catchments from nz basemap stack.
+
 # simplevis 1.8.2
 
 * Removed code to automate isMobile, as it was not working.

diff --git a/R/ggplot_vbar_fun.R b/R/ggplot_vbar_fun.R
@@ -424,7 +424,7 @@ ggplot_vbar_col <-
            wrap_col_title = 25,
            wrap_caption = 80,
            isMobile = FALSE) {
-
+    
     data <- dplyr::ungroup(data)
     y_var <- rlang::enquo(y_var) #numeric var
     x_var <- rlang::enquo(x_var) #categorical var

diff --git a/R/leaflet_basemap_fun.R b/R/leaflet_basemap_fun.R
@@ -76,7 +76,6 @@ leaflet_basemap_nz <- function(top_layer = "light"){
 
   leaflet() %>%
     fitBounds(166.70047,-34.45676, 178.52966,-47.06345) %>%
-    # leaflet.extras::addFullscreenControl() %>%
     leaflet.extras::addResetMapButton() %>%
     addProviderTiles(
       providers$CartoDB.PositronNoLabels,
@@ -103,41 +102,9 @@ leaflet_basemap_nz <- function(top_layer = "light"){
       group = "Dark",
       options = providerTileOptions(zIndex = 0, attribution = "\u00A9 CartoDB")
     ) %>%
-    addWMSTiles(
-      baseUrl = "https://s3-stats.cloud.eaglegis.co.nz/arcgis/services/Environmental2018/catchment/MapServer/WmsServer?",
-      layers = c("3"),
-      options = WMSTileOptions(
-        format = "image/png",
-        transparent = TRUE,
-        zIndex = 900
-      ),
-      group = "Regions"
-    ) %>%
-    addWMSTiles(
-      baseUrl = "https://s3-stats.cloud.eaglegis.co.nz/arcgis/services/Environmental2018/catchment/MapServer/WmsServer?",
-      layers = c("2"),
-      options = WMSTileOptions(
-        format = "image/png",
-        transparent = TRUE,
-        zIndex = 900
-      ),
-      group = "Territorial authorities"
-    ) %>%
-    addWMSTiles(
-      baseUrl = "https://s3-stats.cloud.eaglegis.co.nz/arcgis/services/Environmental2018/catchment/MapServer/WmsServer?",
-      layers = c("0"),
-      options = WMSTileOptions(
-        format = "image/png",
-        transparent = TRUE,
-        zIndex = 900
-      ),
-      group = "Catchments"
-    ) %>%
     addLayersControl(
       baseGroups = basemap_order,
-      overlayGroups = c("Regions", "Territorial authorities", "Catchments"),
       position = "topleft",
       options = layersControlOptions(autoZIndex = FALSE)
-    ) %>%
-    hideGroup(c("Regions", "Territorial authorities", "Catchments"))
+    ) 
 }