Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature
index 8b70dac188ad968e36a9f2d80c3fb21021064b0b..6e640accab02e4d166a65b91e4d2a64b27699f15 100644 (file)
--- a/test/bdd/api/search/queries.feature
+++ b/test/bdd/api/search/queries.feature
@@ -1,7 +1,16 @@
+@SQLITE

 @APIDB
 Feature: Search queries
     Generic search result correctness
 
 @APIDB
 Feature: Search queries
     Generic search result correctness
 

+    Scenario: Search for natural object
+        When sending json search query "Samina"
+          | accept-language |
+          | en |
+        Then results contain
+          | ID | class    | type  | display_name    |
+          | 0  | waterway | river | Samina, Austria |
+

     Scenario: House number search for non-street address
         When sending json search query "6 Silum, Liechtenstein" with address
           | accept-language |
     Scenario: House number search for non-street address
         When sending json search query "6 Silum, Liechtenstein" with address
           | accept-language |


@@ -15,6 +24,7 @@ Feature: Search queries
           | postcode     | 9497 |
           | country      | Liechtenstein |
           | country_code | li |
           | postcode     | 9497 |
           | country      | Liechtenstein |
           | country_code | li |

+          | ISO3166-2-lvl8  | LI-10 |

 
     Scenario: House number interpolation
         When sending json search query "Grosssteg 1023, Triesenberg" with address
 
     Scenario: House number interpolation
         When sending json search query "Grosssteg 1023, Triesenberg" with address


@@ -41,6 +51,7 @@ Feature: Search queries
           | town          | Triesenberg |
           | country       | Liechtenstein |
           | country_code  | li |
           | town          | Triesenberg |
           | country       | Liechtenstein |
           | country_code  | li |

+          | ISO3166-2-lvl8  | LI-10 |

 
     Scenario Outline: Housenumber 0 can be found
         When sending <format> search query "Gnalpstrasse 0" with address
 
     Scenario Outline: Housenumber 0 can be found
         When sending <format> search query "Gnalpstrasse 0" with address


@@ -95,16 +106,6 @@ Feature: Search queries
           | class | type |
           | club  | scout |
 
           | class | type |
           | club  | scout |
 

-    Scenario: With multiple amenity search only the first is used
-        When sending json search query "[club=scout] [church] vaduz"
-        Then results contain
-          | class | type |
-          | club  | scout |
-        When sending json search query "[amenity=place_of_worship] [club=scout] vaduz"
-        Then results contain
-          | class   | type |
-          | amenity | place_of_worship |
-

     Scenario: POI search near given coordinate
         When sending json search query "restaurant near 47.16712,9.51100"
         Then results contain
     Scenario: POI search near given coordinate
         When sending json search query "restaurant near 47.16712,9.51100"
         Then results contain


@@ -117,11 +118,14 @@ Feature: Search queries
           | class   | type |
           | leisure | firepit |
 
           | class   | type |
           | leisure | firepit |
 

-    Scenario: Arbitrary key/value search near given coordinate and named place
-        When sending json search query "[leisure=firepit] ebenholz  47° 9′ 26″ N 9° 36′ 45″ E"
+
+    Scenario: POI search in a bounded viewbox
+        When sending json search query "restaurants"
+          | viewbox                           | bounded |
+          | 9.50830,47.15253,9.52043,47.14866 | 1 |

         Then results contain
         Then results contain

-          | class    | type |
-          | leisure | firepit |
+          | class   | type       |
+          | amenity | restaurant |

 
     Scenario Outline: Key/value search near given coordinate can be restricted to country
         When sending json search query "[natural=peak] 47.06512,9.53965" with address
 
     Scenario Outline: Key/value search near given coordinate can be restricted to country
         When sending json search query "[natural=peak] 47.06512,9.53965" with address


@@ -182,7 +186,6 @@ Feature: Search queries
         Then result addresses contain
           | ID | house_number |
           | 0  | 11 |
         Then result addresses contain
           | ID | house_number |
           | 0  | 11 |

-          | 1  | 11 a |

 
     Scenario Outline: Coordinate searches with white spaces
         When sending json search query "<data>"
 
     Scenario Outline: Coordinate searches with white spaces
         When sending json search query "<data>"