fix some missing stuff

Author: evanodell

CRAN-RELEASE

@@ -1,7 +1,7 @@
 Package: parlitools
 Type: Package
 Title: Tools for Analysing UK Politics
-Version: 0.4.0
+Version: 0.4.1
 Authors@R: person(
     "Evan Odell", email="evanodell91@gmail.com", 
     role=c("aut", "cre"), comment = c(ORCID = '0000-0003-1845-808X'))

DESCRIPTION

@@ -1,3 +1,7 @@
+# parlitools 0.4.1
+
+* Fixed some missing 2017 results from `bes_2019` data, spotted by Antony Unwin.
+
 # parlitools 0.4.0
 
 * Added 2019 UK General Election Results

NEWS.md

@@ -2,8 +2,8 @@
 
 ## Resubmission
 
-This is a resubmission of the `parlitools` package, with new data on the 2019
-UK General Election as well as some minor vignette improvements.
+This is a resubmission of the `parlitools` package, which fixes missing data
+spotted in the previous version after it was submitted to CRAN.
 
 ## Test environments
 

cran-comments.md

@@ -105,6 +105,9 @@ usethis::use_data(bes_2017, overwrite = TRUE)
 
 library(stringr)
 library(stringi)
+library(readr)
+library(dplyr)
+library(tidyr)
 
 #https://candidates.democracyclub.org.uk/api/docs/csv/#past
 candidates <- read_csv("data-raw/candidates-parl.2019-12-12.csv") %>% 
@@ -177,7 +180,7 @@ names(candidates2) <- str_replace_all(names(candidates2),
 # results
 
 # from: https://researchbriefings.parliament.uk/ResearchBriefing/Summary/CBP-8749
-bes_2019 <- read_csv("./data-raw/HoC-GE2019-results-by-constituency.csv") %>%
+bes_2019_full <- read_csv("./data-raw/HoC-GE2019-results-by-constituency.csv") %>%
   select(-declaration_time, -mp_firstname, -mp_gender, -mp_surname,
          -second_party) %>% 
   rename("ons_const_id" = ons_id,
@@ -207,18 +210,18 @@ bes_2019 <- read_csv("./data-raw/HoC-GE2019-results-by-constituency.csv") %>%
            "Alliance" = "Alliance",
            "UUP" = "Ulster Unionist Party"))
 
-bes_2019 <- bes_2019 %>% 
+bes_2019_full <- bes_2019_full %>% 
   rename_at(vars(con:speaker), ~paste0(., "_vote_19"))
 
-bes_2019 <- bes_2019 %>%
+bes_2019_full <- bes_2019_full %>%
   mutate_at(list(perc = ~./total_vote_19),
             .vars = vars(con_vote_19:speaker_vote_19)) %>%
   mutate_at(vars(con_vote_19_perc:speaker_vote_19_perc), ~.*100)
 
-names(bes_2019) <- str_replace_all(names(bes_2019),
+names(bes_2019_full) <- str_replace_all(names(bes_2019_full),
                                       "(.*)_vote_19_perc", "\\1_19")
 
-bes_2019 <- bes_2019 %>% 
+bes_2019_full <- bes_2019_full %>% 
   mutate(seat_change_1719 = ifelse(
     substr(seat_change_1719, nchar(seat_change_1719)-4, 
            nchar(seat_change_1719)) == " hold",
@@ -232,28 +235,60 @@ bes_2019 <- bes_2019 %>%
     "Democratic Unionist Party"),
   vectorize_all = FALSE ))
 
+bes_2017 <- parlitools::bes_2017 %>%
+  select(pano:ons_const_id, winner_17:electorate_17, 
+         leave_hanretty, remain_hanretty)
+
+bes_2019_gb <- bes_2019_full %>% filter(region != "Northern Ireland")
+
+bes_2019_gb <- inner_join(bes_2019_gb, 
+                      bes_2017)
+
+
+
+
+ni_ge_2017 <- parlitools::ni_ge_2017
+
+ni_ge_2017 <- ni_ge_2017 %>% select(pano, ons_const_id, electorate_17:con_17)
+
+leave_votes_west <- parlitools::leave_votes_west  %>%
+  mutate(leave_hanretty = figure_to_use*100) %>%
+  select(ons_const_id, leave_hanretty)
+
+ni_ge_2017 <- ni_ge_2017 %>%
+  inner_join(leave_votes_west) %>%
+  mutate(remain_hanretty = 100-leave_hanretty) %>%
+  rename(total_vote_17 = total_votes_17)
+
+x4 <- bes_2019_full %>%
+  inner_join(ni_ge_2017)
 
-bes_2019 <- left_join(bes_2019, 
-                      bes_2017 %>% select(pano:electorate_17, 
-                                          leave_hanretty, remain_hanretty))
+bes_2019 <- bind_rows(bes_2019_gb, x4)
 
 bes_2019 <- bes_2019 %>%
   mutate(con_1719 = con_19 - con_17,
          lab_1719 = lab_19 - lab_17,
          ld_1719  = ld_19  - ld_17 ,
          green_1719   = green_19   - green_17  ,
          snp_1719 = snp_19 - snp_17,
-         pc_1719  = pc_19  - pc_17)
+         pc_1719  = pc_19  - pc_17,
+         uup_1719 = uup_19 - uup_17,
+         dup_1719 = dup_19 - dup_17,
+         alliance_1719 = alliance_19 - alliance_17,
+         sf_1719 = sf_19 - sf_17,
+         sdlp_1719 = sdlp_19 - sdlp_17
+         )
 
 
 glimpse(bes_2019)
 
