Add city choice to basic map display

R/parsers.R

@@ -227,8 +227,10 @@ tf_shiny_item_info <- function(
 #'
 #' @export
 tf_parse_cities <- function(url.rpc) {
-  cities.df <- as.data.frame(TownforgeR::tf_rpc_curl(url.rpc, 
-    method ="cc_get_cities", params = list())$result$cities)
+  cities.df <- do.call(rbind,
+    lapply(TownforgeR::tf_rpc_curl(url.rpc, 
+      method ="cc_get_cities", params = list())$result$cities,
+      as.data.frame) )
   cities.v <- cities.df$city_id
   names(cities.v) <- cities.df$name
   list(cities.df = cities.df, cities.v = cities.v)

inst/shiny-app/server.R

@@ -271,6 +271,8 @@ serverTF <- function(input, output, session){
     
     output$map_chart <- shiny::renderPlot({
       
+      city <- as.numeric(input$map_city)
+      
       flags.ret <- TownforgeR::tf_rpc_curl(url.rpc = url.townforged, method = "cc_get_flags")$result$flags
       max.flag.id <- flags.ret[[length(flags.ret)]]$id
       
@@ -281,7 +283,7 @@ serverTF <- function(input, output, session){
         if (i == 21 & packageVersion("TownforgeR") == "0.0.15") { next }
         # far away flag in testnet
         ret <- TownforgeR::tf_rpc_curl(url.rpc = url.townforged, method = "cc_get_flag", params = list(id = i))
-        if (any(names(ret) == "error") || ret$result$city > 0)  { next }
+        if (any(names(ret) == "error") || ret$result$city != city)  { next }
         coords.mat[i, "x0"] <- ret$result$x0
         coords.mat[i, "x1"] <- ret$result$x1
         coords.mat[i, "y0"] <- ret$result$y0
@@ -310,6 +312,11 @@ serverTF <- function(input, output, session){
     })
   })
   
+  observe({
+    shiny::updateSelectInput(session, "map_city", 
+      choices = session.vars$cities$cities.v)
+  })
+  
   shiny::observeEvent(input$influence_button, {
     
     output$influence_chart <- shiny::renderPlot({

inst/shiny-app/ui.R

@@ -198,6 +198,7 @@ uiTF <- shiny::navbarPage(paste("TownforgeR", gsub("`|´", "", packageVersion("T
     shiny::plotOutput("depth_chart")
   ),
   shiny::tabPanel("Map",
+    shiny::selectInput("map_city", "Town:", choices = NULL),
     shiny::actionButton("map_button", "Show map"),
     shiny::plotOutput("map_chart", height = "1000px")
   ),