Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / api / search / params.feature

diff --git a/test/bdd/api/search/params.feature b/test/bdd/api/search/params.feature
index b184fd860939b2aad32899c9301f54ede88aacc7..feacd5f95586bf3ba1d6b489144c4b4842762f9d 100644 (file)
--- a/test/bdd/api/search/params.feature
+++ b/test/bdd/api/search/params.feature
@@ -111,7 +111,7 @@ Feature: Search queries
         When sending json search query "restaurant"
          | bounded | viewbox |
          | 1       | 9.93027,53.61634,10.10073,53.54500 |
         When sending json search query "restaurant"
          | bounded | viewbox |
          | 1       | 9.93027,53.61634,10.10073,53.54500 |

-        Then result has bounding box in 53.54500,53.61634,9.93027,10.10073
+        Then result has centroid in 53.54500,53.61634,9.93027,10.10073

 
     Scenario: Prefer results within viewbox
         When sending json search query "25 de Mayo" with address
 
     Scenario: Prefer results within viewbox
         When sending json search query "25 de Mayo" with address


@@ -276,6 +276,7 @@ Feature: Search queries
         | xml |
         | json |
         | jsonv2 |
         | xml |
         | json |
         | jsonv2 |

+        | geojson |

 
     Scenario Outline: Search with namedetails
         When sending <format> search query "Hauptstr"
 
     Scenario Outline: Search with namedetails
         When sending <format> search query "Hauptstr"


@@ -288,6 +289,7 @@ Feature: Search queries
         | xml |
         | json |
         | jsonv2 |
         | xml |
         | json |
         | jsonv2 |

+        | geojson |

 
     Scenario Outline: Search result with contains TEXT geometry
         When sending <format> search query "Highmore"
 
     Scenario Outline: Search result with contains TEXT geometry
         When sending <format> search query "Highmore"


@@ -348,6 +350,20 @@ Feature: Search queries
         | xml      | geojson |
         | json     | geojson |
         | jsonv2   | geojson |
         | xml      | geojson |
         | json     | geojson |
         | jsonv2   | geojson |

+        | geojson  | geojson |
+
+    Scenario Outline: Search result in geojson format contains no non-geojson geometry
+        When sending geojson search query "Highmore"
+          | polygon_text | polygon | polygon_svg | polygon_geokml |
+          | 1            | 1       | 1           | 1              |
+        Then result 0 has not attributes <response_attribute>
+
+    Examples:
+        | response_attribute |
+        | geotext            |
+        | polygonpoints      |
+        | svg                |
+        | geokml             |

 
     Scenario: Search along a route
         When sending json search query "restaurant" with address
 
     Scenario: Search along a route
         When sending json search query "restaurant" with address


@@ -356,3 +372,5 @@ Feature: Search queries
         Then result addresses contain
           | city |
           | Rapid City |
         Then result addresses contain
           | city |
           | Rapid City |

+
+