Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / import / search_name.feature

diff --git a/test/bdd/db/import/search_name.feature b/test/bdd/db/import/search_name.feature
index cf3ce4dd266a27d2eaa8888e630324ca3e2d55f2..8006045fb8082c7f09b72fba9e7644781336a09a 100644 (file)
--- a/test/bdd/db/import/search_name.feature
+++ b/test/bdd/db/import/search_name.feature
@@ -29,8 +29,8 @@ Feature: Creation of search terms
         And the places
          | osm | class   | type        | name     | geometry |
          | N1  | place   | state       | new york | 80 80 |
         And the places
          | osm | class   | type        | name     | geometry |
          | N1  | place   | state       | new york | 80 80 |

-         | N1  | place   | city        | bonn     | 81 81 |
-         | N1  | place   | suburb      | smalltown| 80 81 |
+         | N2  | place   | city        | bonn     | 81 81 |
+         | N3  | place   | suburb      | smalltown| 80 81 |

         And the named places
          | osm | class   | type    | addr+city | addr+state | addr+suburb | geometry |
          | W1  | highway | service | bonn      | New York   | Smalltown   | :w-north |
         And the named places
          | osm | class   | type    | addr+city | addr+state | addr+suburb | geometry |
          | W1  | highway | service | bonn      | New York   | Smalltown   | :w-north |


@@ -39,13 +39,13 @@ Feature: Creation of search terms
          | object | nameaddress_vector |
          | W1     | bonn, new york, smalltown |
 
          | object | nameaddress_vector |
          | W1     | bonn, new york, smalltown |
 

-    Scenario: A known addr:* tag is not added if the name is unknown
+    Scenario: A known addr:* tag is added even if the name is unknown

         Given the scene roads-with-pois
         And the places
          | osm | class   | type        | name | addr+city | geometry |
          | W1  | highway | residential | Road | Nandu     | :w-north |
         When importing
         Given the scene roads-with-pois
         And the places
          | osm | class   | type        | name | addr+city | geometry |
          | W1  | highway | residential | Road | Nandu     | :w-north |
         When importing

-        Then search_name contains not
+        Then search_name contains

          | object | nameaddress_vector |
          | W1     | nandu |
 
          | object | nameaddress_vector |
          | W1     | nandu |
 


@@ -67,8 +67,8 @@ Feature: Creation of search terms
         And the places
          | osm | class   | type        | name     | geometry |
          | N1  | place   | state       | new york | 80 80 |
         And the places
          | osm | class   | type        | name     | geometry |
          | N1  | place   | state       | new york | 80 80 |

-         | N1  | place   | city        | bonn     | 81 81 |
-         | N1  | place   | suburb      | smalltown| 80 81 |
+         | N2  | place   | city        | bonn     | 81 81 |
+         | N3  | place   | suburb      | smalltown| 80 81 |

         And the named places
          | osm | class   | type    | addr+is_in                | geometry |
          | W1  | highway | service | bonn, New York, Smalltown | :w-north |
         And the named places
          | osm | class   | type    | addr+is_in                | geometry |
          | W1  | highway | service | bonn, New York, Smalltown | :w-north |


@@ -77,3 +77,36 @@ Feature: Creation of search terms
          | object | nameaddress_vector |
          | W1     | bonn, new york, smalltown |
 
          | object | nameaddress_vector |
          | W1     | bonn, new york, smalltown |
 

+    Scenario: a linked place does not show up in search name
+        Given the named places
+         | osm  | class    | type           | admin | geometry |
+         | R13  | boundary | administrative | 9     | poly-area:0.01 |
+        And the named places
+         | osm  | class    | type           | geometry |
+         | N2   | place    | city           | 0.1 0.1 |
+        And the relations
+         | id | members       | tags+type |
+         | 13 | N2:label      | boundary |
+        When importing
+        Then placex contains
+         | object | linked_place_id |
+         | N2     | R13             |
+        And search_name has no entry for N2
+
+    Scenario: a linked waterway does not show up in search name
+        Given the scene split-road
+        And the places
+         | osm | class    | type  | name  | geometry |
+         | W1  | waterway | river | Rhein | :w-2 |
+         | W2  | waterway | river | Rhein | :w-3 |
+         | R13 | waterway | river | Rhein | :w-1 + :w-2 + :w-3 |
+        And the relations
+         | id | members            | tags+type |
+         | 13 | W1,W2:main_stream  | waterway |
+        When importing
+        Then placex contains
+         | object | linked_place_id |
+         | W1     | R13 |
+         | W2     | R13 |
+        And search_name has no entry for W1
+        And search_name has no entry for W2