Skip to content

Commit

Permalink
Merge branch 'main' into pointx
Browse files Browse the repository at this point in the history
  • Loading branch information
edzer committed Jan 23, 2024
2 parents d38b3dc + a2baba7 commit 230cde6
Show file tree
Hide file tree
Showing 112 changed files with 1,966 additions and 856 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rcmdcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tic-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- main
pull_request:
# for now, CRON jobs only run on the default branch of the repo (i.e. usually on master)
schedule:
Expand Down
15 changes: 9 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: sf
Version: 1.0-14
Version: 1.0-16
Title: Simple Features for R
Authors@R:
c(person(given = "Edzer",
Expand Down Expand Up @@ -53,8 +53,8 @@ Description: Support for simple features, a standardized way to
projection conversions and datum transformations. Uses by default the 's2'
package for spherical geometry operations on ellipsoidal (long/lat) coordinates.
License: GPL-2 | MIT + file LICENSE
URL: https://r-spatial.github.io/sf/, https://github.com/r-spatial/sf/
BugReports: https://github.com/r-spatial/sf/issues/
URL: https://r-spatial.github.io/sf/, https://github.com/r-spatial/sf
BugReports: https://github.com/r-spatial/sf/issues
Depends:
methods,
R (>= 3.3.0)
Expand All @@ -73,6 +73,7 @@ Imports:
utils
Suggests:
blob,
nanoarrow,
covr,
dplyr (>= 0.8-3),
ggplot2,
Expand Down Expand Up @@ -106,14 +107,15 @@ Suggests:
tidyselect (>= 1.0.0),
tmap (>= 2.0),
vctrs,
wk
wk (>= 0.9.0)
LinkingTo:
Rcpp
VignetteBuilder:
knitr
Encoding: UTF-8
RoxygenNote: 7.2.3
Config/testhat/edition: 3
RoxygenNote: 7.3.0
Roxygen: list(markdown = TRUE)
Config/testthat/edition: 2
SystemRequirements: GDAL (>= 2.0.1), GEOS (>= 3.4.0),
PROJ (>= 4.8.0), sqlite3
Collate:
Expand Down Expand Up @@ -159,6 +161,7 @@ Collate:
'gdal_utils.R'
'nearest.R'
'normalize.R'
'sf-package.R'
'defunct.R'
'z_range.R'
'm_range.R'
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2016-2020
YEAR: 2016-2024
COPYRIGHT HOLDER: Edzer Pebesma
9 changes: 9 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ S3method(is.na,bbox)
S3method(is.na,crs)
S3method(is.na,m_range)
S3method(is.na,z_range)
S3method(is_geometry_column,PqConnection)
S3method(is_geometry_column,default)
S3method(merge,sf)
S3method(plot,sf)
S3method(plot,sfc_CIRCULARSTRING)
Expand Down Expand Up @@ -288,6 +290,7 @@ S3method(st_read,default)
S3method(st_reverse,sf)
S3method(st_reverse,sfc)
S3method(st_reverse,sfg)
S3method(st_sample,bbox)
S3method(st_sample,sf)
S3method(st_sample,sfc)
S3method(st_sample,sfg)
Expand Down Expand Up @@ -461,7 +464,9 @@ export(st_jitter)
export(st_join)
export(st_layers)
export(st_length)
export(st_line_interpolate)
export(st_line_merge)
export(st_line_project)
export(st_line_sample)
export(st_linestring)
export(st_m_range)
Expand All @@ -476,6 +481,7 @@ export(st_nearest_points)
export(st_node)
export(st_normalize)
export(st_overlaps)
export(st_perimeter)
export(st_point)
export(st_point_on_surface)
export(st_polygon)
Expand Down Expand Up @@ -526,6 +532,7 @@ importFrom(DBI,dbSendQuery)
importFrom(DBI,dbWriteTable)
importFrom(Rcpp,evalCpp)
importFrom(classInt,classIntervals)
importFrom(grDevices,cm)
importFrom(grDevices,dev.size)
importFrom(grDevices,rgb)
importFrom(grid,convertHeight)
Expand Down Expand Up @@ -560,11 +567,13 @@ importFrom(units,drop_units)
importFrom(units,make_unit_label)
importFrom(units,set_units)
importFrom(utils,compareVersion)
importFrom(utils,globalVariables)
importFrom(utils,head)
importFrom(utils,object.size)
importFrom(utils,packageVersion)
importFrom(utils,str)
importFrom(utils,tail)
importMethodsFrom(DBI,dbDataType)
importMethodsFrom(DBI,dbExistsTable)
importMethodsFrom(DBI,dbWriteTable)
useDynLib(sf, .registration=TRUE)
40 changes: 38 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,46 @@
# version 1.0-16

* `[.sfc` works when setting argument `op`; #2320

* `st_sample` for polygons is sensitive to setting `oriented = TRUE` to prevent wrongly correcting ring directions; #2308

* add support for the GDAL `footprint` utility (requiring GDAL >= 3.8.0) to `gdal_utils`; #2305, by @goergen95

* existing environment variables `PROJ_LIB` and `PROJ_DATA` are (again) ignored on `sf` binary CRAN installations (win + macos), effectively by overwriting them during the R session and restoring them on exit; this does not happen if environment variable `R_SF_USE_PROJ_DATA` is set to `true`. #2298

* add `st_line_project()` to find how far a point is when projected on a line; #2291

* add `st_line_interpolate()` to obtain a point at a certain distance along a line; #2291

# version 1.0-15

* `plot.sf()`: `key.width` is sensitive to pointsize graphics parameter, `key.pos` can hold a second value in [0, 1] determining the relative position of the key in the available space; keys with factor levels suggest a proper size if they won't fit.
* add `st_perimeter()` generic to cover both geographic and projected coordinates; #268, #2279, by @JosiahParry

* add `st_sample()` method for `bbox`, with special provisions for ellipsoidal coordinates; #2283

* documentation clean-up by @olivroy; #2266, #2285

* `st_convex_hull()` uses `s2::s2_convex_hull()` for geodetic coordinates; #2250

* add `directed` argument to `st_line_merge()`; #2264

* `st_union.sfc()` given `x` and `y` works consistently across geodetic and projected objects; #2262

* `st_union.sf()` given `x` and `y` unions pairwise if `by_feature = TRUE`; #2259

* `st_read()` work around issue with GPKG driver if `wkt_filter` is set; #2248

* `st_read()` uses GDAL's stream reading when `use_stream = TRUE`; #2238 by @paleolimbot

* `st_transform()` responds to in-session changes to `sf_proj_network()`; #2166

* `plot.sf()`: `key.width` is sensitive to pointsize graphics parameter `par("ps")`; keys with factor levels suggest a proper size if they won't fit.

* `plot.sf()`: `key.pos` can hold a second value in [0, 1] determining the relative position of the key in the available space

* `[<-.sf` fixes the `agr` attribute when it is broken; #2211

* `sf` objects get a new attribute, `.sf_namespace`, which forces loading the `sf` namespace when it has not been loaded so far, e.g. for proper printing or plotting of an `sf` object; #2212 by Mike Mahoney
* if the env. variable `ADD_SF_NAMESPACE` is set to `true`, `sf` objects get a new attribute, `.sf_namespace`, which forces loading the `sf` namespace when it has not been loaded so far, e.g. for proper printing or plotting of an `sf` object; #2212 by Mike Mahoney

* `distinct.sf` is type-safe for `sf` objects with zero rows; #2204

Expand Down
Loading

0 comments on commit 230cde6

Please sign in to comment.