Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/import/parenting.feature b/test/bdd/db/import/parenting.feature
index 401a58f14676dd08425bb6395c8b4ae42b6fa582..9d8286c2a0896bf2cd11c5bb3290f156971cc087 100644 (file)
--- a/test/bdd/db/import/parenting.feature
+++ b/test/bdd/db/import/parenting.feature
@@ -20,12 +20,12 @@ Feature: Parenting of objects
          | N2     | W1 |
         When searching for "4 galoo"
         Then results contain
          | N2     | W1 |
         When searching for "4 galoo"
         Then results contain

-         | ID | osm_type | osm_id | langaddress
-         | 0  | N        | 1      | 4, galoo, 12345
+         | ID | osm_type | osm_id | langaddress |
+         | 0  | N        | 1      | 4, galoo, 12345 |

         When searching for "5 galoo"
         Then results contain
         When searching for "5 galoo"
         Then results contain

-         | ID | osm_type | osm_id | langaddress
-         | 0  | N        | 2      | 5, galoo, 99999
+         | ID | osm_type | osm_id | langaddress |
+         | 0  | N        | 2      | 5, galoo, 99999 |

 
     Scenario: Address without tags, closest street
         Given the scene roads-with-pois
 
     Scenario: Address without tags, closest street
         Given the scene roads-with-pois


@@ -224,7 +224,7 @@ Feature: Parenting of objects
         When importing
         Then placex contains
          | object | parent_place_id |
         When importing
         Then placex contains
          | object | parent_place_id |

-         | W1     | W3 |
+         | W1     | W2 |

 
     Scenario: Building with addr:street tags
         Given the scene building-on-street-corner
 
     Scenario: Building with addr:street tags
         Given the scene building-on-street-corner


@@ -441,3 +441,22 @@ Feature: Parenting of objects
          | object | parent_place_id |
          | N1     | W2 |
 
          | object | parent_place_id |
          | N1     | W2 |
 

+    # github #1056
+    Scenario: Full names should be preferably matched for nearest road
+        Given the grid
+            | 1 |   | 2 | 5 |
+            |   |   |   |   |
+            | 3 |   |   | 4 |
+            |   | 10|   |   |
+        And the places
+            | osm | class   | type    | name+name               | geometry |
+            | W1  | highway | residential | Via Cavassico superiore | 1, 2 |
+            | W3  | highway | residential | Via Cavassico superiore | 2, 5 |
+            | W2  | highway | primary | Via Frazione Cavassico  | 3, 4     |
+        And the named places
+            | osm | class   | type    | addr+street             |
+            | N10 | shop    | yes     | Via Cavassico superiore |
+        When importing
+        Then placex contains
+          | object | parent_place_id |
+          | N10    | W1 |