X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/caea14d0357a1e0a901dfac82febc834aec95f0f..c5d98effc0f5fcd8d154b0a3ba3fccd374445685:/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 5514e7de..0e922e1d 100644 --- a/test/bdd/db/import/search_name.feature +++ b/test/bdd/db/import/search_name.feature @@ -23,14 +23,47 @@ Feature: Creation of search terms | W1 | highway | residential | Rose Street | :w-north | When importing Then search_name contains - | object | name_vector | nameaddress_vector | - | N1 | #23 | Rose Street, Walltown | + | object | nameaddress_vector | + | N1 | Rose, Street, Walltown | When searching for "23 Rose Street, Walltown" Then results contain - | osm_type | osm_id | - | N | 1 | + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | + When searching for "Walltown, Rose Street 23" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | + When searching for "Rose Street 23, Walltown" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | - Scenario: Unnamed POI has no search entry when it has known addr: tags + Scenario: Searching for unknown addr: tags also works for multiple words + Given the scene roads-with-pois + And the places + | osm | class | type | housenr | addr+city | geometry | + | N1 | place | house | 23 | Little Big Town | :p-N1 | + And the places + | osm | class | type | name+name | geometry | + | W1 | highway | residential | Rose Street | :w-north | + When importing + Then search_name contains + | object | nameaddress_vector | + | N1 | Rose Street, Little, Big, Town | + When searching for "23 Rose Street, Little Big Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | + When searching for "Rose Street 23, Little Big Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | + When searching for "Little big Town, Rose Street 23" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | + + Scenario: Unnamed POI has no search entry when it has known addr: tags Given the scene roads-with-pois And the places | osm | class | type | housenr | addr+city | geometry | @@ -42,8 +75,8 @@ Feature: Creation of search terms Then search_name has no entry for N1 When searching for "23 Rose Street, Walltown" Then results contain - | osm_type | osm_id | - | N | 1 | + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | Scenario: Unnamed POI must have a house number to get a search entry Given the scene roads-with-pois @@ -56,39 +89,119 @@ Feature: Creation of search terms 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 | | N1 | place | house | 23 | Walltown | :p-N1 | And the places - | osm | class | type | name+name | geometry | - | W1 | highway | residential | Rose Street | :w-north | + | osm | class | type | name+name | geometry | + | 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 | - | N1 | #23 | Walltown | - When searching for "23 Rose Street, Walltown" - Then exactly 0 results are returned + | N1 | #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 Walltown, Strange Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Walltown, Strange Town | + When searching for "Walltown 23, Strange Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Walltown, Strange Town | + When searching for "Strange Town, Walltown 23" + Then results contain + | osm_type | osm_id | name | + | N | 1 | 23, Walltown, Strange Town | + + Scenario: Named POIs can be searched by housenumber when unknown addr:place is present + Given the scene roads-with-pois + And the places + | osm | class | type | name | housenr | addr+place | geometry | + | N1 | place | house | Blue house | 23 | Walltown | :p-N1 | + And the places + | osm | class | type | name+name | geometry | + | W1 | highway | residential | Rose Street | :w-north | + | N2 | place | city | Strange Town | :p-N1 | + When importing + Then search_name contains + | object | name_vector | nameaddress_vector | + | N1 | #Walltown, #Blue house | Walltown, Strange, Town | + When searching for "23 Walltown, Strange Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Blue house, 23, Walltown, Strange Town | + When searching for "Walltown 23, Strange Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Blue house, 23, Walltown, Strange Town | + When searching for "Strange Town, Walltown 23" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Blue house, 23, Walltown, Strange Town | + When searching for "Strange Town, Walltown 23, Blue house" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Blue house, 23, Walltown, Strange Town | + When searching for "Strange Town, Walltown, Blue house" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Blue house, 23, Walltown, Strange Town | + + Scenario: Named POIs can be found when unknown multi-word addr:place is present + Given the scene roads-with-pois + And the places + | osm | class | type | name | housenr | addr+place | geometry | + | N1 | place | house | Blue house | 23 | Moon sun | :p-N1 | + And the places + | osm | class | type | name+name | geometry | + | W1 | highway | residential | Rose Street | :w-north | + | N2 | place | city | Strange Town | :p-N1 | + When importing + Then search_name contains + | object | name_vector | nameaddress_vector | + | N1 | #Moon sun, #Blue house | Moon, Sun, Strange, Town | + When searching for "23 Moon Sun, Strange Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Blue house, 23, Moon sun, Strange Town | + When searching for "Blue house, Moon Sun, Strange Town" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Blue house, 23, Moon sun, Strange Town | - # XXX Need to change parenting of POis without addr:street and with addr:place Scenario: Unnamed POIs doesn't inherit parent name when addr:place is present only in parent address Given the scene roads-with-pois And the places | osm | class | type | housenr | addr+place | geometry | | N1 | place | house | 23 | Walltown | :p-N1 | And the places - | osm | class | type | name+name | addr+city | geometry | - | W1 | highway | residential | Rose Street | Walltown | :w-north | + | osm | class | type | name+name | addr+city | geometry | + | W1 | highway | residential | Rose Street | Walltown | :w-north | + | N2 | place | suburb | Strange Town | Walltown | :p-N1 | When importing Then search_name contains | object | name_vector | nameaddress_vector | - | N1 | #23 | Walltown | + | N1 | #Walltown | Strange, Town | When searching for "23 Rose Street, Walltown" Then exactly 1 result is returned And results contain - | osm_type | osm_id | - | W | 1 | + | osm_type | osm_id | name | + | W | 1 | Rose Street, Strange Town | + When searching for "23 Walltown" + Then exactly 1 result is returned + And results contain + | osm_type | osm_id | name | + | N | 1 | 23, Walltown, Strange Town | Scenario: Unnamed POIs does inherit parent name when unknown addr:place and addr:street is present Given the scene roads-with-pois @@ -102,8 +215,8 @@ Feature: Creation of search terms Then search_name has no entry for N1 When searching for "23 Rose Street" Then results contain - | osm_type | osm_id | - | N | 1 | + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | When searching for "23 Lily Street" Then exactly 0 results are returned @@ -119,27 +232,43 @@ Feature: Creation of search terms Then search_name has no entry for N1 When searching for "23 Rose Street" Then results contain - | osm_type | osm_id | - | N | 1 | + | osm_type | osm_id | name | + | N | 1 | 23, Rose Street | When searching for "23 Lily Street" Then exactly 0 results are returned - Scenario: Named POIs have unknown address tags added in the search_name table + Scenario: Named POIs get unknown address tags added in the search_name table Given the scene roads-with-pois And the places - | osm | class | type | name+name | addr+city | geometry | - | N1 | place | house | Green Moss | Walltown | :p-N1 | + | osm | class | type | name+name | housenr | addr+city | geometry | + | N1 | place | house | Green Moss | 26 | Walltown | :p-N1 | And the places | osm | class | type | name+name | geometry | | W1 | highway | residential | Rose Street | :w-north | When importing Then search_name contains | object | name_vector | nameaddress_vector | - | N1 | #Green Moss | Rose Street, Walltown | + | N1 | #Green Moss | Rose, Street, Walltown | When searching for "Green Moss, Rose Street, Walltown" Then results contain - | osm_type | osm_id | - | N | 1 | + | osm_type | osm_id | name | + | N | 1 | Green Moss, 26, Rose Street | + When searching for "Green Moss, 26, Rose Street, Walltown" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Green Moss, 26, Rose Street | + When searching for "26, Rose Street, Walltown" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Green Moss, 26, Rose Street | + When searching for "Rose Street 26, Walltown" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Green Moss, 26, Rose Street | + When searching for "Walltown, Rose Street 26" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Green Moss, 26, Rose Street | Scenario: Named POI doesn't inherit parent name when addr:place is present only in parent address Given the scene roads-with-pois @@ -147,17 +276,19 @@ Feature: Creation of search terms | osm | class | type | name+name | addr+place | geometry | | N1 | place | house | Green Moss | Walltown | :p-N1 | And the places - | osm | class | type | name+name | geometry | - | W1 | highway | residential | Rose Street | :w-north | + | osm | class | type | name+name | geometry | + | W1 | highway | residential | Rose Street | :w-north | + | N2 | place | suburb | Strange Town | :p-N1 | When importing Then search_name contains | object | name_vector | nameaddress_vector | | N1 | #Green Moss | Walltown | When searching for "Green Moss, Rose Street, Walltown" - Then exactly 1 result is returned - And results contain - | osm_type | osm_id | - | W | 1 | + Then exactly 0 result is returned + When searching for "Green Moss, Walltown" + Then results contain + | osm_type | osm_id | name | + | N | 1 | Green Moss, Walltown, Strange Town | Scenario: Named POIs inherit address from parent Given the scene roads-with-pois @@ -170,20 +301,19 @@ Feature: Creation of search terms | 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 | - | N1 | place | state | new york | 80 80 | | 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 | - | W1 | bonn, new york, smalltown | + | W1 | bonn, new, york, smalltown | Scenario: A known addr:* tag is added even if the name is unknown Given the scene roads-with-pois @@ -208,21 +338,6 @@ Feature: Creation of search terms | object | nameaddress_vector | | W1 | 12345 | - Scenario: is_in is split and added to the address search terms - 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 - | osm | class | type | addr+is_in | geometry | - | W1 | highway | service | bonn, New York, Smalltown | :w-north | - When importing - Then search_name contains - | 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 |