remove useless timelinec hart

JohnCoene · Mar 12, 2020 · 881c6ed · 881c6ed
1 parent d14cc9e
commit 881c6ed
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 144 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -18,8 +18,6 @@ export(mod_dxy_table_server)
 export(mod_dxy_table_ui)
 export(mod_jhu_death_rate_server)
 export(mod_jhu_death_rate_ui)
-export(mod_map_server)
-export(mod_map_ui)
 export(mod_new_cases_server)
 export(mod_new_cases_ui)
 export(mod_news_server)

diff --git a/R/app_server.R b/R/app_server.R
@@ -151,7 +151,6 @@ app_server <- function(input, output,session) {
       callModule(mod_trend_server, "trend_ui_1", df = df)
 
       # maps
-      callModule(mod_map_server, "map_ui_1", df = df)
       callModule(mod_world_server, "world_ui_1", df = df)
       callModule(mod_time_provinces_server, "time_provinces_1", df = df)
 

diff --git a/R/app_ui.R b/R/app_ui.R
@@ -107,13 +107,12 @@ app_ui <- function() {
               f7Col(mod_trend_ui("trend_ui_1")),
               f7Col(mod_jhu_death_rate_ui("jhu_death_rate_ui_1"))
             ),
-            mod_map_ui("map_ui_1"),
             mod_time_provinces_ui("time_provinces_1"),
-            mod_world_ui("world_ui_1"),
             f7Row(
               mod_china_ui("table_china", "China"),
               mod_table_world_ui("table_world", "World")
-            )
+            ),
+            mod_world_ui("world_ui_1"),
           ),
           f7Tab(
             tabName = "Weixin",

diff --git a/R/mod_map.R b/R/mod_map.R
diff --git a/R/mod_world.R b/R/mod_world.R
@@ -55,7 +55,7 @@ mod_world_server <- function(input, output, session, df){
     if(is.null(input$world_clicked_data))
       return(span("Cases outside China"))
     else
-      return(span(input$world_clicked_data$name))
+      return(span("Cases in", input$world_clicked_data$name))
   })
 
   output$plot <- echarts4r::renderEcharts4r({

diff --git a/man/mod_map.Rd b/man/mod_map.Rd