Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356472 )

Change subject: Use new path
......................................................................

Use new path

Bug: T166724
Change-Id: I60c2d64b49b3ef5d361f7438f64c390407368307
---
M README.md
M utils.R
2 files changed, 12 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wetzel 
refs/changes/72/356472/1

diff --git a/README.md b/README.md
index 6f4c025..1cd09ef 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,20 @@
 # Wikimedia Maps Dashboard
 
-This project is part of the [Discovery 
Dashboards](http://searchdata.wmflabs.org/) project.
+This project is part of the [Discovery 
Dashboards](https://discovery.wmflabs.org/) project, using datasets publicly 
available at 
[analytics.wikimedia.org/datasets/discovery](https://analytics.wikimedia.org/datasets/discovery/).
 For more information on the datasets, refer to [README on the GitHub 
mirror](https://github.com/wikimedia/wikimedia-discovery-golden/blob/master/docs/README.md).
 
 ## Quick start
 
 Install the dependencies:
 
-```
-$ R
-R> install.packages(c('reshape2', 'devtools'))
-R> 
devtools::install_git('https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi')
+```R
+install.packages(c("devtools", "shiny", "reshape2", "data.table"))
+devtools::install_git("https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi";)
 ```
 
-Run the server:
+Run the app:
 
-```
-$ R
-R> shiny::runApp(launch.browser = 0)
+```R
+shiny::runApp(launch.browser = 0)
 ```
 
 Please note that this project is released with a [Contributor Code of 
Conduct](CONDUCT.md). By participating in this project you agree to abide by 
its terms.
diff --git a/utils.R b/utils.R
index 53f8744..e060be7 100644
--- a/utils.R
+++ b/utils.R
@@ -5,7 +5,7 @@
 # used in dygraphs.
 read_actions <- function() {
   # Read in data, split and rename it, and write it o
-  usage_data <<- polloi::read_dataset("discovery/maps/actions_per_tool.tsv", 
col_types = "Dcci") %>%
+  usage_data <<- 
polloi::read_dataset("discovery/metrics/maps/actions_per_tool.tsv", col_types = 
"Dcci") %>%
     dplyr::filter(!is.na(feature), !is.na(action), !is.na(events)) %>%
     { split(.[, c(1, 3, 4)], .$feature) } %>%
     lapply(tidyr::spread_, key = "action", value = "events", fill = 0)
@@ -14,24 +14,24 @@
 
 # Read in user count
 read_users <- function() {
-  user_data <<- polloi::read_dataset("discovery/maps/users_per_feature.tsv", 
col_types = "Dci") %>%
+  user_data <<- 
polloi::read_dataset("discovery/metrics/maps/users_per_feature.tsv", col_types 
= "Dci") %>%
     dplyr::filter(!is.na(feature), !is.na(users)) %>%
     tidyr::spread(feature, users, fill = 0)
   return(invisible())
 }
 
 read_tiles <- function() {
-  new_tiles_automata <<- 
polloi::read_dataset("discovery/maps/tile_aggregates_with_automata.tsv", 
col_types = "Dcidcciidiii") %>%
+  new_tiles_automata <<- 
polloi::read_dataset("discovery/metrics/maps/tile_aggregates_with_automata.tsv",
 col_types = "Dcidcciidiii") %>%
     dplyr::filter(!is.na(total), !is.na(users)) %>%
     data.table::as.data.table()
-  new_tiles_no_automata <<- 
polloi::read_dataset("discovery/maps/tile_aggregates_no_automata.tsv", 
col_types = "Dcidcciidiii") %>%
+  new_tiles_no_automata <<- 
polloi::read_dataset("discovery/metrics/maps/tile_aggregates_no_automata.tsv", 
col_types = "Dcidcciidiii") %>%
     dplyr::filter(!is.na(total), !is.na(users)) %>%
     data.table::as.data.table()
   return(invisible())
 }
 
 read_countries <- function(){
-  country_data <<- polloi::read_dataset("discovery/maps/users_by_country.tsv", 
col_types = "Dcd") %>%
+  country_data <<- 
polloi::read_dataset("discovery/metrics/maps/users_by_country.tsv", col_types = 
"Dcd") %>%
     dplyr::filter(!is.na(country), !is.na(users)) %>%
     dplyr::mutate(users = users * 100) %>%
     tidyr::spread(country, users, fill = 0)

-- 
To view, visit https://gerrit.wikimedia.org/r/356472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60c2d64b49b3ef5d361f7438f64c390407368307
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wetzel
Gerrit-Branch: master
Gerrit-Owner: Bearloga <mpo...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to