From 66991c3d2beb62e44a0ee894fddd5b19a1aecbbc Mon Sep 17 00:00:00 2001 From: EhrmannS Date: Tue, 21 Jan 2025 11:08:55 +0100 Subject: [PATCH] fix querry --- CRAN-SUBMISSION | 4 ++-- DESCRIPTION | 2 +- NEWS.md | 4 ++++ R/normGeometry.R | 2 +- arealDB.Rproj | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index cf3f1a4..5a3fb59 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ Version: 0.9.4 -Date: 2025-01-20 11:29:04 UTC -SHA: d08817afdde8712ddd06f599ce0cccadcba2ae11 +Date: 2025-01-20 13:26:21 UTC +SHA: f358f466e8b874e6cdd33973e5837a8d5db99d11 diff --git a/DESCRIPTION b/DESCRIPTION index 342a702..c51b572 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,7 +8,7 @@ Description: Many relevant applications in the environmental and socioeconomic make this a tedious and error-prone process. 'arealDB' tackles those problems and helps the user to integrate a harmonised databases of areal data. Read the paper at Ehrmann, Seppelt & Meyer (2020) . -Version: 0.9.4 +Version: 0.9.5 Authors@R: c( person( given = "Steffen", diff --git a/NEWS.md b/NEWS.md index 6ff15cd..d8c7786 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# arealDB 0.9.5 + +- fix `query = ...` in `normGeometry()` to allow full customization. + # arealDB 0.9.4 - fix example data so that github actions run properly. diff --git a/R/normGeometry.R b/R/normGeometry.R index 4a9bc45..7e7d248 100755 --- a/R/normGeometry.R +++ b/R/normGeometry.R @@ -228,7 +228,7 @@ normGeometry <- function(input = NULL, pattern = NULL, query = NULL, thresh = 10 if(!is.null(query)){ moveFile <- FALSE input_geom <- read_sf(dsn = thisInput, - query = paste0("select * from ", gLayer, " ", query), + query = query, stringsAsFactors = FALSE) } else { input_geom <- read_sf(dsn = thisInput, diff --git a/arealDB.Rproj b/arealDB.Rproj index acfb977..c52a72d 100755 --- a/arealDB.Rproj +++ b/arealDB.Rproj @@ -1,4 +1,5 @@ Version: 1.0 +ProjectId: fa28d006-8d07-4dc5-a48b-f9acf18662a1 RestoreWorkspace: Default SaveWorkspace: Default