Merge pull request #2588 from lonvia/housenumber-sanitizer

[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 9d8286c2a0896bf2cd11c5bb3290f156971cc087..ef25b6cc0acd6b9c4c9501109e697f1fcf158d20 100644 (file)
--- a/test/bdd/db/import/parenting.feature
+++ b/test/bdd/db/import/parenting.feature
@@ -18,13 +18,13 @@ Feature: Parenting of objects
          | object | parent_place_id |
          | N1     | W1 |
          | N2     | W1 |
          | object | parent_place_id |
          | N1     | W1 |
          | N2     | W1 |

-        When searching for "4 galoo"
+        When sending search query "4 galoo"

         Then results contain
         Then results contain

-         | ID | osm_type | osm_id | langaddress |
+         | ID | osm_type | osm_id | display_name |

          | 0  | N        | 1      | 4, galoo, 12345 |
          | 0  | N        | 1      | 4, galoo, 12345 |

-        When searching for "5 galoo"
+        When sending search query "5 galoo"

         Then results contain
         Then results contain

-         | ID | osm_type | osm_id | langaddress |
+         | ID | osm_type | osm_id | display_name |

          | 0  | N        | 2      | 5, galoo, 99999 |
 
     Scenario: Address without tags, closest street
          | 0  | N        | 2      | 5, galoo, 99999 |
 
     Scenario: Address without tags, closest street


@@ -87,6 +87,52 @@ Feature: Parenting of objects
          | N3     | W2 |
          | N4     | W1 |
 
          | N3     | W2 |
          | N4     | W1 |
 

+    @fail-legacy
+    Scenario: addr:street tag parents to appropriately named street, locale names
+        Given the scene roads-with-pois
+        And the places
+         | osm | class | type  | street| addr+street:de | geometry |
+         | N1  | place | house | south | Süd               | :p-N1 |
+         | N2  | place | house | north | Nord              | :p-N2 |
+         | N3  | place | house | south | Süd               | :p-S1 |
+         | N4  | place | house | north | Nord              | :p-S2 |
+        And the places
+         | osm | class   | type        | name  | geometry |
+         | W1  | highway | residential | Nord | :w-north |
+         | W2  | highway | residential | Süd | :w-south |
+        And the places
+         | osm | class | type   | name  | name+name:old |
+         | N5  | place | hamlet | south | north         |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W2 |
+         | N2     | W1 |
+         | N3     | W2 |
+         | N4     | W1 |
+
+    Scenario: addr:street tag parents to appropriately named street with abbreviation
+        Given the scene roads-with-pois
+        And the places
+         | osm | class | type  | street| geometry |
+         | N1  | place | house | south st | :p-N1 |
+         | N2  | place | house | north st | :p-N2 |
+         | N3  | place | house | south st | :p-S1 |
+         | N4  | place | house | north st | :p-S2 |
+        And the places
+         | osm | class   | type        | name+name:en  | geometry |
+         | W1  | highway | residential | north street | :w-north |
+         | W2  | highway | residential | south street | :w-south |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W2 |
+         | N2     | W1 |
+         | N3     | W2 |
+         | N4     | W1 |
+
+
+

     Scenario: addr:street tag parents to next named street
         Given the scene roads-with-pois
         And the places
     Scenario: addr:street tag parents to next named street
         Given the scene roads-with-pois
         And the places


@@ -374,7 +420,7 @@ Feature: Parenting of objects
          | W1     | N4              | 3 |
          | N1     | W2              | None |
          | N2     | W3              | 4 |
          | W1     | N4              | 3 |
          | N1     | W2              | None |
          | N2     | W3              | 4 |

-         | N3     | W2              | None |
+         | N3     | N4              | None |

 
     Scenario: POIs parent a road if they are attached to it
         Given the scene points-on-roads
 
     Scenario: POIs parent a road if they are attached to it
         Given the scene points-on-roads


@@ -460,3 +506,23 @@ Feature: Parenting of objects
         Then placex contains
           | object | parent_place_id |
           | N10    | W1 |
         Then placex contains
           | object | parent_place_id |
           | N10    | W1 |

+
+     Scenario: place=square may be parented via addr:place
+        Given the grid
+            |   |   | 9 |   |   |
+            |   | 5 |   | 6 |   |
+            |   | 8 |   | 7 |   |
+        And the places
+            | osm | class    | type    | name+name | geometry        |
+            | W2  | place    | square  | Foo pl    | (5, 6, 7, 8, 5) |
+        And the places
+            | osm | class    | type    | name+name | housenr | addr_place | geometry |
+            | N10 | shop     | grocery | le shop   | 5       | Foo pl     | 9        |
+        When importing
+        Then placex contains
+            | object | rank_address |
+            | W2     | 25           |
+        Then placex contains
+            | object | parent_place_id |
+            | N10    | W2              |
+