From 5e4ab898c70ff8747c7129c442cfa1d4fdc0d0f3 Mon Sep 17 00:00:00 2001 From: edzer Date: Mon, 22 Apr 2024 20:00:32 +0200 Subject: [PATCH] drop lwgeom::st_perimeter() --- R/geom-measures.R | 5 +---- inst/docker/gdal/Dockerfile | 8 +++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/R/geom-measures.R b/R/geom-measures.R index 668071762..4c85df450 100644 --- a/R/geom-measures.R +++ b/R/geom-measures.R @@ -128,10 +128,7 @@ st_perimeter = function(x, ...) { if (!requireNamespace("lwgeom", quietly = TRUE)) stop("package lwgeom required, please install it first") # note that units are handled appropriately by lwgeom - if (packageVersion("lwgeom") <= "0.2-13") - lwgeom::st_perimeter(x) - else - lwgeom::st_perimeter_lwgeom(x) + lwgeom::st_perimeter_lwgeom(x) } } diff --git a/inst/docker/gdal/Dockerfile b/inst/docker/gdal/Dockerfile index d976cca83..66e7c4c23 100644 --- a/inst/docker/gdal/Dockerfile +++ b/inst/docker/gdal/Dockerfile @@ -78,7 +78,7 @@ RUN wget -q http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2 \ #RUN git clone --depth 1 https://github.com/OSGeo/PROJ.git # https://download.osgeo.org/proj/proj-9.0.0RC1.tar.gz -ENV PROJ_VERSION 9.3.1 +ENV PROJ_VERSION 9.4.0 RUN wget -q http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz RUN tar zxvf proj-${PROJ_VERSION}.tar.gz RUN cd proj* \ @@ -99,8 +99,9 @@ RUN cd proj* \ # && cd - # GDAL: -ENV GDAL_VERSION 3.8.2 -ENV GDAL_VERSION_NAME 3.8.2 +ENV GDAL_VERSION 3.9.0 +ENV GDAL_VERSION_NAME 3.9.0beta1 +#https://download.osgeo.org/gdal/3.9.0/gdal-3.9.0beta1.tar.gz RUN wget -q http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION_NAME}.tar.gz \ && tar -xf gdal-${GDAL_VERSION_NAME}.tar.gz \ @@ -121,6 +122,7 @@ RUN git clone --depth 10 https://github.com/r-spatial/stars.git RUN R CMD build --no-build-vignettes --no-manual lwgeom RUN R CMD build --no-build-vignettes --no-manual sf +RUN Rscript -e 'install.packages("viridis")' RUN R CMD build --no-manual stars # RUN pkg-config proj --modversion RUN R CMD INSTALL sf