Merge pull request #173 from everettsp/main

Author: steffilazerte

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: weathercan
 Type: Package
 Title: Download Weather Data from Environment and Climate Change Canada
-Version: 0.7.3.9000
+Version: 0.7.4
 Authors@R: c(
      person("Steffi", "LaZerte", email = "sel@steffilazerte.ca", role = c("aut","cre"), comment = c(ORCID = "0000-0002-7690-8360")),
      person("Sam", "Albers", email = "sam.albers@gmail.com", role = c("ctb"), comment = c(ORCID = "0000-0002-9270-7884")),
@@ -12,7 +12,8 @@ Authors@R: c(
      person("Mark", "Ciechanowski", role = "ctb", comment = c(ORCID = "0000-0002-3732-5939")),
      person("Jeremy", "Selva", email = "jeremy1189.jjs@gmail.com", role = "ctb", comment = c(ORCID = "0000-0002-4498-2662")),
      person(c("Kelli", "F."), "Johnson", email = "kelli.johnson@noaa.gov", role = c("ctb"), comment = c(ORCID = "0000-0002-5149-451X")),
-     person("Russ", "Allen", email = "mbr@historicip.com", role = c("ctb"))
+     person("Russ", "Allen", email = "mbr@historicip.com", role = c("ctb")),
+     person("Everett", "Snieder", email = "everett.snieder@gmail.com", role = c("ctb"), comment = c(ORCID = "0000-0003-4997-3404"))
      )
 Description: Provides means for downloading historical weather data from 
     the Environment and Climate Change Canada website 

NEWS.md

@@ -1,6 +1,7 @@
-# weathercan 0.7.3.9000
+# weathercan 0.7.4
 - Add `qual` from newly added Flags column to hourly data
 - Remove vcr
+- Fix long Provincial names (#171)
 
 # weathercan 0.7.3
 - Switch stations inventory list to new location

R/stations.R

@@ -280,15 +280,15 @@ stations_dl_internal <- function(skip = NULL, verbose = FALSE, quiet = FALSE,
                                                        "BRITISH COLUMBIA",
                                                        "MANITOBA",
                                                        "NEW BRUNSWICK",
-                                                       "NEWFOUNDLAND",
+                                                       "NEWFOUNDLAND AND LABRADOR",
                                                        "NORTHWEST TERRITORIES",
                                                        "NOVA SCOTIA",
                                                        "NUNAVUT",
                                                        "ONTARIO",
                                                        "PRINCE EDWARD ISLAND",
                                                        "QUEBEC",
                                                        "SASKATCHEWAN",
-                                                       "YUKON TERRITORY"),
+                                                       "YUKON"),
                                 labels = c("AB", "BC", "MB", "NB", "NL", "NT",
                                            "NS", "NU", "ON", "PE", "QC", "SK",
                                            "YT")),

R/sysdata.rda

@@ -6,15 +6,15 @@ province <- c("ALBERTA" = "AB",
               "BRITISH COLUMBIA" = "BC",
               "MANITOBA" = "MB",
               "NEW BRUNSWICK" = "NB",
-              "NEWFOUNDLAND" = "NL",
+              "NEWFOUNDLAND AND LABRADOR" = "NL",
               "NORTHWEST TERRITORIES" = "NT",
               "NOVA SCOTIA" = "NS",
               "NUNAVUT" = "NU",
               "ONTARIO" = "ON",
               "PRINCE EDWARD ISLAND" = "PE",
               "QUEBEC" = "QC",
               "SASKATCHEWAN" = "SK",
-              "YUKON TERRITORY" = "YT")
+              "YUKON" = "YT")
 
 m_names <- c("station_name" = "Station Name", "station_id" = "ID",
              "station_operator" = "Current Station Operator",

data-raw/data-index.R

@@ -22,7 +22,7 @@ test_that("stations_dl() errors appropriately", {
   skip_if_not_installed("lutz")
 
   bkup <- getOption("weathercan.urls.stations")
-  options(weathercan.urls.stations = "https://httpstat.us/404")
+  options(weathercan.urls.stations = "https://httpbin.org/status/404")
   expect_error(stations_dl(), "Not Found (HTTP 404).", fixed = TRUE)
   options(weathercan.urls.stations = bkup)
 })

tests/testthat/test_03_station_dl.R

@@ -38,9 +38,10 @@ test_that("normals_html() correctly retrieves request 1971-2000", {
 # Proper error when 404
 test_that("normals_html() errors", {
   skip_on_cran()
+
   memoise::forget(normals_html) # Reset cache so we can test a different url
   bkup <- getOption("weathercan.urls.normals")
-  options(weathercan.urls.normals = "https://httpstat.us/404")
+  options(weathercan.urls.normals = "https://httpbin.org/status/404")
   expect_error(normals_html(prov = "MB", station_id = 3471,
                             climate_id = "5010480",
                             normals_years = "1981-2010"),