Skip to content

Commit 230cde6

Browse files
committed
Merge branch 'main' into pointx
2 parents d38b3dc + a2baba7 commit 230cde6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1966
-856
lines changed

.github/workflows/pkgdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
env:
2121
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

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

.github/workflows/rcmdcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
R_KEEP_PKG_SOURCE: yes
3131

3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434

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

.github/workflows/test-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

2020
- uses: r-lib/actions/setup-r@v2
2121
with:

.github/workflows/tic-db.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
workflow_dispatch:
66
push:
77
branches:
8-
- master
8+
- main
99
pull_request:
1010
# for now, CRON jobs only run on the default branch of the repo (i.e. usually on master)
1111
schedule:

DESCRIPTION

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: sf
2-
Version: 1.0-14
2+
Version: 1.0-16
33
Title: Simple Features for R
44
Authors@R:
55
c(person(given = "Edzer",
@@ -53,8 +53,8 @@ Description: Support for simple features, a standardized way to
5353
projection conversions and datum transformations. Uses by default the 's2'
5454
package for spherical geometry operations on ellipsoidal (long/lat) coordinates.
5555
License: GPL-2 | MIT + file LICENSE
56-
URL: https://r-spatial.github.io/sf/, https://github.com/r-spatial/sf/
57-
BugReports: https://github.com/r-spatial/sf/issues/
56+
URL: https://r-spatial.github.io/sf/, https://github.com/r-spatial/sf
57+
BugReports: https://github.com/r-spatial/sf/issues
5858
Depends:
5959
methods,
6060
R (>= 3.3.0)
@@ -73,6 +73,7 @@ Imports:
7373
utils
7474
Suggests:
7575
blob,
76+
nanoarrow,
7677
covr,
7778
dplyr (>= 0.8-3),
7879
ggplot2,
@@ -106,14 +107,15 @@ Suggests:
106107
tidyselect (>= 1.0.0),
107108
tmap (>= 2.0),
108109
vctrs,
109-
wk
110+
wk (>= 0.9.0)
110111
LinkingTo:
111112
Rcpp
112113
VignetteBuilder:
113114
knitr
114115
Encoding: UTF-8
115-
RoxygenNote: 7.2.3
116-
Config/testhat/edition: 3
116+
RoxygenNote: 7.3.0
117+
Roxygen: list(markdown = TRUE)
118+
Config/testthat/edition: 2
117119
SystemRequirements: GDAL (>= 2.0.1), GEOS (>= 3.4.0),
118120
PROJ (>= 4.8.0), sqlite3
119121
Collate:
@@ -159,6 +161,7 @@ Collate:
159161
'gdal_utils.R'
160162
'nearest.R'
161163
'normalize.R'
164+
'sf-package.R'
162165
'defunct.R'
163166
'z_range.R'
164167
'm_range.R'

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2016-2020
1+
YEAR: 2016-2024
22
COPYRIGHT HOLDER: Edzer Pebesma

NAMESPACE

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ S3method(is.na,bbox)
4343
S3method(is.na,crs)
4444
S3method(is.na,m_range)
4545
S3method(is.na,z_range)
46+
S3method(is_geometry_column,PqConnection)
47+
S3method(is_geometry_column,default)
4648
S3method(merge,sf)
4749
S3method(plot,sf)
4850
S3method(plot,sfc_CIRCULARSTRING)
@@ -288,6 +290,7 @@ S3method(st_read,default)
288290
S3method(st_reverse,sf)
289291
S3method(st_reverse,sfc)
290292
S3method(st_reverse,sfg)
293+
S3method(st_sample,bbox)
291294
S3method(st_sample,sf)
292295
S3method(st_sample,sfc)
293296
S3method(st_sample,sfg)
@@ -461,7 +464,9 @@ export(st_jitter)
461464
export(st_join)
462465
export(st_layers)
463466
export(st_length)
467+
export(st_line_interpolate)
464468
export(st_line_merge)
469+
export(st_line_project)
465470
export(st_line_sample)
466471
export(st_linestring)
467472
export(st_m_range)
@@ -476,6 +481,7 @@ export(st_nearest_points)
476481
export(st_node)
477482
export(st_normalize)
478483
export(st_overlaps)
484+
export(st_perimeter)
479485
export(st_point)
480486
export(st_point_on_surface)
481487
export(st_polygon)
@@ -526,6 +532,7 @@ importFrom(DBI,dbSendQuery)
526532
importFrom(DBI,dbWriteTable)
527533
importFrom(Rcpp,evalCpp)
528534
importFrom(classInt,classIntervals)
535+
importFrom(grDevices,cm)
529536
importFrom(grDevices,dev.size)
530537
importFrom(grDevices,rgb)
531538
importFrom(grid,convertHeight)
@@ -560,11 +567,13 @@ importFrom(units,drop_units)
560567
importFrom(units,make_unit_label)
561568
importFrom(units,set_units)
562569
importFrom(utils,compareVersion)
570+
importFrom(utils,globalVariables)
563571
importFrom(utils,head)
564572
importFrom(utils,object.size)
565573
importFrom(utils,packageVersion)
566574
importFrom(utils,str)
567575
importFrom(utils,tail)
568576
importMethodsFrom(DBI,dbDataType)
577+
importMethodsFrom(DBI,dbExistsTable)
569578
importMethodsFrom(DBI,dbWriteTable)
570579
useDynLib(sf, .registration=TRUE)

NEWS.md

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,46 @@
1+
# version 1.0-16
2+
3+
* `[.sfc` works when setting argument `op`; #2320
4+
5+
* `st_sample` for polygons is sensitive to setting `oriented = TRUE` to prevent wrongly correcting ring directions; #2308
6+
7+
* add support for the GDAL `footprint` utility (requiring GDAL >= 3.8.0) to `gdal_utils`; #2305, by @goergen95
8+
9+
* 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
10+
11+
* add `st_line_project()` to find how far a point is when projected on a line; #2291
12+
13+
* add `st_line_interpolate()` to obtain a point at a certain distance along a line; #2291
14+
115
# version 1.0-15
216

3-
* `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.
17+
* add `st_perimeter()` generic to cover both geographic and projected coordinates; #268, #2279, by @JosiahParry
18+
19+
* add `st_sample()` method for `bbox`, with special provisions for ellipsoidal coordinates; #2283
20+
21+
* documentation clean-up by @olivroy; #2266, #2285
22+
23+
* `st_convex_hull()` uses `s2::s2_convex_hull()` for geodetic coordinates; #2250
24+
25+
* add `directed` argument to `st_line_merge()`; #2264
26+
27+
* `st_union.sfc()` given `x` and `y` works consistently across geodetic and projected objects; #2262
28+
29+
* `st_union.sf()` given `x` and `y` unions pairwise if `by_feature = TRUE`; #2259
30+
31+
* `st_read()` work around issue with GPKG driver if `wkt_filter` is set; #2248
32+
33+
* `st_read()` uses GDAL's stream reading when `use_stream = TRUE`; #2238 by @paleolimbot
34+
35+
* `st_transform()` responds to in-session changes to `sf_proj_network()`; #2166
36+
37+
* `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.
38+
39+
* `plot.sf()`: `key.pos` can hold a second value in [0, 1] determining the relative position of the key in the available space
440

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

7-
* `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
43+
* 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
844

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

0 commit comments

Comments
 (0)