Update function names in tests

All tests passed without changes before this commit. Old functions still work

Author: jmaspons

tests/testthat/test-data_frame-osm.R

@@ -69,7 +69,7 @@ test_that ("empty result", {
     colnames (bb) <- c ("min", "max")
 
     q0 <- opq (bb, osm_types = "node", datetime = "1714-09-11T00:00:00Z") |>
-        add_osm_feature ("does not exist", "&%$")
+        filter_osm_tags ("does not exist", "&%$")
 
     osm_empty <- test_path ("fixtures", "osm-empty.osm")
     doc <- xml2::read_xml (osm_empty)
@@ -104,7 +104,7 @@ test_that ("empty result", {
         datetime = "1714-09-11T00:00:00Z",
         adiff = TRUE
     ) |>
-        add_osm_feature ("does not exist", "&%$")
+        filter_osm_tags ("does not exist", "&%$")
 
     # osm_empty <- test_path ("fixtures", "osm-empty.osm") # same result
     # doc <- xml2::read_xml (osm_empty)
@@ -177,9 +177,9 @@ test_that ("date", {
     rownames (bb) <- c ("x", "y")
     colnames (bb) <- c ("min", "max")
     q <- opq (bb, osm_types = "node", datetime = "2020-11-07T00:00:00Z") |>
-        add_osm_feature ("natural", "peak") |>
-        add_osm_feature ("prominence") |>
-        add_osm_feature ("name:ca")
+        filter_osm_tags ("natural", "peak") |>
+        filter_osm_tags ("prominence") |>
+        filter_osm_tags ("name:ca")
 
     osm_meta_date <- test_path ("fixtures", "osm-date.osm")
     doc <- xml2::read_xml (osm_meta_date)
@@ -222,7 +222,7 @@ test_that ("out tags center", {
     rownames (bb) <- c ("x", "y")
     colnames (bb) <- c ("min", "max")
     q <- opq (bb, out = "tags center") |>
-        add_osm_feature ("amenity", "community_centre")
+        filter_osm_tags ("amenity", "community_centre")
 
     osm_tags_center <- test_path ("fixtures", "osm-tags_center.osm")
     doc <- xml2::read_xml (osm_tags_center)
@@ -258,9 +258,9 @@ test_that ("out meta & diff", {
         datetime = "2020-11-07T00:00:00Z",
         datetime2 = "2022-12-04T00:00:00Z"
     ) |>
-        add_osm_feature ("natural", "peak") |>
-        add_osm_feature ("prominence") |>
-        add_osm_feature ("name:ca")
+        filter_osm_tags ("natural", "peak") |>
+        filter_osm_tags ("prominence") |>
+        filter_osm_tags ("name:ca")
 
     osm_meta_diff <- test_path ("fixtures", "osm-meta_diff.osm")
     doc <- xml2::read_xml (osm_meta_diff)
@@ -310,9 +310,9 @@ test_that ("out meta & adiff", {
         osm_types = "node", out = "meta",
         datetime = "2020-11-07T00:00:00Z", adiff = TRUE
     ) |>
-        add_osm_feature ("natural", "peak") |>
-        add_osm_feature ("prominence") |>
-        add_osm_feature ("name:ca")
+        filter_osm_tags ("natural", "peak") |>
+        filter_osm_tags ("prominence") |>
+        filter_osm_tags ("name:ca")
 
     osm_meta_adiff <- test_path ("fixtures", "osm-meta_adiff.osm")
     doc <- xml2::read_xml (osm_meta_adiff)
@@ -372,7 +372,7 @@ test_that ("out tags center & adiff", {
         adiff = TRUE,
         timeout = 50
     ) |>
-        add_osm_feature ("amenity", "community_centre")
+        filter_osm_tags ("amenity", "community_centre")
 
     osm_tags_center <- test_path ("fixtures", "osm-tags_center-adiff.osm")
     doc <- xml2::read_xml (osm_tags_center)
@@ -421,7 +421,7 @@ test_that ("adiff2", {
         datetime2 = "2016-11-07T00:00:00Z",
         adiff = TRUE
     ) |>
-        add_osm_feature ("amenity", "restaurant")
+        filter_osm_tags ("amenity", "restaurant")
 
     osm_adiff2 <- test_path ("fixtures", "osm-adiff2.osm")
     doc <- xml2::read_xml (osm_adiff2)
@@ -462,8 +462,8 @@ test_that ("adiff2", {
 test_that ("out:csv", {
     # q <- getbb ("Catalan Countries", format_out = "osm_type_id") |>
     q <- opq (bbox = "relation(id:11747082)", out = "tags center", osm_type = "relation", timeout = 50) |>
-        add_osm_feature ("admin_level", "7") |>
-        add_osm_feature ("boundary", "administrative") |>
+        filter_osm_tags ("admin_level", "7") |>
+        filter_osm_tags ("boundary", "administrative") |>
         opq_csv (fields = c ("name", "::type", "::id", "::lat", "::lon"))
 
     with_mock_dir ("mock_csv", {
@@ -476,7 +476,7 @@ test_that ("out:csv", {
     # qqoutes <- getbb ("Barcelona", format_out = "osm_type_id") |>
     qqoutes <- opq (bbox = "relation(id:347950)", osm_types = "nwr", out = "tags") |>
         opq_csv (fields = c ("name", "::id", "no_exists", "amenity")) |>
-        add_osm_feature (
+        filter_osm_tags (
             key = "name", value = "\\\"|,|Pont",
             value_exact = FALSE
         )

tests/testthat/test-elevation.R

@@ -3,7 +3,7 @@ test_that ("elevation", {
     # elevation can't actually be tested, because it only works with a full SRTM
     # elevation file, so this test doesn't actually do anything.
     qry <- opq (bbox = c (-0.116, 51.516, -0.115, 51.517)) |>
-        add_osm_feature (key = "highway")
+        filter_osm_tags (key = "highway")
 
     f <- file.path (tempdir (), "junk.osm")
     doc <- with_mock_dir ("mock_elevation", {

tests/testthat/test-opq.R

@@ -137,18 +137,18 @@ test_that ("osm_types", {
     )
     expect_true ("nwr" == q1$osm_types)
 
-    features <- c (
+    tags <- c (
         "\"amenity\"=\"school\"",
         "\"amenity\"=\"kindergarten\"",
         "\"amenity\"=\"music_school\"",
         "\"amenity\"=\"language_school\"",
         "\"amenity\"=\"dancing_school\""
     )
     q2 <- opq ("relation(id:349053)") |> # "Catalunya"
-        add_osm_features (features = features)
+        add_osm_tags (tags = tags)
     s <- opq_string (q2)
 
-    n_fts <- length (features)
+    n_fts <- length (tags)
     n_fts_in_query <- length (gregexpr ("amenity", s) [[1]])
     # Query should have that number repeated for each osm_types (default to
     # node, way, relation):
@@ -336,7 +336,7 @@ test_that ("opq_string", {
         bbox = c (-0.118, 51.514, -0.115, 51.517),
         osm_types = "node"
     )
-    q1 <- add_osm_feature (q1, key = "amenity", value = "restaurant")
+    q1 <- filter_osm_tags (q1, key = "amenity", value = "restaurant")
     s1 <- opq_string (q1)
     # nodes only, so "out" instead of "out body" and no way nor relation
     expect_false (grepl ("\\(\\._;>;\\)", s1))
@@ -346,7 +346,7 @@ test_that ("opq_string", {
         bbox = "relation(id:11747082)",
         osm_types = "node"
     )
-    q2 <- add_osm_feature (q2, key = "amenity", value = "restaurant")
+    q2 <- filter_osm_tags (q2, key = "amenity", value = "restaurant")
     s2 <- opq_string (q2)
     # nodes only, so "out" instead of "out body" and no way nor relation on clauses
     expect_false (grepl ("\\(\\._;>;\\)", s2))
@@ -367,7 +367,7 @@ test_that ("opq_string", {
 
 
     # key-value pair:
-    q2 <- add_osm_feature (q0, key = "highway", value = "!primary")
+    q2 <- filter_osm_tags (q0, key = "highway", value = "!primary")
     s2 <- opq_string (q2)
     expect_true (grepl ("highway", s2))
     expect_true (grepl ("primary", s2))

tests/testthat/test-osmdata.R

@@ -3,27 +3,27 @@ has_internet <- curl::has_internet ()
 test_that ("query-construction", {
 
     q0 <- opq (bbox = c (-0.12, 51.51, -0.11, 51.52))
-    expect_error (q1 <- add_osm_feature (q0), "key must be provided")
-    expect_silent (q1 <- add_osm_feature (q0, key = "aaa")) # bbox from qry
+    expect_error (q1 <- filter_osm_tags (q0), "key must be provided")
+    expect_silent (q1 <- filter_osm_tags (q0, key = "aaa")) # bbox from qry
     q0$bbox <- NULL
     expect_error (
-        q1 <- add_osm_feature (q0, key = "aaa"),
+        q1 <- filter_osm_tags (q0, key = "aaa"),
         "Bounding box has to either be set in opq or must be set here"
     )
     q0 <- opq (bbox = c (-0.12, 51.51, -0.11, 51.52))
-    q1 <- add_osm_feature (q0, key = "aaa")
+    q1 <- filter_osm_tags (q0, key = "aaa")
     expect_false (grepl ("=", q1$features))
-    q1 <- add_osm_feature (q0, key = "aaa", value = "bbb")
+    q1 <- filter_osm_tags (q0, key = "aaa", value = "bbb")
     expect_true (grepl ("=", q1$features))
     expect_message (
-        q1 <- add_osm_feature (q0,
+        q1 <- filter_osm_tags (q0,
             key = "aaa", value = "bbb",
             key_exact = FALSE
         ),
         "key_exact = FALSE can only combined with value_exact = FALSE;"
     )
     expect_silent (
-        q1 <- add_osm_feature (q0,
+        q1 <- filter_osm_tags (q0,
             key = "aaa", value = "bbb",
             key_exact = FALSE, value_exact = FALSE
         )
@@ -33,14 +33,14 @@ test_that ("query-construction", {
 test_that ("add feature", {
 
     qry <- opq (bbox = c (-0.118, 51.514, -0.115, 51.517))
-    qry1 <- add_osm_feature (qry, key = "highway")
-    qry2 <- add_osm_feature (qry, key = "highway", value = "primary")
-    qry3 <- add_osm_feature (qry,
+    qry1 <- filter_osm_tags (qry, key = "highway")
+    qry2 <- filter_osm_tags (qry, key = "highway", value = "primary")
+    qry3 <- filter_osm_tags (qry,
         key = "highway",
         value = c ("primary", "tertiary")
     )
-    qry4 <- add_osm_feature (qry, key = "highway", value = "!primary")
-    qry5 <- add_osm_feature (qry,
+    qry4 <- filter_osm_tags (qry, key = "highway", value = "!primary")
+    qry5 <- filter_osm_tags (qry,
         key = "highway", value = "primary",
         match_case = FALSE
     )
@@ -56,7 +56,7 @@ test_that ("add feature", {
     bbox <- c (-0.118, 51.514, -0.115, 51.517)
     qry <- opq (bbox = bbox)
     bbox2 <- bbox + c (0.01, 0.01, -0.01, -0.01)
-    qry6 <- add_osm_feature (
+    qry6 <- filter_osm_tags (
         qry,
         bbox = bbox2,
         key = "highway",
@@ -65,14 +65,14 @@ test_that ("add feature", {
     expect_true (!identical (qry$bbox, qry6$bbox))
 
     qry7 <- opq ("relation(id:74310)") |> # "Vinçà"
-        add_osm_feature (key = c ("name", "!name:ca"))
+        filter_osm_tags (key = c ("name", "!name:ca"))
     qry8 <- opq ("relation(id:11755232)") |> # "el Carxe"
-        add_osm_feature (key = "natural", value = "peak") |>
-        add_osm_feature (key = "!ele")
+        filter_osm_tags (key = "natural", value = "peak") |>
+        filter_osm_tags (key = "!ele")
     expect_warning (
         qry9 <- opq ("relation(id:11755232)") |> # "el Carxe"
-            add_osm_feature (key = "!ele") |>
-            add_osm_feature (key = "natural", value = "peak"),
+            filter_osm_tags (key = "!ele") |>
+            filter_osm_tags (key = "natural", value = "peak"),
         "The query will request objects whith only a negated key "
     )
     expect_identical (qry7$features, "[\"name\"] [!\"name:ca\"]")
@@ -249,7 +249,7 @@ test_that ("osmdata without query", {
 test_that ("make_query", {
 
     qry <- opq (bbox = c (-0.116, 51.516, -0.115, 51.517))
-    qry <- add_osm_feature (qry, key = "highway")
+    qry <- filter_osm_tags (qry, key = "highway")
 
     if (!has_internet) {
         expect_error (
@@ -361,7 +361,7 @@ test_that ("make_query", {
 test_that ("query-no-quiet", {
 
     qry <- opq (bbox = c (-0.116, 51.516, -0.115, 51.517))
-    qry <- add_osm_feature (qry, key = "highway")
+    qry <- filter_osm_tags (qry, key = "highway")
 
     with_mock_dir ("mock_osm_xml", {
         expect_message (
@@ -395,47 +395,47 @@ test_that ("query-no-quiet", {
     })
 })
 
-test_that ("add_osm_features", {
+test_that ("add_osm_tags", {
 
     qry <- opq (bbox = c (-0.118, 51.514, -0.115, 51.517))
     expect_error (
-        qry <- add_osm_features (qry),
+        qry <- add_osm_tags (qry),
         "tags must be provided"
     )
 
     qry$bbox <- NULL
     expect_error (
-        qry <- add_osm_features (qry, features = "a"),
+        qry <- add_osm_tags (qry, tags = "a"),
         "Bounding box has to either be set in opq or must be set here"
     )
 
     qry <- opq (bbox = c (-0.118, 51.514, -0.115, 51.517))
 
     expect_error (
-        qry <- add_osm_features (qry, features = "a"),
+        qry <- add_osm_tags (qry, tags = "a"),
         "tags must be a named list or vector or a character vector enclosed in escape delimited quotations \\(see examples\\)"
     )
 
     bbox <- c (-0.118, 51.514, -0.115, 51.517)
     bbox_mod <- bbox + c (-0.001, -0.001, 0.001, 0.001)
     qry0 <- opq (bbox = bbox)
-    qry1 <- add_osm_features (qry0, features = "\"amenity\"=\"restaurant\"")
-    qry2 <- add_osm_features (qry0,
-        features = "\"amenity\"=\"restaurant\"",
+    qry1 <- add_osm_tags (qry0, tags = "\"amenity\"=\"restaurant\"")
+    qry2 <- add_osm_tags (qry0,
+        tags = "\"amenity\"=\"restaurant\"",
         bbox = bbox_mod
     )
     expect_false (identical (qry1$bbox, qry2$bbox))
 
-    qry3 <- add_osm_features (qry0, features = c ("amenity" = "restaurant"))
+    qry3 <- add_osm_tags (qry0, tags = c ("amenity" = "restaurant"))
     expect_identical (qry1, qry3)
 
-    qry4 <- add_osm_features (qry0,
-        features = c ("amenity" = "restaurant", "amentity" = "pub")
+    qry4 <- add_osm_tags (qry0,
+        tags = c ("amenity" = "restaurant", "amentity" = "pub")
     )
     expect_s3_class (qry4, "overpass_query")
 
-    qry5 <- add_osm_features (qry0,
-        features = list ("amenity" = "restaurant", "amentity" = "pub")
+    qry5 <- add_osm_tags (qry0,
+        tags = list ("amenity" = "restaurant", "amentity" = "pub")
     )
     expect_s3_class (qry5, "overpass_query")
 })

tests/testthat/test-set_bind_key_pre.R

@@ -1,6 +1,6 @@
 # NOTE: As of November 2022, these conditions are currently not possible, and
 # can only be triggered by direct calls to the internal functions. The bind
-# and key_pre parameters may be exposed in add_osm_features() in the future if
+# and key_pre parameters may be exposed in add_osm_tags() in the future if
 # package developers decide the option could be useful.
 
 test_that ("set_bind_key_pre errors", {

tests/testthat/test-unname.R

@@ -3,7 +3,7 @@ require (sf)
 test_that ("unname", {
 
     qry <- opq (bbox = c (-0.116, 51.516, -0.115, 51.517))
-    qry <- add_osm_feature (qry, key = "highway")
+    qry <- filter_osm_tags (qry, key = "highway")
 
     res <- with_mock_dir ("mock_unname", {
         osmdata_sf (qry)

tests/timing-benchmark.R

@@ -1,20 +1,23 @@
-#library (osmdata)
+# library (osmdata)
 
 benchmark <- function (times = 100) {
 
     devtools::load_all (".", export_all = FALSE)
-    q0 <- opq (bbox = c(-0.27, 51.47, -0.20, 51.50))
-    q1 <- add_osm_feature (q0, key = "name", value = "Thames")
+    q0 <- opq (bbox = c (-0.27, 51.47, -0.20, 51.50))
+    q1 <- filter_osm_tags (q0, key = "name", value = "Thames")
     # contains both multipolygons and multilinestrings
     doc <- osmdata_xml (q1, "export.osm")
 
-    objs <- c ("points", "lines", "multilinestrings", "multipolygons",
-               "other_relations")
+    objs <- c (
+        "points", "lines", "multilinestrings", "multipolygons",
+        "other_relations"
+    )
     mt_sf <- size_sf <- NULL
     for (i in seq (objs)) {
         mb <- microbenchmark::microbenchmark (
-           dat <- sf::st_read ("export.osm", layer = objs [i], quiet = TRUE),
-           times = times)
+            dat <- sf::st_read ("export.osm", layer = objs [i], quiet = TRUE),
+            times = times
+        )
         size_sf <- c (size_sf, object.size (dat))
         mt_sf <- c (mt_sf, median (mb$time))
         cat ("\r", i, " / ", length (objs))
@@ -24,13 +27,16 @@ benchmark <- function (times = 100) {
     cat ("\t(", mt_sf, "); total = ", sum (mt_sf), "\n")
 
     mb <- microbenchmark::microbenchmark (x <- osmdata_sf (q1, doc),
-                                          times = times)
-    #mb <- microbenchmark::microbenchmark ( x <- osmdata_sf (q1, "export.osm"),
+        times = times
+    )
+    # mb <- microbenchmark::microbenchmark ( x <- osmdata_sf (q1, "export.osm"),
     #                                      times = 10L)
     mt <- median (mb$time / 1e6)
     cat ("osmdata: Median time = ", mt, " ms\n")
     size_od <- object.size (x)
 
-    cat ("\nosmdata took ", mt / sum (mt_sf), " times longer to extract ",
-         size_od / sum (size_sf), " times as much data\n")
+    cat (
+        "\nosmdata took ", mt / sum (mt_sf), " times longer to extract ",
+        size_od / sum (size_sf), " times as much data\n"
+    )
 }