new poopulation data

b-kennedy0 · May 11, 2021 · 61b173e · 61b173e
1 parent 4a2db1b
commit 61b173e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/server.R b/server.R
@@ -1,16 +1,16 @@
 server <- function(input, output) {
-  
+
   # Latest Date ----------------------------------------------------------
   latest <- format(as.Date(max(dataset$date)), format = "%d/%m/%Y")
   output$latest_date <- renderText({
     latest
   })
 
   # Populations (https://www.ons.gov.uk/peoplepopulationandcommunity/populationandmigration/populationestimates)
-  eng_pop <- 56287000
-  wal_pop <- 3152900
-  sco_pop <- 5463300
-  ni_pop <- 1893700
+  eng_pop <- 44263393
+  wal_pop <- 2522940
+  sco_pop <- 4434138
+  ni_pop <- 1452962
   uk_pop <- sum(eng_pop,wal_pop,sco_pop,ni_pop)
   uk_total <- sum(dataset$cumPeopleVaccinatedFirstDoseByPublishDate
                   [dataset$date==max(dataset$date)])

diff --git a/www/index.html b/www/index.html
@@ -99,7 +99,6 @@ <h1>
                     progress of<br>
                     COVID-19 vaccination in the UK.
                 </h1>
-
 
                 <div class="home-content__buttons">
                     <a href="#stats" class="smoothscroll btn btn--stroke">
@@ -149,31 +148,31 @@ <h6>England</h6>
                 <div class="stats__count">
                   {{eng_vaccines_pc}}
                 </div>
-                <h5>% of the population</h5>
+                <h5>% of the adult population</h5>
                 <h6>{{eng_vaccines_no}} Vaccines</h6>
             </div>
             <div class="col-block stats__col">
                 <h6>Wales</h6>
                 <div class="stats__count">
                   {{wal_vaccines_pc}}
                 </div>
-                <h5>% of the population</h5>
+                <h5>% of the adult population</h5>
                 <h6>{{wal_vaccines_no}} Vaccines</h6>
             </div>
             <div class="col-block stats__col">
                 <h6>Scotland</h6>
                 <div class="stats__count">
                   {{sco_vaccines_pc}}
                 </div>
-                <h5>% of the population</h5> 
+                <h5>% of the adult population</h5> 
                 <h6>{{sco_vaccines_no}} Vaccines</h6>
             </div>
             <div class="col-block stats__col">
                 <h6>Northern Ireland</h6>
                 <div class="stats__count">
                   {{ni_vaccines_pc}}
                 </div>
-                <h5>% of the population</h5>
+                <h5>% of the adult population</h5>
                 <h6>{{ni_vaccines_no}} Vaccines</h6>
             </div>
 
@@ -280,7 +279,7 @@ <h3 class="h2">Spreading Hope</h3>
                 </div>  
                 <div class="service-text">
                     <h3 class="h2">App Data Refresh</h3>
-                    <p>The data is refreshed daily. However, depending on when you view the app, it is possible that the data is one/two days old as the latest data has not yet been published.<br />Population data is estimated from the <a href="https://www.ons.gov.uk/peoplepopulationandcommunity/populationandmigration/populationestimates" target="_blank" rel="noopener">Office for National Statistics</a> (ONS). Currently using the following figures:
+                    <p>The data is refreshed daily. However, depending on when you view the app, it is possible that the data is one/two days old as the latest data has not yet been published.<br />Population data is estimated from the <a href="https://www.ons.gov.uk/peoplepopulationandcommunity/populationandmigration/populationestimates" target="_blank" rel="noopener">Office for National Statistics 2019 Mid-year estimate</a> (ONS) for adults (18+). Currently using the following figures:
                     <ul class="stats-tabs">
                         <li><a>{{england}} <em>England</em></a></li>
                         <li><a>{{wales}} <em>Wales</em></a></li>