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 a36485390e8e3c18188aa8461caf9183a86b24c7..62d65cef571d9bb0eafad56ae8ab70225401605a 100644 (file)
--- a/test/bdd/db/import/parenting.feature
+++ b/test/bdd/db/import/parenting.feature
@@ -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


@@ -374,7 +374,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 +460,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              |
+