add httptest2 redactor for #272

ropensci · Jun 2, 2022 · 4304dfb · 4304dfb
1 parent 46915b6
commit 4304dfb
Show file tree

Hide file tree

Showing 31 changed files with 499 additions and 445 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: osmdata
 Title: Import 'OpenStreetMap' Data as Simple Features or Spatial Objects
-Version: 0.1.9.021
+Version: 0.1.9.022
 Authors@R: c(
     person("Mark", "Padgham", , "mark.padgham@email.com", role = c("aut", "cre")),
     person("Bob", "Rudis", role = "aut"),

diff --git a/codemeta.json b/codemeta.json
@@ -11,7 +11,7 @@
   "codeRepository": "https://github.com/ropensci/osmdata/",
   "issueTracker": "https://github.com/ropensci/osmdata/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.9.021",
+  "version": "0.1.9.022",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/inst/httptest2/redact.R b/inst/httptest2/redact.R
@@ -0,0 +1,44 @@
+function (resp) {
+
+    resp <- httptest2::gsub_response (
+        resp,
+        "https://nominatim.openstreetmap.org/",
+        "nominatim/",
+        fixed = TRUE
+    )
+
+    resp <- httptest2::gsub_response (
+        resp,
+        "https://wiki.openstreetmap.org/wiki/",
+        "wiki/",
+        fixed = TRUE
+    )
+
+    resp <- httptest2::gsub_response (
+        resp,
+        "overpass.kumi.systems/api/",
+        "overpass/",
+        fixed = TRUE
+    )
+
+    # Timestamp pattern:
+    ptn <- paste0 ("[A-Za-z]{3},\\s[0-9]{2}\\s[A-Za-z]{3}\\s[0-9]{4}\\s",   # date
+                   "[0-9]{2}\\:[0-9]{2}\\:[0-9]{2}")                        # time
+    resp <- httptest2::gsub_response (
+        resp,
+        ptn,
+        "Sat, 01 Jan 20222 00:00:00",
+        fixed = FALSE
+    )
+
+    # Datestamp pattern (for api status requests):
+    ptn <- "[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}T[0-9]{2}\\:[0-9]{2}\\:[0-9]{2}Z"
+    resp <- httptest2::gsub_response (
+        resp,
+        ptn,
+        "2022-01-01T00:00:00Z",
+        fixed = FALSE
+    )
+
+    return (resp)
+}
diff --git a/...openstreetmap.org/search-619814-POST.json → ...mock_bb/nominatim/search-619814-POST.json b/...openstreetmap.org/search-619814-POST.json → ...mock_bb/nominatim/search-619814-POST.json
@@ -16,7 +16,7 @@
         "class": "place",
         "type": "city",
         "importance": 0.6854709096560191,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_city.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_city.p.20.png"
     },
     {
         "place_id": 282390979,
@@ -35,7 +35,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.6854709096560191,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282183131,
@@ -54,7 +54,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.6714282515201715,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282230078,
@@ -73,7 +73,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.5799235624180024,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282173716,
@@ -92,7 +92,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.551945755236079,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 283153718,
@@ -111,7 +111,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.44487355764569475,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 754736,
@@ -130,7 +130,7 @@
         "class": "place",
         "type": "hamlet",
         "importance": 0.36,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_village.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_village.p.20.png"
     },
     {
         "place_id": 39998363,
@@ -149,7 +149,7 @@
         "class": "place",
         "type": "hamlet",
         "importance": 0.36,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_village.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_village.p.20.png"
     },
     {
         "place_id": 5797359,
@@ -186,6 +186,6 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.3,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     }
 ]
diff --git a/...openstreetmap.org/search-619814-POST.json → ...k_bb_df/nominatim/search-619814-POST.json b/...openstreetmap.org/search-619814-POST.json → ...k_bb_df/nominatim/search-619814-POST.json
@@ -16,7 +16,7 @@
         "class": "place",
         "type": "city",
         "importance": 0.6854709096560191,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_city.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_city.p.20.png"
     },
     {
         "place_id": 282390979,
@@ -35,7 +35,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.6854709096560191,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282183131,
@@ -54,7 +54,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.6714282515201715,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282230078,
@@ -73,7 +73,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.5799235624180024,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282173716,
@@ -92,7 +92,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.551945755236079,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 283153718,
@@ -111,7 +111,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.44487355764569475,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 754736,
@@ -130,7 +130,7 @@
         "class": "place",
         "type": "hamlet",
         "importance": 0.36,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_village.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_village.p.20.png"
     },
     {
         "place_id": 39998363,
@@ -149,7 +149,7 @@
         "class": "place",
         "type": "hamlet",
         "importance": 0.36,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_village.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_village.p.20.png"
     },
     {
         "place_id": 5797359,
@@ -186,6 +186,6 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.3,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     }
 ]
diff --git a/...openstreetmap.org/search-619814-POST.json → ...bb_nope/nominatim/search-619814-POST.json b/...openstreetmap.org/search-619814-POST.json → ...bb_nope/nominatim/search-619814-POST.json
@@ -16,7 +16,7 @@
         "class": "place",
         "type": "city",
         "importance": 0.6854709096560191,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_city.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_city.p.20.png"
     },
     {
         "place_id": 282390979,
@@ -35,7 +35,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.6854709096560191,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282183131,
@@ -54,7 +54,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.6714282515201715,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282230078,
@@ -73,7 +73,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.5799235624180024,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 282173716,
@@ -92,7 +92,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.551945755236079,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 283153718,
@@ -111,7 +111,7 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.44487355764569475,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     },
     {
         "place_id": 754736,
@@ -130,7 +130,7 @@
         "class": "place",
         "type": "hamlet",
         "importance": 0.36,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_village.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_village.p.20.png"
     },
     {
         "place_id": 39998363,
@@ -149,7 +149,7 @@
         "class": "place",
         "type": "hamlet",
         "importance": 0.36,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_place_village.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_place_village.p.20.png"
     },
     {
         "place_id": 5797359,
@@ -186,6 +186,6 @@
         "class": "boundary",
         "type": "administrative",
         "importance": 0.3,
-        "icon": "https://nominatim.openstreetmap.org/ui/mapicons/poi_boundary_administrative.p.20.png"
+        "icon": "nominatim/ui/mapicons/poi_boundary_administrative.p.20.png"
     }
 ]