alexdum commited on
Commit
db83ffd
·
1 Parent(s): 71b49d5

Remove Mapbox Satellite basemap option and its associated styling logic from the UI and server.

Browse files
Files changed (2) hide show
  1. server.R +3 -4
  2. ui.R +1 -2
server.R CHANGED
@@ -90,13 +90,12 @@ function(input, output, session) {
90
  current_raster_layers(character(0))
91
  }
92
 
93
- if (input$basemap %in% c("carto_positron", "carto_voyager", "esri_imagery", "mapbox_satellite")) {
94
  # VECTOR STYLES
95
  style_url <- switch(input$basemap,
96
  "carto_positron" = "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",
97
  "carto_voyager" = "https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json",
98
- "esri_imagery" = "https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json", # Voyager for labels
99
- "mapbox_satellite" = paste0("https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v12?access_token=", mapbox_token)
100
  )
101
 
102
  proxy %>% set_style(style_url)
@@ -194,7 +193,7 @@ function(input, output, session) {
194
 
195
  # Toggle Labels (Vector only)
196
  observeEvent(input$show_labels, {
197
- req(input$basemap %in% c("carto_positron", "carto_voyager", "mapbox_satellite", "esri_imagery"))
198
  visibility <- if (input$show_labels) "visible" else "none"
199
  label_layers <- c(
200
  "place_villages", "place_town", "place_country_2", "place_country_1",
 
90
  current_raster_layers(character(0))
91
  }
92
 
93
+ if (input$basemap %in% c("carto_positron", "carto_voyager", "esri_imagery")) {
94
  # VECTOR STYLES
95
  style_url <- switch(input$basemap,
96
  "carto_positron" = "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",
97
  "carto_voyager" = "https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json",
98
+ "esri_imagery" = "https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json" # Voyager for labels
 
99
  )
100
 
101
  proxy %>% set_style(style_url)
 
193
 
194
  # Toggle Labels (Vector only)
195
  observeEvent(input$show_labels, {
196
+ req(input$basemap %in% c("carto_positron", "carto_voyager", "esri_imagery"))
197
  visibility <- if (input$show_labels) "visible" else "none"
198
  label_layers <- c(
199
  "place_villages", "place_town", "place_country_2", "place_country_1",
ui.R CHANGED
@@ -60,8 +60,7 @@ ui <- page_navbar(
60
  "OpenStreetMap" = "osm",
61
  "OpenStreetMap Gray" = "osm_gray",
62
  "Esri World Topo Map" = "esri_topo",
63
- "Esri World Imagery" = "esri_imagery",
64
- "Mapbox Satellite" = "mapbox_satellite"
65
  ),
66
  selected = "carto_positron"
67
  ),
 
60
  "OpenStreetMap" = "osm",
61
  "OpenStreetMap Gray" = "osm_gray",
62
  "Esri World Topo Map" = "esri_topo",
63
+ "Esri World Imagery" = "esri_imagery"
 
64
  ),
65
  selected = "carto_positron"
66
  ),