Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch gdalvector into main #444

Merged
merged 113 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
5134011
GDALVector: initial commit
ctoney Feb 22, 2024
2f9de5f
getLayerDefn(), setAttributeFilter(), resetReading()
ctoney Feb 23, 2024
ea74560
getLayerDefn(): add full field defn, geom field defn
ctoney Feb 23, 2024
25420a8
filling in GDALVector
ctoney Feb 24, 2024
7ae2d18
create field optionally
ctoney Feb 24, 2024
759ce5a
layer processing methods
ctoney Feb 24, 2024
8c13339
testCapability(), add FID
ctoney Feb 24, 2024
31ad399
add open() for re-open existing dsn/layer
ctoney Feb 24, 2024
91c944a
refactor constructor
ctoney Feb 24, 2024
6d7cd54
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 24, 2024
1f0f21c
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 24, 2024
7f65ab7
fix dataset open options
ctoney Feb 24, 2024
2d10422
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 24, 2024
65aeb8c
refactor with open(), hFDefn member variable
ctoney Feb 25, 2024
453905e
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 25, 2024
27c56f3
layer can be layer name or sql
ctoney Feb 25, 2024
5099323
Merge branch 'gdalvector_0.1' of github.com:ctoney/gdalraster into gd…
ctoney Feb 25, 2024
fabd8b5
set field info in member variables
ctoney Feb 25, 2024
2edf6df
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 26, 2024
22eb87d
revert fabd8b5 (set field info in member variables)
ctoney Feb 26, 2024
72e3959
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 27, 2024
23f9ae6
add constructor for dsn only
ctoney Feb 27, 2024
c45c0aa
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 27, 2024
374e16c
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 27, 2024
9b9e14d
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 27, 2024
c460495
OGR_G_DestroyGeometry(hGeom)
ctoney Feb 27, 2024
ac7a28d
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 27, 2024
160c979
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 27, 2024
de01112
gdalvector-draft initial commit
ctoney Feb 29, 2024
37be3fb
Merge branch 'USDAForestService:main' into gdalvector_0.1
ctoney Feb 29, 2024
7181fab
update TODOs
ctoney Mar 1, 2024
9419f20
Merge pull request #238 from ctoney/gdalvector_0.1
ctoney Mar 1, 2024
c663294
gdalvector-draft moved to main
ctoney Mar 1, 2024
4f21614
Merge pull request #240 from ctoney/gdalvector_0.1
ctoney Mar 1, 2024
a5b9d4e
Merge pull request #250 from USDAForestService/main
ctoney Mar 5, 2024
93c60ba
Merge pull request #258 from USDAForestService/main
ctoney Mar 11, 2024
eb9b8b3
reformat code style
ctoney Mar 16, 2024
3678cc2
Merge pull request #265 from USDAForestService/main
ctoney Mar 16, 2024
5146434
reformat code style
ctoney Mar 16, 2024
c3a233f
reformat code style
ctoney Mar 16, 2024
f3db194
Merge pull request #281 from USDAForestService/main
ctoney Mar 20, 2024
ca441d4
Merge pull request #288 from USDAForestService/main
ctoney Mar 23, 2024
4437630
Merge pull request #293 from USDAForestService/main
ctoney Mar 24, 2024
3ee2eac
Merge pull request #295 from USDAForestService/main
ctoney Mar 25, 2024
0c75945
Merge pull request #296 from USDAForestService/main
ctoney Mar 26, 2024
1ccb009
Merge pull request #300 from USDAForestService/main
ctoney Apr 1, 2024
48ec83e
Merge pull request #303 from USDAForestService/main
ctoney Apr 6, 2024
06763c0
support 64-bit integer in R with bit64/RcppInt64
ctoney Apr 6, 2024
80ea6e4
update gdalvector-draft
ctoney Apr 6, 2024
622b7f5
add GDALVector::getFeature(): feature from its FID
ctoney Apr 6, 2024
04c32db
update gdalvector-draft
ctoney Apr 6, 2024
655a843
Merge pull request #304 from USDAForestService/main
ctoney Apr 6, 2024
68cdddc
Merge pull request #326 from USDAForestService/main
ctoney Apr 27, 2024
01f2313
GDALVector: add constructor with 'spatial_filter' and 'dialect'
ctoney Apr 28, 2024
e43e4bf
Merge pull request #331 from USDAForestService/main
ctoney Apr 29, 2024
3249296
Merge pull request #337 from USDAForestService/main
ctoney May 8, 2024
33075b7
has_spatialite() now public (and code linting)
ctoney May 8, 2024
64fd91b
fix the check on dialect_in during open()
ctoney May 8, 2024
3404fc3
make dialect param optional in GDALVector constructor
ctoney May 9, 2024
b3f492a
Merge pull request #346 from USDAForestService/main
ctoney May 14, 2024
a5517fa
GDALVector::getFeature(): handle fid correctly for R numeric
ctoney May 17, 2024
a2d0479
Merge branch 'gdalvector' of github.com:USDAForestService/gdalraster …
ctoney May 17, 2024
6ee1015
Merge pull request #361 from USDAForestService/main
ctoney May 21, 2024
43db72f
Merge pull request #387 from USDAForestService/main
ctoney May 29, 2024
8fc4bea
Merge pull request #402 from USDAForestService/main
ctoney Jun 1, 2024
f52752f
Merge pull request #404 from USDAForestService/main
ctoney Jun 2, 2024
c6fe2dc
Merge pull request #408 from USDAForestService/main
ctoney Jun 3, 2024
b366498
Merge pull request #417 from USDAForestService/main
ctoney Jun 11, 2024
906e5ca
Merge pull request #419 from USDAForestService/main
ctoney Jun 14, 2024
509e957
hFDefn no longer a member variable, code linting
ctoney Jun 16, 2024
6566fe2
add GDALVector::initDF_() wip
ctoney Jun 16, 2024
c560d58
initDF_(), featureToList_() wip
ctoney Jun 17, 2024
52fcbb9
Merge pull request #421 from USDAForestService/main
ctoney Jun 20, 2024
7a7b1f5
Merge branch 'USDAForestService:gdalvector' into gdalvector
ctoney Jun 22, 2024
ed21845
GDALVector::fetch() initial commit
ctoney Jun 23, 2024
769a282
GDALVector::fetch() wip
ctoney Jun 24, 2024
0a5f53c
Merge pull request #424 from USDAForestService/main
ctoney Jun 25, 2024
235040e
Merge branch 'USDAForestService:gdalvector' into gdalvector
ctoney Jun 25, 2024
60440f7
GDALVector::fetch() wip
ctoney Jun 30, 2024
e09e519
GDALVector::fetch() wip
ctoney Jul 1, 2024
7a73b6e
Merge pull request #427 from USDAForestService/main
ctoney Jul 1, 2024
3359577
Merge branch 'USDAForestService:gdalvector' into gdalvector
ctoney Jul 1, 2024
d3cd965
fetch(): add the list field types
ctoney Jul 3, 2024
6250483
use fetch() instead in getFeature() and getNextFeature()
ctoney Jul 5, 2024
834d2ac
code clean up and class variable names
ctoney Jul 9, 2024
8da7221
retain millisecond accuracy for OFTDateTime
ctoney Jul 9, 2024
b83d4ad
Merge pull request #431 from USDAForestService/main
ctoney Jul 9, 2024
19acece
Merge branch 'USDAForestService:gdalvector' into gdalvector
ctoney Jul 9, 2024
bb43c03
Merge pull request #432 from ctoney/gdalvector
ctoney Jul 9, 2024
58ae012
Merge pull request #434 from USDAForestService/main
ctoney Jul 10, 2024
ce2c15b
Merge pull request #436 from USDAForestService/main
ctoney Jul 11, 2024
7322c1b
Merge pull request #437 from USDAForestService/main
ctoney Jul 13, 2024
a8fad15
Merge pull request #438 from USDAForestService/main
ctoney Jul 17, 2024
30f4d14
Documentation for class GDALVector (WIP)
ctoney Jul 17, 2024
b1533b1
GDALVector::testCapability(): return list instead
ctoney Jul 21, 2024
59bf4f8
Documentation GDALVector (fields and methods)
ctoney Jul 21, 2024
dfaa99d
Merge pull request #439 from USDAForestService/main
ctoney Jul 22, 2024
31c85bd
Merge branch 'USDAForestService:gdalvector' into gdalvector
ctoney Jul 22, 2024
7ada512
fix tests using GDALVector::testCapability()
ctoney Jul 22, 2024
bdbd7a3
Documentation for GDALVector (examples)
ctoney Jul 22, 2024
ee1c04d
Merge pull request #440 from ctoney/gdalvector
ctoney Jul 22, 2024
a6d4d7d
Doc: edit class GDALVector
ctoney Jul 23, 2024
88e8c95
Merge pull request #441 from ctoney/gdalvector
ctoney Jul 23, 2024
d603fc2
GDALVector::fetch(): set NULL entries for OGR NULL in an OFTBinary field
ctoney Jul 23, 2024
f758aec
Merge pull request #442 from ctoney/gdalvector
ctoney Jul 23, 2024
d2e68a3
class GDALVector initial implementation
ctoney Jul 23, 2024
ff61060
Merge pull request #443 from ctoney/gdalvector
ctoney Jul 23, 2024
4ef29c4
add GDALVector-class
ctoney Jul 23, 2024
2ec4a7a
Merge pull request #445 from ctoney/gdalvector
ctoney Jul 23, 2024
36f9b15
fix test for GDAL < 3.7
ctoney Jul 23, 2024
c2e1253
Merge pull request #446 from ctoney/gdalvector
ctoney Jul 23, 2024
f594340
fix examples for GDAL < 3.7
ctoney Jul 23, 2024
37752a2
Merge pull request #447 from ctoney/gdalvector
ctoney Jul 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
# Add .editorconfig and bulk reformat codebase
44c885936e1a948990b80faffa06d6f8fb55e435
fe6c783be086d71adea69bbeacae35c91f68ba2b
eb9b8b3cd8176a81b512973c61e2605b181a7b11
5146434168160d7ca1e7b73b5a4bfa1525e29ba6
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: gdalraster
Title: Bindings to the 'Geospatial Data Abstraction Library' Raster API
Version: 1.11.1.9050
Version: 1.11.1.9100
Authors@R: c(
person("Chris", "Toney", email = "[email protected]",
role = c("aut", "cre"), comment = "R interface/additional functionality"),
Expand Down Expand Up @@ -60,7 +60,8 @@ Suggests:
knitr,
rmarkdown,
scales,
testthat (>= 3.0.0)
testthat (>= 3.0.0),
wk
NeedsCompilation: yes
SystemRequirements: GDAL (>= 3.1.0, built against GEOS), PROJ, libxml2
Encoding: UTF-8
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# gdalraster 1.11.1.9050 (dev)
# gdalraster 1.11.1.9100 (dev)

* add class `GDALVector`, initial implementation / WIP (2024-07-22)

* `plot_raster()`: default to no stretch when the input is an RGB Byte raster, addresses #429 (2024-07-10)

Expand Down
473 changes: 473 additions & 0 deletions R/gdalvector.R

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ reference:

- title: Exposed C++ classes
- contents:
- CmbTable-class
- GDALRaster-class
- GDALVector-class
- CmbTable-class
- RunningStats-class
- VSIFile-class

Expand Down
490 changes: 490 additions & 0 deletions man/GDALVector-class.Rd

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/RcppExports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,7 @@ END_RCPP

RcppExport SEXP _rcpp_module_boot_mod_cmb_table();
RcppExport SEXP _rcpp_module_boot_mod_GDALRaster();
RcppExport SEXP _rcpp_module_boot_mod_GDALVector();
RcppExport SEXP _rcpp_module_boot_mod_running_stats();
RcppExport SEXP _rcpp_module_boot_mod_VSIFile();

Expand Down Expand Up @@ -1627,6 +1628,7 @@ static const R_CallMethodDef CallEntries[] = {
{"_gdalraster_bbox_to_wkt", (DL_FUNC) &_gdalraster_bbox_to_wkt, 3},
{"_rcpp_module_boot_mod_cmb_table", (DL_FUNC) &_rcpp_module_boot_mod_cmb_table, 0},
{"_rcpp_module_boot_mod_GDALRaster", (DL_FUNC) &_rcpp_module_boot_mod_GDALRaster, 0},
{"_rcpp_module_boot_mod_GDALVector", (DL_FUNC) &_rcpp_module_boot_mod_GDALVector, 0},
{"_rcpp_module_boot_mod_running_stats", (DL_FUNC) &_rcpp_module_boot_mod_running_stats, 0},
{"_rcpp_module_boot_mod_VSIFile", (DL_FUNC) &_rcpp_module_boot_mod_VSIFile, 0},
{NULL, NULL, 0}
Expand Down
Loading
Loading