Merge pull request #32 from epiforecasts/fix-checks

Fix R-CMD-check
epiforecasts · Sep 22, 2022 · bd66ebb · bd66ebb
2 parents 87eb7a8 + 75cf1a7
commit bd66ebb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/data-raw/england_ltla_shape.R b/data-raw/england_ltla_shape.R
@@ -1,8 +1,10 @@
-library(sf)
-library(dplyr)
-library(usethis)
-library(here)
-library(stringr)
+pacman::p_load(
+  sf,
+  here,
+  dplyr,
+  stringr,
+  usethis
+)
 
 england_ltla_shape <- sf::read_sf(here::here("data-raw", "raw", "uk_ltla_shp", "ltla_uk.shp")) %>%
   sf::st_transform(27700) %>%
@@ -13,4 +15,9 @@ england_ltla_shape <- sf::read_sf(here::here("data-raw", "raw", "uk_ltla_shp", "
     geo_name = LAD20NM
   )
 
+# Replace non-ASCII character (degree symbol) with corresponding ASCII code
+st_crs(england_ltla_shape)$wkt <- gsub(pattern = "°",
+                                       replacement = "\\\u00b0",
+                                       x = st_crs(england_ltla_shape)$wkt)
+
 usethis::use_data(england_ltla_shape, overwrite = TRUE)
diff --git a/data-raw/england_utla_shape.R b/data-raw/england_utla_shape.R
@@ -1,8 +1,10 @@
-library(sf)
-library(dplyr)
-library(usethis)
-library(here)
-library(stringr)
+pacman::p_load(
+  sf,
+  here,
+  dplyr,
+  stringr,
+  usethis
+)
 
 england_utla_shape <- sf::read_sf(here::here("data-raw", "raw", "uk_utla_shp", "utla_uk.shp")) %>%
   sf::st_transform(27700) %>%
@@ -14,4 +16,9 @@ england_utla_shape <- sf::read_sf(here::here("data-raw", "raw", "uk_utla_shp", "
   ) %>%
   dplyr::mutate(geo_code = ifelse(geo_code == "E10000002", "E06000060", geo_code))
 
+# Replace non-ASCII character (degree symbol) with corresponding ASCII code
+st_crs(england_utla_shape)$wkt <- gsub(pattern = "°",
+                                       replacement = "\\\u00b0",
+                                       x = st_crs(england_utla_shape)$wkt)
+
 usethis::use_data(england_utla_shape, overwrite = TRUE)
diff --git a/data/england_ltla_shape.rda b/data/england_ltla_shape.rda
diff --git a/data/england_utla_shape.rda b/data/england_utla_shape.rda