POIs with unknown addr:place must add parent name to address

[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 a0a53911f86d221579f1a2cf6ec515ddef5c4296..fe339f13e8141814f9721930c691c62c0e089877 100644 (file)
--- a/test/bdd/db/import/search_name.feature
+++ b/test/bdd/db/import/search_name.feature
@@ -56,7 +56,7 @@ Feature: Creation of search terms
         When importing
         Then search_name has no entry for N1
 
         When importing
         Then search_name has no entry for N1
 

-    Scenario: Unnamed POIs doesn't inherit parent name when unknown addr:place is present
+    Scenario: Unnamed POIs inherit parent name when unknown addr:place is present

         Given the scene roads-with-pois
         And the places
          | osm | class   | type        | housenr | addr+place | geometry |
         Given the scene roads-with-pois
         And the places
          | osm | class   | type        | housenr | addr+place | geometry |


@@ -66,15 +66,18 @@ Feature: Creation of search terms
          | W1  | highway | residential | Rose Street  | :w-north |
          | N2  | place   | city        | Strange Town | :p-N1 |
         When importing
          | W1  | highway | residential | Rose Street  | :w-north |
          | N2  | place   | city        | Strange Town | :p-N1 |
         When importing

+        Then placex contains
+         | object | parent_place_id |
+         | N1     | N2              |

         Then search_name contains
          | object | name_vector | nameaddress_vector |
         Then search_name contains
          | object | name_vector | nameaddress_vector |

-         | N1     | #23         | Walltown |
+         | N1     | #23         | Walltown, Strange, Town |

         When searching for "23 Rose Street"
         Then exactly 1 results are returned
         And results contain
          | osm_type | osm_id | name |
          | W        | 1      | Rose Street, Strange Town |
         When searching for "23 Rose Street"
         Then exactly 1 results are returned
         And results contain
          | osm_type | osm_id | name |
          | W        | 1      | Rose Street, Strange Town |

-        When searching for "23 Walltown"
+        When searching for "23 Walltown, Strange Town"

         Then results contain
          | osm_type | osm_id | name |
          | N        | 1      | 23, Walltown, Strange Town |
         Then results contain
          | osm_type | osm_id | name |
          | N        | 1      | 23, Walltown, Strange Town |


@@ -185,16 +188,15 @@ Feature: Creation of search terms
          | object | name_vector | nameaddress_vector |
          | N1     | foo         | the road |
 
          | object | name_vector | nameaddress_vector |
          | N1     | foo         | the road |
 

-    Scenario: Some addr: tags are added to address when the name exists
+    Scenario: Some addr: tags are added to address

         Given the scene roads-with-pois
         And the places
          | osm | class   | type        | name     | geometry |
         Given the scene roads-with-pois
         And the places
          | osm | class   | type        | name     | geometry |

-         | N1  | place   | state       | new york | 80 80 |

          | N2  | place   | city        | bonn     | 81 81 |
          | N3  | place   | suburb      | smalltown| 80 81 |
         And the named places
          | 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 |
+         | osm | class   | type    | addr+city | addr+municipality | addr+suburb | geometry |
+         | W1  | highway | service | bonn      | New York          | Smalltown   | :w-north |

         When importing
         Then search_name contains
          | object | nameaddress_vector |
         When importing
         Then search_name contains
          | object | nameaddress_vector |