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..6ba22d03a0c56fbb7294104bf286cde7e79982c8 100644 (file)
--- a/test/bdd/api/search/params.feature
+++ b/test/bdd/api/search/params.feature
@@ -51,7 +51,7 @@ Feature: Search queries
           | en |
         Then results contain
           | display_name |
           | en |
         Then results contain
           | display_name |

-          | Plei Ya Rê, Kon Tum province, Vietnam |
+          | Plei Ya Rê, Vietnam |

 
     Scenario: Address details with unknown class types
         When sending json search query "Hundeauslauf, Hamburg" with address
 
     Scenario: Address details with unknown class types
         When sending json search query "Hundeauslauf, Hamburg" with address


@@ -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


@@ -119,13 +119,13 @@ Feature: Search queries
           | en |
         Then result addresses contain
           | ID | state |
           | en |
         Then result addresses contain
           | ID | state |

-          | 0  | Salto |
+          | 0  | Florida |

         When sending json search query "25 de Mayo" with address
           | accept-language | viewbox |
         When sending json search query "25 de Mayo" with address
           | accept-language | viewbox |

-          | en              | -56.35879,-34.18330,-56.31618,-34.20815 |
+          | en              | -57.95468,-31.39261,-57.94741,-31.39490 |

         Then result addresses contain
           | ID | state |
         Then result addresses contain
           | ID | state |

-          | 0  | Florida |
+          | 0  | Salto |

 
     Scenario: viewboxes cannot be points
         When sending json search query "foo"
 
     Scenario: viewboxes cannot be points
         When sending json search query "foo"


@@ -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"


@@ -301,18 +303,6 @@ Feature: Search queries
         | json     | geotext |
         | jsonv2   | geotext |
 
         | json     | geotext |
         | jsonv2   | geotext |
 

-    Scenario Outline: Search result contains polygon-as-points geometry
-        When sending <format> search query "Highmore"
-          | polygon |
-          | 1 |
-        Then result has attributes <response_attribute>
-
-    Examples:
-        | format   | response_attribute |
-        | xml      | polygonpoints |
-        | json     | polygonpoints |
-        | jsonv2   | polygonpoints |
-

     Scenario Outline: Search result contains SVG geometry
         When sending <format> search query "Highmore"
           | polygon_svg |
     Scenario Outline: Search result contains SVG geometry
         When sending <format> search query "Highmore"
           | polygon_svg |


@@ -348,6 +338,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_svg | polygon_geokml |
+          | 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 +360,5 @@ Feature: Search queries
         Then result addresses contain
           | city |
           | Rapid City |
         Then result addresses contain
           | city |
           | Rapid City |

+
+