-
Notifications
You must be signed in to change notification settings - Fork 506
Added removeFeatureGeoJSON, addFeatureGeoJSON, and styleFeatureGeoJSON #163
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
01a0b58
added setStyleGeojson, override for mouseover and mouseout for GeoJSO…
chris-holcomb df1d4c8
added addFeatureGeoJSON and removeFeatureGeoJSON
chris-holcomb 6136951
slight cleanup, use featureId aka geojson$features[[i]]$id
chris-holcomb a3747c6
removed forced highlights and improved example
chris-holcomb 170260c
change back version number
chris-holcomb a7de02e
change setStyleGeoJSON to styleFeatureGeoJSON
chris-holcomb 405e8b8
allow list for style, fix JS warning, include simple add example
chris-holcomb ec6d59f
clean up functions
chris-holcomb 95d395b
or a list
chris-holcomb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| library(shiny) | ||
| library(leaflet) | ||
| library(rgdal) | ||
| library(jsonlite) | ||
| library(scales) | ||
| googleLink <- function(lat,lng,zoom) { | ||
| sprintf("http://www.google.com/maps/place/%s,%s/@%s,%s,%sz/data=!3m1!1e3", | ||
| lat, lng, lat, lng, zoom) | ||
| } | ||
| geojson <- fromJSON(system.file("examples/countries.json", package = "leaflet"),simplifyVector = FALSE) | ||
|
|
||
| geojson$style = list( | ||
| weight = 1, | ||
| color = "#555555", | ||
| opacity = 1, | ||
| fillOpacity = 0.8 | ||
| ) | ||
| geojson$features <- lapply(geojson$features, function(feat) { | ||
| feat$id <- feat$properties$admin # Must set ids | ||
| feat | ||
| }) | ||
|
|
||
| gdp_md_est <- sapply(geojson$features, function(feat) {feat$properties$gdp_md_est}) | ||
| pop_est <- sapply(geojson$features, function(feat) {feat$properties$pop_est}) | ||
| ids <- sapply(geojson$features,function(x) x$id) | ||
| allCountries <- data.frame(ids = ids, gdp_md_est = gdp_md_est, pop_est = pop_est , stringsAsFactors = FALSE) | ||
|
|
||
| # note id specified in GeoJSON on highest level (of single feature) for use in removeFeatureGeoJSON and styleFeatureGeoJSON | ||
| bermudaTriangle <- '{ | ||
| "type": "Feature", | ||
| "id": "Bermuda Triangle", | ||
| "properties": { | ||
| "name": "Bermuda Triangle", | ||
| "area": 1150180 | ||
| }, | ||
| "geometry": { | ||
| "type": "Polygon", | ||
| "coordinates": [ | ||
| [ | ||
| [-64.73, 32.31], | ||
| [-80.19, 25.76], | ||
| [-66.09, 18.43], | ||
| [-64.73, 32.31] | ||
| ] | ||
| ] | ||
| } | ||
| }' | ||
|
|
||
| ui <- | ||
| navbarPage(title="R-Shiny/Leaflet Interactions", | ||
| tabPanel("Map", | ||
| fluidPage( | ||
| fluidRow( | ||
| column(10, | ||
| div(class="outer", | ||
| tags$head(includeCSS(system.file("examples/styles.css", package = "leaflet"))), | ||
| leafletOutput("mymap","83.333%","100%") | ||
| ) | ||
| ), | ||
| column(2, | ||
| h3(""), | ||
| actionButton("addLayers", "add layers"), | ||
| actionButton("addbasemap", "addbasemap"), | ||
| actionButton("clearbasemap", "clearbasemap"), | ||
| actionButton("clear", "clear"), | ||
| actionButton("addPopup", "addPopup"), | ||
| actionButton("clearPopup", "clearPopup"), | ||
| actionButton("addGeojson", "addGeojson"), | ||
| actionButton("clearGeojson", "clearGeojson"), | ||
| actionButton("addBermuda", "addBermuda"), | ||
| actionButton("removeBermuda", "removeBermuda"), | ||
| checkboxInput('popupAll', 'popupAll', value = FALSE), | ||
| selectInput('setstyle', label = "Color a Country Red!", choices = NULL,selected = NULL), | ||
| selectInput('removefeature', label = "Remove a Country!", choices = NULL,selected = NULL), | ||
| selectInput('addfeature', label = "Add back a Country!", choices = NULL,selected = NULL), | ||
| selectInput('colorBy',label="Color by Selected Field!",choices=c("none","gdp_md_est","pop_est"), | ||
| selected = "None") | ||
| ) | ||
| ) | ||
| ) | ||
| ) | ||
| ) | ||
| server <- function(input, output, session) { | ||
| output$mymap <- renderLeaflet({ | ||
| leaflet() %>% | ||
| addMarkers(data = cbind(rnorm(40) * 2 + 13, rnorm(40) + 48)) | ||
| }) | ||
| addedData <- reactiveValues() | ||
| addedData$df <- allCountries | ||
| removedData <- reactiveValues() | ||
| removedData$ids <- data.frame(ids = as.character(), gdp_md_est = as.numeric(), pop_est = as.numeric(), stringsAsFactors = FALSE) | ||
|
|
||
| observeEvent(input$colorBy, { | ||
| if (input$colorBy == "none") { | ||
| for (i in 1:length(addedData$df$ids)) { | ||
| leafletProxy("mymap") %>% | ||
| styleFeatureGeoJSON(layerId ='geojsonlayer', featureId = addedData$df$ids[i], | ||
| style = sprintf('{"fillColor": "%s"}',"blue")) | ||
| } | ||
| } else { | ||
| colorByData <- rescale(addedData$df[[input$colorBy]]) | ||
| pal <- colorBin("Greens", 0:1,bins=10) | ||
| addColorSetStyle <- function(featureId,color) { | ||
| leafletProxy("mymap") %>% | ||
| styleFeatureGeoJSON(layerId ='geojsonlayer', featureId = featureId, | ||
| style = sprintf('{"fillColor": "%s"}',pal(color))) | ||
| } | ||
| mapply(addColorSetStyle,addedData$df$ids,colorByData) | ||
| } | ||
| }) | ||
|
|
||
| observeEvent(input$addLayers, { | ||
| leafletProxy("mymap") %>% | ||
| addTiles(urlTemplate = "http://mesonet.agron.iastate.edu/cache/tile.py/1.0.0/nexrad-n0q-900913/{z}/{x}/{y}.png", | ||
| attribution = NULL, layerId = NULL, options = tileOptions(zIndex=1)) %>% | ||
| addTiles(urlTemplate = "http://server.arcgisonline.com/ArcGIS/rest/services/USA_Topo_Maps/MapServer/tile/{z}/{y}/{x}", | ||
| attribution = NULL, layerId = NULL, options = tileOptions(zIndex=0)) %>% | ||
| addWMSTiles(baseUrl = "http://gis1.usgs.gov/arcgis/services/gap/PADUS_Status/MapServer/WMSServer",layers = "0", | ||
| layerId = "wms_protectedArea",options = WMSTileOptions(styles = "", format = "image/png8", transparent = TRUE, | ||
| opacity = ".5",zIndex="2.1")) | ||
| }) | ||
| observeEvent(input$mymap_geojson_click, { | ||
| if (input$popupAll==FALSE) { | ||
| content <- as.character(tagList( | ||
| tags$strong(paste0("GeoJSON ID: ",input$mymap_geojson_click$properties$admin)), | ||
| tags$a(target="_blank",href=googleLink(input$mymap_geojson_click$lat, input$mymap_geojson_click$lng,input$mymap_zoom),"Google Maps") | ||
| )) | ||
| leafletProxy("mymap") %>% clearPopups() | ||
| leafletProxy("mymap") %>% addPopups(input$mymap_geojson_click$lng, input$mymap_geojson_click$lat, content) | ||
| } | ||
| }) | ||
| observeEvent(input$mymap_click, { | ||
| if (input$popupAll==FALSE) { | ||
| content <- as.character(tagList( | ||
| tags$strong("Basemap Click "), | ||
| tags$a(target="_blank",href=googleLink(input$mymap_click$lat, input$mymap_click$lng,input$mymap_zoom),"Google Maps") | ||
| )) | ||
| leafletProxy("mymap") %>% clearPopups() | ||
| leafletProxy("mymap") %>% addPopups(input$mymap_click$lng+0.01, input$mymap_click$lat+0.01, content) | ||
| } | ||
| }) | ||
| observeEvent(input$mymap_click,{ | ||
| if(input$popupAll == TRUE){ | ||
| content <- as.character(tagList( | ||
| tags$strong("All Click "), | ||
| tags$a(target="_blank",href=googleLink(input$mymap_click$lat, input$mymap_click$lng,input$mymap_zoom),"Google Maps") | ||
| )) | ||
| leafletProxy("mymap") %>% clearPopups() | ||
| leafletProxy("mymap") %>% addPopups(input$mymap_click$lng, input$mymap_click$lat, content) | ||
| } | ||
| }) | ||
| observeEvent(input$mymap_geojson_click, { | ||
| if(input$popupAll == TRUE){ | ||
| content <- as.character(tagList( | ||
| tags$strong("All Click "), | ||
| tags$a(target="_blank",href=googleLink(input$mymap_geojson_click$lat, input$mymap_geojson_click$lng,input$mymap_zoom),"Google Maps") | ||
| )) | ||
| leafletProxy("mymap") %>% clearPopups() | ||
| leafletProxy("mymap") %>% addPopups(input$mymap_geojson_click$lng, input$mymap_geojson_click$lat, content) | ||
| } | ||
| }) | ||
| observeEvent(input$addGeojson, { | ||
| leafletProxy("mymap") %>% | ||
| addGeoJSON(geojson,layerId ='geojsonlayer',smoothFactor=2) | ||
| updateSelectizeInput(session, 'setstyle', choices = addedData$df$ids, server = TRUE) | ||
| updateSelectizeInput(session, 'removefeature', choices = addedData$df$ids, server = TRUE) | ||
| updateSelectizeInput(session, 'addfeature', choices = NULL, server = TRUE) | ||
| }) | ||
| observeEvent(input$setstyle, { | ||
| leafletProxy("mymap") %>% | ||
| styleFeatureGeoJSON(layerId ='geojsonlayer', featureId = input$setstyle, style = '{"fillColor" :"red"}') | ||
| }) | ||
| observeEvent(input$removefeature, { | ||
| if(is.null(input$removefeature)==FALSE && input$removefeature != "") { | ||
| leafletProxy("mymap") %>% | ||
| removeFeatureGeoJSON(layerId ='geojsonlayer', featureId = input$removefeature) | ||
| if (length(addedData$df$ids) > 1) { | ||
| addedData$df <- addedData$df[-c(which(addedData$df$ids==input$removefeature)),] | ||
| } | ||
| removedData$df <- rbind(removedData$df,allCountries[which(allCountries$ids==input$removefeature),]) | ||
| updateSelectizeInput(session, 'setstyle', choices = addedData$df$ids, server = TRUE, selected=NULL) | ||
| updateSelectizeInput(session, 'removefeature', choices = addedData$df$ids, server = TRUE, selected=NULL) | ||
| updateSelectizeInput(session, 'addfeature', choices = removedData$df$ids, server = TRUE, selected=NULL) | ||
| } | ||
| }) | ||
| observeEvent(input$addfeature, { | ||
| if(is.null(input$addfeature)==FALSE && input$addfeature != "") { | ||
| geojson <- geojson$features[[seq_along(geojson$features)[sapply(geojson$features, | ||
| FUN = function(x) x[["id"]] == input$addfeature)]]] | ||
| leafletProxy("mymap") %>% | ||
| addFeatureGeoJSON(geojson, layerId ='geojsonlayer') # can use a list (slow) | ||
| if (length(addedData$df$ids) > 1) { | ||
| removedData$df <- removedData$df[-c(which(removedData$df$ids==input$addfeature)),] | ||
| } | ||
| addedData$df <- rbind(addedData$df,allCountries[which(allCountries$ids==input$addfeature),]) | ||
| updateSelectizeInput(session, 'setstyle', choices = addedData$df$ids, server = TRUE, selected=NULL) | ||
| updateSelectizeInput(session, 'removefeature', choices = addedData$df$ids, server = TRUE, selected=NULL) | ||
| updateSelectizeInput(session, 'addfeature', choices = removedData$df$ids, server = TRUE, selected=NULL) | ||
| } | ||
| }) | ||
| observeEvent(input$clearGeojson, { | ||
| leafletProxy("mymap") %>% removeGeoJSON(layerId ='geojsonlayer') | ||
| }) | ||
| observeEvent(input$addPopup, { | ||
| content <- paste(sep = "<br/>", | ||
| "<b><a href='http://www.samurainoodle.com'>Samurai Noodle</a></b>", | ||
| "606 5th Ave. S", | ||
| "Seattle, WA 98138" | ||
| ) | ||
| leafletProxy("mymap") %>% addPopups(-122.327298, 47.597131, content, | ||
| options = popupOptions(closeButton = TRUE)) | ||
| }) | ||
| observeEvent(input$clearPopup, { | ||
| leafletProxy("mymap") %>% clearPopups() | ||
| }) | ||
| observeEvent(input$addbasemap, { | ||
| leafletProxy("mymap") %>% addProviderTiles("Acetate.terrain",options = providerTileOptions(noWrap = TRUE,zIndex=0),layerId="basemap") | ||
| }) | ||
| observeEvent(input$clearbasemap, { | ||
| leafletProxy("mymap") %>% removeTiles("basemap") %>% removeTiles("wms_protectedArea") | ||
| }) | ||
| observeEvent(input$clear, { | ||
| leafletProxy("mymap") %>% clearTiles() | ||
| }) | ||
| # need ability to bring to top | ||
| observeEvent(input$mymap_geojson_mouseover, { | ||
| leafletProxy("mymap") %>% | ||
| styleFeatureGeoJSON(layerId ='geojsonlayer', featureId = input$mymap_geojson_mouseover$featureId, | ||
| style = list(weight=1,color="black")) # or string | ||
| }) | ||
| observeEvent(input$mymap_geojson_mouseout, { | ||
| leafletProxy("mymap") %>% | ||
| styleFeatureGeoJSON(layerId ='geojsonlayer', featureId = input$mymap_geojson_mouseout$featureId, | ||
| style = '{"weight": 1, "color": "#555555"}') # or string | ||
| }) | ||
| observeEvent(input$addBermuda, { | ||
| # geoJSON layer must already be added | ||
| # simplified example, not added to addedData | ||
| leafletProxy("mymap") %>% | ||
| addFeatureGeoJSON(as.character(minify(bermudaTriangle)), layerId ='geojsonlayer') # can use a GeoJSON string (as.character) | ||
| }) | ||
| observeEvent(input$removeBermuda, { | ||
| leafletProxy("mymap") %>% | ||
| removeFeatureGeoJSON(layerId ='geojsonlayer', featureId = "Bermuda Triangle") | ||
| }) | ||
| } | ||
| shinyApp(ui, server) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| div.outer { | ||
| position: fixed; | ||
| top: 41px; | ||
| left: 0; | ||
| right: 0; | ||
| bottom: 0; | ||
| overflow: hidden; | ||
| padding: 0; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The example is very nice 👍 The interaction (mouseover) is a bit slow, though. I didn't investigate this issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it's slow. We really need a way to send over setStyle or resetStyle functions to the client, although I'm not sure yet how to do that and allow customization. Note: I don't believe resetStyle will work for when you effectively want to change back to the prior style instead of the originally loaded style (when you have dynamic data). Internally, on
leaflet.jswe have hard-coded:and inside the
onEachFeatureofvar gjlayerofmethods.addGeoJSONwe include:The capability of assigning styles to events could probably be added to
addGeoJSON. Then, we probably need some sort of functionstyleGeoJSONthat lets you restyle an entire layer (many users won't actually have dynamic data), and a functionstyleEventGeoJSONthat lets you restyle the event styles.ADDED: It looks like the changes you suggested sped it up considerably, thanks! Within the "styled events" we also need a way to send features to the top using
bringToFrontas in this example (if you look at the borders, some are thinner because they are below other features).Despite being faster, it does still get suck with some highlighted features that you have mouseout'd on (it does not do this on the hard-coded JS version).
UPDATE: moved this comment to here