Skip to content

Commit e6c99e9

Browse files
authored
climate 1.2.7
* rc hotfixes * hotfix rc 127 * fix: rc127-hotfix
1 parent 9491d60 commit e6c99e9

File tree

9 files changed

+22
-20
lines changed

9 files changed

+22
-20
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: climate
22
Title: Interface to Download Meteorological (and Hydrological) Datasets
3-
Version: 1.2.6
3+
Version: 1.2.7
44
Authors@R: c(person(given = "Bartosz",
55
family = "Czernecki",
66
role = c("aut", "cre"),

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# climate 1.2.6
1+
# climate 1.2.7
22

33
* speeding up selective download for given station names in `meteo_imgw_*` and `hydro_imgw_daily()` functions that simultaneously reduce use of memory
44
* minor fix for `meteo_imgw_daily` to handle cases with station names containing extra spaces or non-parsable characters
55
* verbosing currently processed url for easier detection of problematic or corrupted datasets
6+
* change of NOAA NCDC's url from www1.ncdc.noaa.gov/pub/data/noaa/ to: www.ncei.noaa.gov
67

78

89
# climate 1.2.5

R/meteo_noaa_hourly.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#' Downloading hourly (meteorological) data from the SYNOP stations available in the NOAA ISD collection.
44
#' Some stations in the dataset are dated back even up to 1900.
55
#' By default only records that follow FM-12 (SYNOP) convention are processed.
6-
#' Further details available at: https://www1.ncdc.noaa.gov/pub/data/noaa/readme.txt
6+
#' Further details available at: https://www.ncei.noaa.gov/pub/data/noaa/readme.txt
77
#'
8-
#' @param station ID of meteorological station(s) (characters). Find your station's ID at: https://www1.ncdc.noaa.gov/pub/data/noaa/isd-history.txt
8+
#' @param station ID of meteorological station(s) (characters). Find your station's ID at: https://www.ncei.noaa.gov/pub/data/noaa/isd-history.txt
99
#' @param year vector of years (e.g., 1966:2000)
1010
#' @param fm12 use only FM-12 (SYNOP) records (TRUE by default)
1111
#' @param allow_failure logical - whether to proceed or stop on failure. By default set to TRUE (i.e. don't stop on error). For debugging purposes change to FALSE
@@ -40,7 +40,7 @@ meteo_noaa_hourly = function(station = NULL,
4040
meteo_noaa_hourly_bp = function(station = station, year, fm12 = fm12) {
4141

4242
stopifnot(is.character(station))
43-
base_url = "https://www1.ncdc.noaa.gov/pub/data/noaa/"
43+
base_url = "https://www.ncei.noaa.gov/pub/data/noaa/"
4444
all_data = NULL
4545

4646
for (i in seq_along(year)) {

R/nearest_stations_noaa.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ nearest_stations_noaa_bp = function(country,
7676
stop("You can check the available nearest stations for one day only. Please provide just one date")
7777
}
7878

79-
linkpl2 = "https://www1.ncdc.noaa.gov/pub/data/noaa/country-list.txt"
79+
linkpl2 = "https://www.ncei.noaa.gov/pub/data/noaa/country-list.txt"
8080
temp = tempfile()
8181
test_url(link = linkpl2, output = temp)
8282

@@ -91,7 +91,7 @@ nearest_stations_noaa_bp = function(country,
9191
b1 = as.data.frame(b1[2:dim(b1)[1], ])
9292
b1$CTRY = as.character(b1$CTRY)
9393
b1$countries = as.character(b1$countries)
94-
b2 = read.csv("https://www1.ncdc.noaa.gov/pub/data/noaa/isd-history.csv")
94+
b2 = read.csv("https://www.ncei.noaa.gov/pub/data/noaa/isd-history.csv")
9595
stations_noaa = merge(b1, b2)
9696
stations_noaa["Begin_date"] = as.Date(paste0(substr(stations_noaa[,11], 1, 4), "-",
9797
substr(stations_noaa[,11], 5, 6), "-",
@@ -107,12 +107,12 @@ nearest_stations_noaa_bp = function(country,
107107

108108
if (dim(result)[1] == 0) {
109109
stop("Wrong name of a country. Please check countries names at:
110-
https://www1.ncdc.noaa.gov/pub/data/noaa/country-list.txt")
110+
https://www.ncei.noaa.gov/pub/data/noaa/country-list.txt")
111111
}
112112
result = result[(result$Begin_date < date & result$End_date < date), ]
113113
if (dim(result)[1] == 0) {
114114
stop("Probably there is no data for this date. Please check available records:
115-
https://www1.ncdc.noaa.gov/pub/data/noaa/isd-history.txt")
115+
https://www.ncei.noaa.gov/pub/data/noaa/isd-history.txt")
116116
}
117117
if (is.null(point)) {
118118
point = c(round(mean(result$LON, na.rm = TRUE), 2),round(mean(result$LAT, na.rm = TRUE), 2))

R/test_url.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#'
1919
#' @examples
2020
#' \donttest{
21-
#' link = "https://www1.ncdc.noaa.gov/pub/data/noaa/2019/123300-99999-2019.gz"
21+
#' link = "https://www.ncei.noaa.gov/pub/data/noaa/2019/123300-99999-2019.gz"
2222
#' output = tempfile()
2323
#' test_url(link = link, output = output)
2424
#' }

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ and hydrological data from publicly available repositories:
2020
- University of Wyoming - atmospheric vertical profiling data (http://weather.uwyo.edu/upperair/)
2121
- National Oceanic & Atmospheric Administration - Earth System Research Laboratories - Global Monitoring Laboratory [(NOAA)](https://gml.noaa.gov/ccgg/trends/)
2222
- Polish Institute of Meteorology and Water Management - National Research Institute [(IMGW-PIB)](https://dane.imgw.pl/)
23-
- National Oceanic & Atmospheric Administration - National Climatic Data Center - Integrated Surface Hourly (ISH) [(NOAA)](https://www1.ncdc.noaa.gov/pub/data/noaa/)
23+
- National Centers for Environmental Information, National Oceanic & Atmospheric Administration - National Climatic Data Center - Integrated Surface Hourly (ISH) [(NOAA)](https://www.ncei.noaa.gov/pub/data/noaa/)
2424

25+
2526
## Installation
2627

2728
The stable release of the **climate** package from the [CRAN](https://CRAN.R-project.org) repository can be installed with:
@@ -47,7 +48,7 @@ Any meteorological (aka SYNOP) station working under the World Meteorological Or
4748
- **meteo_imgw()** - Downloading hourly, daily, and monthly meteorological data from the SYNOP/CLIMATE/PRECIP stations available in the danepubliczne.imgw.pl collection.
4849
It is a wrapper for `meteo_monthly()`, `meteo_daily()`, and `meteo_hourly()`. If 10-min dataset is needed then consider using **`meteo_imgw_datastore()`**
4950

50-
- **meteo_noaa_hourly()** - Downloading hourly NOAA Integrated Surface Hourly (ISH) meteorological data - Some stations have > 100 years long history of observations
51+
- **meteo_noaa_hourly()** - Downloading hourly NCEI/NOAA Integrated Surface Hourly (ISH) meteorological data - Some stations have > 100 years long history of observations
5152

5253
- **meteo_noaa_co2()** - Downloading monthly CO2 measurements from Mauna Loa Observatory
5354

@@ -73,7 +74,7 @@ country in the Ogimet repository
7374
- **stations_hydro_imgw_telemetry** - Downloading complete and up-to-date information about coordinates for IMGW-PIB telemetry hydrological stations
7475

7576
## Example 1
76-
#### Download hourly dataset from NOAA ISH meteorological repository:
77+
#### Download hourly dataset from NCEI/NOAA ISH meteorological repository:
7778

7879
``` r0
7980
library(climate)
@@ -88,7 +89,7 @@ head(noaa)
8889
```
8990

9091
## Example 2
91-
#### Finding a nearest meteorological stations in a given country using NOAA ISH data source:
92+
#### Finding a nearest meteorological stations in a given country using NCEI/NOAA ISH data source:
9293

9394
``` r1
9495
library(climate)
@@ -277,7 +278,7 @@ Feel also free to contact us by creating [an issue](https://github.com/bczerneck
277278

278279
## Citation
279280

280-
To cite the `climate` package in publications, please use [this paper](https://www.mdpi.com/2071-1050/12/1/394):
281+
To cite the `climate` package in publications, please use [this paper](https://doi.org/10.3390/su12010394):
281282

282283
Czernecki, B.; Głogowski, A.; Nowosad, J. Climate: An R Package to Access Free In-Situ Meteorological and Hydrological Datasets for Environmental Assessment. Sustainability 2020, 12, 394. https://doi.org/10.3390/su12010394"
283284

man/meteo_noaa_hourly.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/test_url.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vignettes/getstarted.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ and hydrological data from publicly available repositories:
2525
- Polish Institute of Meteorology and Water Management - National Research Institute [(IMGW-PIB)](https://dane.imgw.pl/)
2626
- National Oceanic & Atmospheric Administration - Earth System Research Laboratory - Global
2727
Monitoring Division [(NOAA)](https://gml.noaa.gov/ccgg/trends/)
28-
- National Oceanic & Atmospheric Administration - National Climatic Data Center - Integrated Surface Hourly (ISH) [(NOAA)](https://www1.ncdc.noaa.gov/pub/data/noaa/)
28+
- National Oceanic & Atmospheric Administration - National Climatic Data Center - Integrated Surface Hourly (ISH) [(NOAA)](https://www.ncei.noaa.gov/pub/data/noaa/)
2929

3030
## Functions
3131

@@ -227,7 +227,7 @@ Feel also free to contact us by creating [an issue](https://github.com/bczerneck
227227

228228
## Citation
229229

230-
To cite the `climate` package in publications, please use [this paper](https://www.mdpi.com/2071-1050/12/1/394):
230+
To cite the `climate` package in publications, please use [this paper](https://doi.org/10.3390/su12010394):
231231

232232
Czernecki, B.; Głogowski, A.; Nowosad, J. Climate: An R Package to Access Free In-Situ Meteorological and Hydrological Datasets for Environmental Assessment. Sustainability 2020, 12, 394. https://doi.org/10.3390/su12010394"
233233

0 commit comments

Comments
 (0)