Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / query / search_simple.feature

diff --git a/test/bdd/db/query/search_simple.feature b/test/bdd/db/query/search_simple.feature
index daf83cea04d7e25c606b4098db124c6aaba4e087..270d2e554757de72d94a61de0561a4c8dd889270 100644 (file)
--- a/test/bdd/db/query/search_simple.feature
+++ b/test/bdd/db/query/search_simple.feature
@@ -7,31 +7,32 @@ Feature: Searching of simple objects
           | osm | class | type    | name+name | geometry   |
           | N1  | place | village | Foo       | 10.0 -10.0 |
         When importing
           | osm | class | type    | name+name | geometry   |
           | N1  | place | village | Foo       | 10.0 -10.0 |
         When importing

-        And searching for "Foo"
+        And sending search query "Foo"

         Then results contain
         Then results contain

-         | ID | osm | class | type    | centroid |
-         | 0  | N1  | place | village | 10 -10   |
+         | ID | osm | category | type    | centroid |
+         | 0  | N1  | place    | village | 10 -10   |

 
      Scenario: Updating postcode in postcode boundaries without ref
 
      Scenario: Updating postcode in postcode boundaries without ref

+        Given the grid
+          | 1 | 2 |
+          | 4 | 3 |

         Given the places
           | osm | class    | type        | postcode | geometry |
         Given the places
           | osm | class    | type        | postcode | geometry |

-          | R1  | boundary | postal_code | 12345    | poly-area:1.0 |
+          | R1  | boundary | postal_code | 12345    | (1,2,3,4,1) |

         When importing
         When importing

-        And searching for "12345"
+        And sending search query "12345"

         Then results contain
         Then results contain

-         | ID | osm_type | osm_id |
-         | 0  | R        | 1 |
+         | ID | osm |
+         | 0  | R1 |

         When updating places
           | osm | class    | type        | postcode | geometry |
         When updating places
           | osm | class    | type        | postcode | geometry |

-          | R1  | boundary | postal_code | 54321    | poly-area:1.0 |
-        And searching for "12345"
-        Then results contain
-         | osm_type |
-         | P        |
-        When searching for "54321"
+          | R1  | boundary | postal_code | 54321    | (1,2,3,4,1) |
+        And sending search query "12345"
+        Then exactly 0 results are returned
+        When sending search query "54321"

         Then results contain
         Then results contain

-         | ID | osm_type | osm_id |
-         | 0  | R        | 1 |
+         | ID | osm |
+         | 0  | R1 |

 
     # github #1763
     Scenario: Correct translation of highways under construction
 
     # github #1763
     Scenario: Correct translation of highways under construction


@@ -47,3 +48,62 @@ Feature: Searching of simple objects
         Then result addresses contain
          | amenity | road |
          | Bean    | The build |
         Then result addresses contain
          | amenity | road |
          | Bean    | The build |

+
+    Scenario: when missing housenumbers in search don't return a POI
+        Given the places
+         | osm | class   | type       | name        |
+         | N3  | amenity | restaurant | Wood Street |
+        And the places
+         | osm | class   | type       | name        | housenr |
+         | N20 | amenity | restaurant | Red Way     | 34      |
+        When importing
+        And sending search query "Wood Street 45"
+        Then exactly 0 results are returned
+        When sending search query "Red Way 34"
+        Then results contain
+         | osm |
+         | N20 |
+
+     Scenario: when the housenumber is missing the street is still returned
+        Given the grid
+         | 1 |  | 2 |
+        Given the places
+         | osm | class   | type        | name        | geometry |
+         | W1  | highway | residential | Wood Street | 1, 2     |
+        When importing
+        And sending search query "Wood Street"
+        Then results contain
+         | osm |
+         | W1  |
+
+
+     @fail-legacy
+     Scenario Outline: Special cased american states will be found
+        Given the grid
+         | 1 |    | 2 |
+         |   | 10 |   |
+         | 4 |    | 3 |
+        Given the places
+         | osm  | class    | type           | admin | name    | name+ref | geometry    |
+         | R1   | boundary | administrative | 4     | <state> | <ref>    | (1,2,3,4,1) |
+        Given the places
+         | osm  | class | type  | name   | geometry    |
+         | N2   | place | town  | <city> | 10          |
+         | N3   | place | city  | <city>  | country:ca  |
+        When importing
+        And sending search query "<city>, <state>"
+        Then results contain
+         | osm |
+         | N2  |
+        When sending search query "<city>, <ref>"
+         | accept-language |
+         | en |
+        Then results contain
+         | osm |
+         | N2  |
+
+     Examples:
+        | city        | state     | ref |
+        | Chicago     | Illinois  | IL  |
+        | Auburn      | Alabama   | AL  |
+        | New Orleans | Louisiana | LA  |