-bes_2019 <- bes_2019 %>% select(pano, ons_const_id:speaker_19, con_1719:pc_1719,
-                                winner_17:electorate_17, leave_hanretty,
-                                remain_hanretty)
+# bes_2019 <- bes_2019 %>% select(pano, ons_const_id:speaker_19, con_1719:pc_1719,
+#                                 winner_17:electorate_17, leave_hanretty,
+#                                 remain_hanretty)
 
 bes_2019 <- bes_2019 %>% left_join(candidates2)
 
+bes_2019[bes_2019==0] <- NA
 
 usethis::use_data(bes_2019, overwrite = TRUE)
 

data-raw/bes-data-prep.R

@@ -55,16 +55,17 @@ ge_2017 <- ge_2017 %>% filter(str_detect(ons_code, "N")) %>%
   select(ons_code, pano, constituency, party_identifer, valid_votes) %>% 
   spread(party_identifer, valid_votes) %>%
   mutate(total_votes_17 = select(., Alliance:WP) %>% rowSums(na.rm = TRUE),
-         other_vote_17 = select(., `CIST Alliance`, Conservative, Independent,
+         other_vote_17 = select(., `CIST Alliance`, Independent,
                                 `Independent (Lady Hermon)`, `PBP Alliance`,
                                 TUV, WP) %>%  rowSums(na.rm = TRUE)) %>%
   rename(alliance_vote_17 = Alliance,
          dup_vote_17 = DUP,
          green_vote_17 = `Green Party`,
          sf_vote_17 = `Sinn Féin`,
          sdlp_vote_17 = `SDLP`,
-         uup_vote_17 = `UUP`) %>%
-  select(-`CIST Alliance`, -Conservative, -Independent,
+         uup_vote_17 = `UUP`,
+         con_vote_17 = `Conservative`) %>%
+  select(-`CIST Alliance`, -Independent,
          -`Independent (Lady Hermon)`, -`PBP Alliance`,
          -TUV, -WP)
 
@@ -85,6 +86,7 @@ ge_2017 <- ge_2017 %>%
          sf_17 = (sf_vote_17/total_votes_17)*100,
          sdlp_17 = (sdlp_vote_17/total_votes_17)*100,
          uup_17 = (uup_vote_17/total_votes_17)*100,
+         con_17 = (con_vote_17/total_votes_17)*100,
          other_17 = (other_vote_17/total_votes_17)*100,
          ukip_17 = NA,
          turnout_17 = (total_votes_17/electorate_17)*100)
@@ -148,7 +150,7 @@ results_15 <- results_15 %>% filter(str_detect(ons_code, "N")) %>%
   spread(party_identifier, valid_votes) %>%
   mutate(total_votes_15 = select(., Alliance:`Workers Party`) %>% rowSums(na.rm = TRUE),
          other_vote_15 = select(., `Cannabis is Safer than Alcohol Party`,
-                                Conservative, Independent,
+                                Independent,
                                 `People Before Profit Alliance`,
                                 `Traditional Unionist Voice`,
                                 `Workers Party`) %>% rowSums(na.rm = TRUE)) %>%
@@ -158,8 +160,9 @@ results_15 <- results_15 %>% filter(str_detect(ons_code, "N")) %>%
          sf_vote_15 = `Sinn Fein`,
          sdlp_vote_15 = `Social Democratic and Labour Party`,
          uup_vote_15 = `Ulster Unionist Party`,
-         ukip_vote_15 = `UK Independence Party`) %>% 
-  select(-`Cannabis is Safer than Alcohol Party`, -Conservative, 
+         ukip_vote_15 = `UK Independence Party`,
+         con_vote_15 = `Conservative`) %>% 
+  select(-`Cannabis is Safer than Alcohol Party`,
          -`People Before Profit Alliance`, -`Traditional Unionist Voice`,
          -Independent, -`Workers Party`)
 
@@ -173,6 +176,7 @@ results_15 <- results_15 %>%
          sf_15 = (sf_vote_15/total_votes_15)*100,
          sdlp_15 = (sdlp_vote_15/total_votes_15)*100,
          uup_15 = (uup_vote_15/total_votes_15)*100,
+         con_15 = (con_vote_15/total_votes_15)*100,
          turnout_15 = (total_votes_15/electorate_15)*100)
 
 glimpse(results_15)
@@ -189,6 +193,7 @@ ni_results <- ni_results %>%
          sf_1517 = sf_17 - sf_15,
          sdlp_1517 = sdlp_17 - sdlp_15,
          uup_1517 = uup_17 - uup_15,
+         con_1517 = con_17 - con_15,
          winner_17 = recode(
            winner_17,
            "Democratic Unionist Party - D.U.P." = "Democratic Unionist Party",
@@ -218,12 +223,12 @@ ni_results <- ni_results %>% select(ons_code, pano, constituency,
                                     majority_15, majority_vote_15,
                                     "alliance_vote_15", "dup_vote_15", 
                                     "green_vote_15", sf_vote_15, "sdlp_vote_15",
-                                    "ukip_vote_15", "uup_vote_15",
+                                    "ukip_vote_15", "uup_vote_15", con_vote_15,
                                     "other_vote_15", "alliance_15", "dup_15",
                                     "green_15", "sf_15", "sdlp_15", "uup_15", 
-                                    electorate_17, total_votes_17, turnout_17,
-                                    winner_17, majority_17, majority_vote_17,
-                                    everything()) %>%
+                                    con_15, electorate_17, total_votes_17,
+                                    turnout_17, winner_17, majority_17,
+                                    majority_vote_17, everything()) %>%
   rename(ons_const_id = ons_code, 
          constituency_name = constituency)