Merge pull request #61 from ropensci/fix-osm_query_changesets

Fix `osm_query_changesets(..., time, time_2)`
ropensci · Nov 17, 2024 · f49f450 · f49f450
2 parents 2b68620 + bae689f
commit f49f450
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/R/osmapi_changesets.R b/R/osmapi_changesets.R
@@ -689,8 +689,11 @@ osm_download_changeset <- function(changeset_id, format = c("R", "osc", "xml"))
   if (!is.null(time) && inherits(time, "POSIXt")) {
     time <- format(time, "%Y-%m-%dT%H:%M:%SZ")
   }
-  if (!is.null(time_2) && inherits(time_2, "POSIXt")) {
-    time_2 <- format(time_2, "%Y-%m-%dT%H:%M:%SZ")
+  if (!is.null(time_2)) {
+    stopifnot("`time_2` requires `time` parameter." = !is.null(time))
+    if (inherits(time_2, "POSIXt")) {
+      time_2 <- format(time_2, "%Y-%m-%dT%H:%M:%SZ")
+    }
     time <- paste0(time, ",", time_2)
   }
 

diff --git a/...ets/osm.org/api/0.6/changesets-190728.xml → ...ets/osm.org/api/0.6/changesets-fce339.xml b/...ets/osm.org/api/0.6/changesets-190728.xml → ...ets/osm.org/api/0.6/changesets-fce339.xml
diff --git a/tests/testthat/test-changesets.R b/tests/testthat/test-changesets.R
@@ -264,8 +264,8 @@ test_that("osm_query_changesets works", {
     chaset$time <- osm_query_changesets(
       bbox = c(-1.241112, 38.0294955, 8.4203171, 42.9186456),
       user = "Mementomoristultus",
-      time = "2023-06-22T02:23:23Z",
-      time_2 = "2023-06-22T00:38:20Z"
+      time = as.POSIXct("2023-06-22T02:20:23Z", tz = "GMT", format = "%Y-%m-%dT%H:%M:%S"),
+      time_2 = as.POSIXct("2023-06-22T02:30:00Z", tz = "GMT", format = "%Y-%m-%dT%H:%M:%S")
     )
     chaset$from_to <- osm_query_changesets(
       bbox = c(-1.241112, 38.0294955, 8.4203171, 42.9186456),

diff --git a/tests/testthat/test-tags_list-wide.R b/tests/testthat/test-tags_list-wide.R
@@ -75,8 +75,8 @@ test_that("Changesets tags_list-wide works", {
     tags_list$time <- osm_query_changesets(
       bbox = c(-1.241112, 38.0294955, 8.4203171, 42.9186456),
       user = "Mementomoristultus",
-      time = "2023-06-22T02:23:23Z",
-      time_2 = "2023-06-22T00:38:20Z"
+      time = "2023-06-22T02:20:23Z",
+      time_2 = "2023-06-22T02:30:00Z"
     )
     tags_list$closed <- osm_query_changesets(
       bbox = c("-9.3015367,41.8073642,-6.7339533,43.790422"),
@@ -90,8 +90,8 @@ test_that("Changesets tags_list-wide works", {
     tags_wide$time <- osm_query_changesets(
       bbox = c(-1.241112, 38.0294955, 8.4203171, 42.9186456),
       user = "Mementomoristultus",
-      time = "2023-06-22T02:23:23Z",
-      time_2 = "2023-06-22T00:38:20Z",
+      time = "2023-06-22T02:20:23Z",
+      time_2 = "2023-06-22T02:30:00Z",
       tags_in_columns = TRUE
     )
     tags_wide$closed <- osm_query_changesets(