Skip to content

Commit b3393c4

Browse files
committed
version bump; fix docs
1 parent 92bc3d1 commit b3393c4

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: sf
2-
Version: 1.0-21
2+
Version: 1.0-22
33
Title: Simple Features for R
44
Authors@R:
55
c(person(given = "Edzer",

R/geom-transformers.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,13 @@
7878
#'
7979
#' # compare approximation errors depending on S2 or GEOS backend:
8080
#' # geographic coordinates, uses S2:
81-
#' x = st_buffer(st_as_sf(data.frame(lon=0,lat=0), coords=c("lon","lat"),crs='OGC:CRS84'), units::as_units(1,"km"))
81+
#' x = st_buffer(st_as_sf(data.frame(lon=0,lat=0), coords=c("lon","lat"),crs='OGC:CRS84'),
82+
#' units::as_units(1,"km"))
8283
#' y = units::set_units(st_area(x), "km^2")
8384
#' # error: postive, default maxcells = 1000
8485
#' (units::drop_units(y)-pi)/pi
85-
#' x = st_buffer(st_as_sf(data.frame(lon=0,lat=0), coords=c("lon","lat"),crs='OGC:CRS84'), units::as_units(1,"km"), max_cells=1e5)
86+
#' x = st_buffer(st_as_sf(data.frame(lon=0,lat=0), coords=c("lon","lat"),crs='OGC:CRS84'),
87+
#' units::as_units(1,"km"), max_cells=1e5)
8688
#' y = units::set_units(st_area(x), "km^2")
8789
#' # error: positive but smaller:
8890
#' (units::drop_units(y)-pi)/pi

inst/docker/gdal/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ RUN cd proj* \
103103
# && cd -
104104

105105
# GDAL:
106-
ENV GDAL_VERSION 3.11.0
107-
ENV GDAL_VERSION_NAME 3.11.0rc1
106+
ENV GDAL_VERSION 3.11.1
107+
ENV GDAL_VERSION_NAME 3.11.1rc1
108108

109109
RUN wget -q http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION_NAME}.tar.gz \
110110
&& tar -xf gdal-${GDAL_VERSION_NAME}.tar.gz \
@@ -134,6 +134,10 @@ RUN R CMD INSTALL stars
134134
#RUN export DEBIAN_FRONTEND=noninteractive; apt-get install -y --fix-missing libmagick++-dev
135135
#RUN Rscript -e 'install.packages("animation")'
136136
#
137+
RUN apt update
138+
RUN apt install -y libharfbuzz-dev
139+
RUN apt install --fix-missing -y libharfbuzz-dev libfribidi-dev
140+
RUN Rscript -e 'install.packages("mapview")'
137141
RUN R CMD check --no-build-vignettes --no-manual --as-cran sf_*.tar.gz
138142
RUN R CMD check --no-build-vignettes --no-manual --as-cran lwgeom_*.tar.gz
139143
#

man/geos_unary.Rd

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

0 commit comments

Comments
 (0)