]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 93203f3)
bdd: be more fuzzy with coordinate comparisons
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 9 Mar 2023 20:47:29 +0000 (21:47 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 9 Mar 2023 21:37:45 +0000 (22:37 +0100)
test/bdd/api/reverse/v1_json.feature patch | blob | history
test/bdd/api/reverse/v1_xml.feature patch | blob | history

diff --git a/test/bdd/api/reverse/v1_json.feature b/test/bdd/api/reverse/v1_json.feature
index 129cbf61bd62ec5729dc4f4935763b314975350f..155e02b0ab45457a8f8e6f0515c931ae9652ea80 100644 (file)
--- a/test/bdd/api/reverse/v1_json.feature
+++ b/test/bdd/api/reverse/v1_json.feature
@@ -27,8 +27,8 @@ Feature: Json output for Reverse API
           | osm_type | osm_id     |
           | node     | 6522627624 |
         And results contain
           | osm_type | osm_id     |
           | node     | 6522627624 |
         And results contain
-          | lat        | lon       | boundingbox |
-          | 47.0660892 | 9.5036065 | ['47.0660392', '47.0661392', '9.5035565', '9.5036565'] |
+          | centroid             | boundingbox |
+          | 9.5036065 47.0660892 | ['47.0660392', '47.0661392', '9.5035565', '9.5036565'] |
         And results contain
           | display_name |
           | Dorfbäckerei Herrmann, 29, Gnetsch, Mäls, Balzers, Oberland, 9496, Liechtenstein |
         And results contain
           | display_name |
           | Dorfbäckerei Herrmann, 29, Gnetsch, Mäls, Balzers, Oberland, 9496, Liechtenstein |
@@ -61,8 +61,8 @@ Feature: Json output for Reverse API
           | osm_type | osm_id |
           | way      | 1      |
         And results contain
           | osm_type | osm_id |
           | way      | 1      |
         And results contain
-          | lat          | lon        | boundingbox |
-          | 47.118545392 | 9.57054676 | ['47.118495392', '47.118595392', '9.57049676', '9.57059676'] |
+          | centroid                | boundingbox |
+          | 9.57054676 47.118545392 | ['47.118495392', '47.118595392', '9.57049676', '9.57059676'] |
         And results contain
           | display_name |
           | 1019, Grosssteg, Sücka, Triesenberg, Oberland, 9497, Liechtenstein |
         And results contain
           | display_name |
           | 1019, Grosssteg, Sücka, Triesenberg, Oberland, 9497, Liechtenstein |
@@ -121,7 +121,7 @@ Feature: Json output for Reverse API
           | polygon_kml | 1     |
        Then results contain
           | geokml |
           | polygon_kml | 1     |
        Then results contain
           | geokml |
-          | <LineString><coordinates>9.5039353,47.0657546 9.5040437,47.0657781 9.5040808,47.065787 9.5054298,47.0661407</coordinates></LineString> |
+          | ^<LineString><coordinates>9.5039\d*,47.0657\d* 9.5040\d*,47.0657\d* 9.5040\d*,47.065\d* 9.5054\d*,47.0661\d*</coordinates></LineString> |
 
        Examples:
           | format |
 
        Examples:
           | format |
diff --git a/test/bdd/api/reverse/v1_xml.feature b/test/bdd/api/reverse/v1_xml.feature
index ec001b0b50b6bf6de75a1cc03e88053b74c08b03..fd6e150120b9f523f2e43d165c79a48eacee0df4 100644 (file)
--- a/test/bdd/api/reverse/v1_xml.feature
+++ b/test/bdd/api/reverse/v1_xml.feature
@@ -12,8 +12,8 @@ Feature: XML output for Reverse API
           | osm_type | osm_id     | place_rank | address_rank |
           | node     | 6522627624 | 30         | 30           |
         And results contain
           | osm_type | osm_id     | place_rank | address_rank |
           | node     | 6522627624 | 30         | 30           |
         And results contain
-          | lat        | lon       | boundingbox |
-          | 47.0660892 | 9.5036065 | 47.0660392,47.0661392,9.5035565,9.5036565 |
+          | centroid             | boundingbox |
+          | 9.5036065 47.0660892 | 47.0660392,47.0661392,9.5035565,9.5036565 |
         And results contain
           | ref                   | display_name |
           | Dorfbäckerei Herrmann | Dorfbäckerei Herrmann, 29, Gnetsch, Mäls, Balzers, Oberland, 9496, Liechtenstein |
         And results contain
           | ref                   | display_name |
           | Dorfbäckerei Herrmann | Dorfbäckerei Herrmann, 29, Gnetsch, Mäls, Balzers, Oberland, 9496, Liechtenstein |
@@ -31,8 +31,8 @@ Feature: XML output for Reverse API
          | osm_type | osm_id    | place_rank  | address_rank |
          | way      | 396009653 | 30          | 30           |
         And results contain
          | osm_type | osm_id    | place_rank  | address_rank |
          | way      | 396009653 | 30          | 30           |
         And results contain
-          | lat               | lon                | boundingbox |
-          | 32.47535802569396 | -86.48085532585448 | 32.475308025694,32.475408025694,-86.480905325854,-86.480805325854 |
+          | centroid                     | boundingbox |
+          | -86.4808553258 32.4753580256 | ^32.475308025\d*,32.475408025\d*,-86.480905325\d*,-86.480805325\d* |
         And results contain
           | display_name |
           | 707, Upper Kingston Road, Upper Kingston, Prattville, Autauga County, 36067, United States |
         And results contain
           | display_name |
           | 707, Upper Kingston Road, Upper Kingston, Prattville, Autauga County, 36067, United States |
@@ -44,8 +44,8 @@ Feature: XML output for Reverse API
           | osm_type | osm_id | place_rank | address_rank |
           | way      | 1      | 30         | 30           |
         And results contain
           | osm_type | osm_id | place_rank | address_rank |
           | way      | 1      | 30         | 30           |
         And results contain
-          | lat          | lon        | boundingbox |
-          | 47.118545392 | 9.57054676 | 47.118495392,47.118595392,9.57049676,9.57059676 |
+          | centroid                | boundingbox |
+          | 9.57054676 47.118545392 | 47.118495392,47.118595392,9.57049676,9.57059676 |
         And results contain
           | display_name |
           | 1019, Grosssteg, Sücka, Triesenberg, Oberland, 9497, Liechtenstein |
         And results contain
           | display_name |
           | 1019, Grosssteg, Sücka, Triesenberg, Oberland, 9497, Liechtenstein |
@@ -84,4 +84,4 @@ Feature: XML output for Reverse API
           | polygon_kml | 1     |
        Then results contain
           | geokml |
           | polygon_kml | 1     |
        Then results contain
           | geokml |
-          | <geokml><LineString><coordinates>9.5039353,47.0657546 9.5040437,47.0657781 9.5040808,47.065787 9.5054298,47.0661407</coordinates></LineString></geokml> |
+          | ^<geokml><LineString><coordinates>9.5039\d*,47.0657\d* 9.5040\d*,47.0657\d* 9.5040\d*,47.065\d* 9.5054\d*,47.0661\d*</coordinates></LineString></geokml> |
Open Source search based on OpenStreetMap data