Skip to content

Commit 6af8631

Browse files
committed
revert https -> http again again again
1 parent 40920fb commit 6af8631

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: osmdata
22
Title: Import 'OpenStreetMap' Data as Simple Features or Spatial
33
Objects
4-
Version: 0.1.3.025
4+
Version: 0.1.3.026
55
Authors@R:
66
c(person(given = "Mark",
77
family = "Padgham",

R/elevation.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#'
33
#' Add elevation data to a previously-extracted OSM data set, using a
44
#' pre-downloaded global elevation file from
5-
#' \url{https://srtm.csi.cgiar.org/srtmdata/}. Currently only works for `SC`-class
5+
#' \url{http://srtm.csi.cgiar.org/srtmdata/}. Currently only works for `SC`-class
66
#' objects returned from \link{osmdata_sc}.
77
#'
88
#' @param dat An `SC` object produced by \link{osmdata_sc}.
@@ -18,7 +18,7 @@ osm_elevation <- function (dat, elev_file)
1818
{
1919
requireNamespace ("raster")
2020
message ("Elevation data from Consortium for Spatial Information; ",
21-
"see https://srtm.csi.cgiar.org/srtmdata/")
21+
"see http://srtm.csi.cgiar.org/srtmdata/")
2222
}
2323

2424
elev_file <- check_elev_file (elev_file)

codemeta.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"codeRepository": "https://github.com/ropensci/osmdata/",
1111
"issueTracker": "https://github.com/ropensci/osmdata/issues",
1212
"license": "https://spdx.org/licenses/GPL-3.0",
13-
"version": "0.1.3.025",
13+
"version": "0.1.3.026",
1414
"programmingLanguage": {
1515
"@type": "ComputerLanguage",
1616
"name": "R",

cran-comments.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CRAN notes for osmdata_0.1.4 submission
22

3-
This package fixes URL redirects. Please note that this includes complying with instructions from a previous submission to redirect http://srtm.csi.cgiar.org/ to https, even though the https server very frequently times out and returns an error. This error can only be avoided through reverting to https, against your prior instructions.
3+
This submission attempts to once again fix URL redirects. Please note that a previous attempt to submit this version complied with instructions to redirect http://srtm.csi.cgiar.org/ to https, but the https server generally times out and errors. This submission reverts all of those URLs to "http" and not "https". Even then, the server is very slow, and may not respond to automated status queries. This URL is nevertheless only given in documentation, and not directly called by any functions within the package. Slowness or errors in responding to this URL thus do not affect package functionality in any way.
44

55
The submission also fixes an intermittent error in previous version which called an occasionally unreliable URL in one example. That call has now been \dontrun{}.
66

man/osm_elevation.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vignettes/osmdata-sc.Rmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ networks that accounts for elevation changes.
6666

6767
Incorporating elevation data with OSM data currently requires local storage of
6868
desired elevation data. These must be downloaded for the desired region from
69-
[https://srtm.csi.cgiar.org/srtmdata](https://srtm.csi.cgiar.org/srtmdata/) in Geo
69+
[http://srtm.csi.cgiar.org/srtmdata](http://srtm.csi.cgiar.org/srtmdata/) in Geo
7070
TIFF format. Elevation data may then be incorporated with
7171
[`silicate`](https://github.com/hypertidy/silicate)-format data generated by
7272
[`x <- osmdata_sc()`](https://docs.ropensci.org/osmdata/reference/osmdata_sc.html)
@@ -101,7 +101,7 @@ dat <- osm_elevation (dat, elev_file = "/path/to/elevation/data/filename.tiff")
101101
```{r osm_elevation2, echo = FALSE}
102102
message ("Loading required namespace: raster\n",
103103
"Elevation data from Consortium for Spatial Information; see ",
104-
"https://srtm.csi.cgiar.org/srtmdata/")
104+
"http://srtm.csi.cgiar.org/srtmdata/")
105105
```
106106
This function then simply appends the elevation values to the `vertex_` table,
107107
so that it now looks like this:

0 commit comments

Comments
 (0)