Skip to content

Commit

Permalink
drop lwgeom::st_perimeter()
Browse files Browse the repository at this point in the history
  • Loading branch information
edzer committed Apr 22, 2024
1 parent 7c4b154 commit 5e4ab89
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 1 addition & 4 deletions R/geom-measures.R
Expand Up @@ -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)
}
}

Expand Down
8 changes: 5 additions & 3 deletions inst/docker/gdal/Dockerfile
Expand Up @@ -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* \
Expand All @@ -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 \
Expand All @@ -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
Expand Down

0 comments on commit 5e4ab89

Please sign in to comment.