Skip to content

Commit 7adcfec

Browse files
committed
update urls
1 parent 54f0b93 commit 7adcfec

File tree

13 files changed

+40
-26
lines changed

13 files changed

+40
-26
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88
schedule:
99
- cron: "0 4 * * *"
1010

11-
name: R-CMD-check
11+
name: R-CMD-check.yaml
12+
13+
permissions: read-all
1214

1315
jobs:
1416
R-CMD-check:
@@ -54,3 +56,4 @@ jobs:
5456
- uses: r-lib/actions/check-r-package@v2
5557
with:
5658
upload-snapshots: true
59+
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/test-coverage.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ on:
66
pull_request:
77
branches: [main, master]
88

9-
name: test-coverage
9+
name: test-coverage.yaml
10+
11+
permissions: read-all
1012

1113
jobs:
1214
test-coverage:
@@ -23,23 +25,32 @@ jobs:
2325

2426
- uses: r-lib/actions/setup-r-dependencies@v2
2527
with:
26-
extra-packages: any::covr
28+
extra-packages: any::covr, any::xml2
2729
needs: coverage
2830

2931
- name: Test coverage
3032
run: |
31-
covr::codecov(
33+
cov <- covr::package_coverage(
3234
quiet = FALSE,
3335
clean = FALSE,
3436
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
3537
)
38+
covr::to_cobertura(cov)
3639
shell: Rscript {0}
3740

41+
- uses: codecov/codecov-action@v4
42+
with:
43+
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
44+
file: ./cobertura.xml
45+
plugin: noop
46+
disable_search: true
47+
token: ${{ secrets.CODECOV_TOKEN }}
48+
3849
- name: Show testthat output
3950
if: always()
4051
run: |
4152
## --------------------------------------------------------------------
42-
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
53+
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
4354
shell: bash
4455

4556
- name: Upload test results

CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ opening an issue or contacting one or more of the project maintainers.
2222

2323
This Code of Conduct is adapted from the Contributor Covenant
2424
(http:contributor-covenant.org), version 1.0.0, available at
25-
http://contributor-covenant.org/version/1/0/0/
25+
https://www.contributor-covenant.org/version/1/0/0/code-of-conduct/

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@
907907

908908
# version 0.5-1
909909

910-
* add spatial indexes to most binary geometry operations; #394 and http://r-spatial.org/r/2017/06/22/spatial-index.html
910+
* add spatial indexes to most binary geometry operations; #394 and https://r-spatial.org/r/2017/06/22/spatial-index.html
911911

912912
* drastically reduce memory footprint of `st_intersection` and similar; #394
913913

PROPOSAL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Applicant: [Edzer Pebesma](https://github.com/edzer/), [Institute for Geoinforma
44

55
Supporting authors: Edzer Pebesma, Roger Bivand, Michael Sumner, Robert Hijmans, Virgilio Gómez-Rubio
66

7-
[Simple features](https://en.wikipedia.org/wiki/Simple_Features) is an open ([OGC](https://www.ogc.org/standard/sfa/) and [ISO](https://www.iso.org/standard/40114.html)) interface standard for access and manipulation of spatial vector data (points, lines, polygons). It includes a standard [SQL schema](http://www.opengeospatial.org/standards/sfs) that supports storage, retrieval, query and update of feature collections via a SQL interface. All commonly used databases provide this interface. [GeoJSON](https://geojson.org/) is a standard for encoding simple features in JSON, and is used in JavaScript and MongoDB. Well-known-text ([WKT](https://en.wikipedia.org/wiki/Well-known_text)) is a text representation of simple features used often in linked data; well-known-binary ([WKB] (https://en.wikipedia.org/wiki/Well-known_text)) a standard binary representation used in databases. _Simple Feature Access_ defines coordinate reference systems, and makes it easy to move data from longitude-latitude to projections back and forth in a standardized way.
7+
[Simple features](https://en.wikipedia.org/wiki/Simple_Features) is an open ([OGC](https://www.ogc.org/standard/sfa/) and [ISO](https://www.iso.org/standard/40114.html)) interface standard for access and manipulation of spatial vector data (points, lines, polygons). It includes a standard [SQL schema](https://www.ogc.org/standard/sfs/) that supports storage, retrieval, query and update of feature collections via a SQL interface. All commonly used databases provide this interface. [GeoJSON](https://geojson.org/) is a standard for encoding simple features in JSON, and is used in JavaScript and MongoDB. Well-known-text ([WKT](https://en.wikipedia.org/wiki/Well-known_text)) is a text representation of simple features used often in linked data; well-known-binary ([WKB] (https://en.wikipedia.org/wiki/Well-known_text)) a standard binary representation used in databases. _Simple Feature Access_ defines coordinate reference systems, and makes it easy to move data from longitude-latitude to projections back and forth in a standardized way.
88

99

1010
[GDAL](https://gdal.org/) is an open source C++ library for reading and writing both raster and vector data with more than 225 drivers (supported file formats, data base connectors, web service interfaces). GDAL is used by practically all open source geospatial projects and by many industry products (including ESRI's ArcGIS, ERDAS, and FME). It provides coordinate transformations (built on top of PROJ.4) and geometric operations (e.g. polygon intersections, unions, buffers and distance). Standards for coordinate transformations change over time; such changes are typically adopted directly in GDAL/PROJ.4 but do not easily find their way into R-only packages such as `mapproj`.
@@ -16,7 +16,7 @@ Today, 221 CRAN packages depend on, import or link to `sp`, 259 when including _
1616
Off-CRAN package [rgdal2](https://github.com/thk686/rgdal2) is an interface to GDAL 2.0, which uses raw pointers to interface features, but does not import any data in R, using GDAL to handle everything. CRAN Package [wkb](https://cran.r-project.org/package=wkb), contributed by Tibco Software, converts between WKB representations of several simple feature classes and corresponding classes in `sp`, and seems to be needed for Tibco software purposes.
1717

1818
<!---
19-
[second edition](http://www.springer.com/statistics/life+sciences%2C+medicine+%26+health/book/978-1-4614-7617-7))
19+
[second edition](https://link.springer.com/book/10.1007/978-1-4614-7618-4))
2020
-->
2121

2222
## The problem

R/plot.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ get_asp = function(bb) {
824824

825825
bb2merc = function(x, cls = "ggmap") { # return bbox in the appropriate "web mercator" CRS
826826
wgs84 = st_crs(4326)
827-
merc = st_crs(3857) # http://wiki.openstreetmap.org/wiki/EPSG:3857
827+
merc = st_crs(3857) # https://wiki.openstreetmap.org/wiki/Web_Mercator
828828
pts = if (cls == "ggmap") {
829829
b = vapply(attr(x, "bb"), c, 0.0)
830830
st_sfc(st_point(c(b[2:1])), st_point(c(b[4:3])), crs = wgs84)

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!-- badges: start -->
22
[![R-CMD-check](https://github.com/r-spatial/sf/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-spatial/sf/actions/workflows/R-CMD-check.yaml)
33
[![tic-db](https://github.com/r-spatial/sf/actions/workflows/tic-db.yml/badge.svg)](https://github.com/r-spatial/sf/actions/workflows/tic-db.yml)
4-
[![Coverage Status](https://img.shields.io/codecov/c/github/r-spatial/sf/main.svg)](https://app.codecov.io/gh/r-spatial/sf)
5-
[![License](http://img.shields.io/badge/license-GPL%20%28%3E=%202%29-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)
6-
[![CRAN](http://www.r-pkg.org/badges/version/sf)](https://cran.r-project.org/package=sf)
4+
[![Codecov test coverage](https://codecov.io/gh/r-spatial/sf/graph/badge.svg)](https://app.codecov.io/gh/r-spatial/sf)
5+
[![License](https://img.shields.io/badge/license-GPL%20%28%3E=%202%29-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)
6+
[![CRAN](https://www.r-pkg.org/badges/version/sf)](https://cran.r-project.org/package=sf)
77
[![cran checks](https://badges.cranchecks.info/worst/sf.svg)](https://cran.r-project.org/web/checks/check_results_sf.html)
8-
[![Downloads](http://cranlogs.r-pkg.org/badges/sf?color=brightgreen)](https://www.r-pkg.org:443/pkg/sf)
8+
[![Downloads](https://cranlogs.r-pkg.org/badges/sf?color=brightgreen)](https://www.r-pkg.org:443/pkg/sf)
99
[![status](https://tinyverse.netlify.com/badge/sf)](https://CRAN.R-project.org/package=sf)
1010
<!-- badges: end -->
1111

@@ -24,9 +24,9 @@ Package sf:
2424
* represents natively in R all 17 simple feature types for all dimensions (XY, XYZ, XYM, XYZM)
2525
* interfaces to [GEOS](https://libgeos.org) for geometrical operations on projected coordinates, and (through R package [s2](https://cran.r-project.org/package=s2)) to [s2geometry](http://s2geometry.io/) for geometrical operations on ellipsoidal coordinates
2626
* interfaces to [GDAL](https://gdal.org/), supporting all driver options, `Date` and `POSIXct` and list-columns
27-
* interfaces to [PRØJ](http://proj.org/) for coordinate reference system conversion and transformation
27+
* interfaces to [PRØJ](https://proj.org/) for coordinate reference system conversion and transformation
2828
* uses [well-known-binary](https://en.wikipedia.org/wiki/Well-known_text#Well-known_binary) serialisations written in C++/Rcpp for fast I/O with GDAL and GEOS
29-
* reads from and writes to spatial databases such as [PostGIS](http://postgis.net/) using [DBI](https://cran.r-project.org/package=DBI)
29+
* reads from and writes to spatial databases such as [PostGIS](https://postgis.net/) using [DBI](https://cran.r-project.org/package=DBI)
3030
* is extended by
3131
* [lwgeom](https://github.com/r-spatial/lwgeom/) for selected liblwgeom/PostGIS functions
3232
* [stars](https://github.com/r-spatial/stars/) for raster data, and raster or vector data cubes (spatial time series)

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2397,7 +2397,7 @@ printf "%s\n" "no" >&6; }
23972397
echo "Error: gdal-config not found"
23982398
echo "The gdal-config script distributed with GDAL could not be found."
23992399
echo "If you have not installed the GDAL libraries, you can"
2400-
echo "download the source from http://www.gdal.org/"
2400+
echo "download the source from https://www.gdal.org/"
24012401
echo "If you have installed the GDAL libraries, then make sure that"
24022402
echo "gdal-config is in your path. Try typing gdal-config at a"
24032403
echo "shell prompt and see if it runs. If not, use:"
@@ -4113,7 +4113,7 @@ if test "$WARN" = "warn" ; then
41134113
echo "Note: proj/conus not found"
41144114
echo "No support available in PROJ4 for NAD grid datum transformations"
41154115
echo "If required, consider re-installing from source with the contents"
4116-
echo "of proj-datumgrid-1.<latest>.zip from http://download.osgeo.org/proj/ in nad/."
4116+
echo "of proj-datumgrid-1.<latest>.zip from https://download.osgeo.org/proj/ in nad/."
41174117
fi
41184118
41194119
fi # PROJH = no

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ else
9393
echo "Error: gdal-config not found"
9494
echo "The gdal-config script distributed with GDAL could not be found."
9595
echo "If you have not installed the GDAL libraries, you can"
96-
echo "download the source from http://www.gdal.org/"
96+
echo "download the source from https://www.gdal.org/"
9797
echo "If you have installed the GDAL libraries, then make sure that"
9898
echo "gdal-config is in your path. Try typing gdal-config at a"
9999
echo "shell prompt and see if it runs. If not, use:"
@@ -628,7 +628,7 @@ if test "$WARN" = "warn" ; then
628628
echo "Note: proj/conus not found"
629629
echo "No support available in PROJ4 for NAD grid datum transformations"
630630
echo "If required, consider re-installing from source with the contents"
631-
echo "of proj-datumgrid-1.<latest>.zip from http://download.osgeo.org/proj/ in nad/."
631+
echo "of proj-datumgrid-1.<latest>.zip from https://download.osgeo.org/proj/ in nad/."
632632
fi
633633

634634
fi # PROJH = no

inst/docker/arrow/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
8989
# GEOS:
9090
ENV GEOS_VERSION 3.11.0
9191

92-
RUN wget -q http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2 \
92+
RUN wget -q https://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2 \
9393
&& bzip2 -d geos-*bz2 \
9494
&& tar xf geos*tar \
9595
&& cd geos* \
@@ -104,7 +104,7 @@ RUN wget -q http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2 \
104104
#RUN git clone --depth 1 https://github.com/OSGeo/PROJ.git
105105
# https://download.osgeo.org/proj/proj-9.0.0RC1.tar.gz
106106
ENV PROJ_VERSION 9.0.1
107-
RUN wget -q http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz
107+
RUN wget -q https://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz
108108
RUN tar zxvf proj-${PROJ_VERSION}.tar.gz
109109
RUN cd proj* \
110110
&& ls -l \
@@ -120,7 +120,7 @@ RUN cd proj* \
120120
ENV GDAL_VERSION 3.5.1
121121
ENV GDAL_VERSION_NAME 3.5.1
122122

123-
RUN wget -q http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION_NAME}.tar.gz \
123+
RUN wget -q https://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION_NAME}.tar.gz \
124124
&& tar -xf gdal-${GDAL_VERSION_NAME}.tar.gz \
125125
&& cd gdal* \
126126
&& mkdir build \

inst/docker/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MAINTAINER "edzerpebesma" [email protected]
77
RUN apt-get update && apt-get install -y software-properties-common
88
RUN add-apt-repository ppa:ubuntugis/ubuntugis-unstable
99

10-
RUN echo "deb http://cran.rstudio.com/bin/linux/ubuntu xenial/ " >> /etc/apt/sources.list
10+
RUN echo "deb https://cran.rstudio.com/bin/linux/ubuntu xenial/ " >> /etc/apt/sources.list
1111
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E084DAB9
1212

1313
RUN apt-get update

inst/docker/geos/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN cd geos \
7474
&& make install
7575

7676
#RUN git clone --depth 1 https://github.com/OSGeo/PROJ.git
77-
RUN wget http://download.osgeo.org/proj/proj-8.0.0.tar.gz
77+
RUN wget https://download.osgeo.org/proj/proj-8.0.0.tar.gz
7878
RUN tar zxvf proj-8.0.0.tar.gz
7979
RUN cd proj-8.0.0 \
8080
&& ls -l \

vignettes/sf1.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ unit](https://CRAN.R-project.org/package=units).
138138
# How simple features in R are organized
139139

140140
Package `sf` represents simple features as native R objects.
141-
Similar to [PostGIS](http://postgis.net/), all functions and methods
141+
Similar to [PostGIS](https://postgis.net/), all functions and methods
142142
in `sf` that operate on spatial data are prefixed by `st_`, which
143143
refers to _spatial type_; this makes them easily findable
144144
by command-line completion. Simple features are implemented as

0 commit comments

Comments
 (0)