add parenting tests

diff --git a/test/bdd/db/import/parenting.feature b/test/bdd/db/import/parenting.feature
new file mode 100644 (file)
index 0000000..c00f470
--- /dev/null
+++ b/test/bdd/db/import/parenting.feature
@@ -0,0 +1,439 @@
+@DB
+Feature: Parenting of objects
+    Tests that the correct parent is choosen
+
+    Scenario: Address inherits postcode from its street unless it has a postcode
+        Given the scene roads-with-pois
+        And the places
+         | osm | class | type  | housenr | geometry |
+         | N1  | place | house | 4       | :p-N1 |
+        And the places
+         | osm | class | type  | housenr | postcode | geometry |
+         | N2  | place | house | 5       | 99999    | :p-N1 |
+        And the places
+         | osm | class   | type        | name  | postcode | geometry |
+         | W1  | highway | residential | galoo | 12345    | :w-north |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+         | N2     | W1 |
+        And search_name contains
+         | object | nameaddress_vector |
+         | N1     | 4, galoo, 12345 |
+         | N2     | 5, galoo, 99999 |
+
+    Scenario: Address without tags, closest street
+        Given the scene roads-with-pois
+        And the places
+         | osm | class | type  | geometry |
+         | N1  | place | house | :p-N1 |
+         | N2  | place | house | :p-N2 |
+         | N3  | place | house | :p-S1 |
+         | N4  | place | house | :p-S2 |
+        And the named places
+         | osm | class   | type        | geometry |
+         | W1  | highway | residential | :w-north |
+         | W2  | highway | residential | :w-south |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+         | N2     | W1 |
+         | N3     | W2 |
+         | N4     | W2 |
+
+    Scenario: Address without tags avoids unnamed streets
+        Given the scene roads-with-pois
+        And the places
+         | osm | class   | type  | geometry |
+         | N1  | place   | house | :p-N1 |
+         | N2  | place   | house | :p-N2 |
+         | N3  | place   | house | :p-S1 |
+         | N4  | place   | house | :p-S2 |
+         | W1  | highway | residential | :w-north |
+        And the named places
+         | osm | class   | type        | geometry |
+         | W2  | highway | residential | :w-south |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W2 |
+         | N2     | W2 |
+         | N3     | W2 |
+         | N4     | W2 |
+
+    Scenario: addr:street tag parents to appropriately named street
+        Given the scene roads-with-pois
+        And the places
+         | osm | class | type  | street| geometry |
+         | N1  | place | house | south | :p-N1 |
+         | N2  | place | house | north | :p-N2 |
+         | N3  | place | house | south | :p-S1 |
+         | N4  | place | house | north | :p-S2 |
+        And the places
+         | osm | class   | type        | name  | geometry |
+         | W1  | highway | residential | north | :w-north |
+         | W2  | highway | residential | south | :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
+         | osm | class | type  | street | geometry |
+         | N1  | place | house | abcdef | :p-N1 |
+         | N2  | place | house | abcdef | :p-N2 |
+         | N3  | place | house | abcdef | :p-S1 |
+         | N4  | place | house | abcdef | :p-S2 |
+        And the places
+         | osm | class   | type        | name   | geometry |
+         | W1  | highway | residential | abcdef | :w-north |
+         | W2  | highway | residential | abcdef | :w-south |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+         | N2     | W1 |
+         | N3     | W2 |
+         | N4     | W2 |
+
+    Scenario: addr:street tag without appropriately named street
+        Given the scene roads-with-pois
+        And the places
+         | osm | class | type  | street | geometry |
+         | N1  | place | house | abcdef | :p-N1 |
+         | N2  | place | house | abcdef | :p-N2 |
+         | N3  | place | house | abcdef | :p-S1 |
+         | N4  | place | house | abcdef | :p-S2 |
+        And the places
+         | osm | class   | type        | name  | geometry |
+         | W1  | highway | residential | abcde | :w-north |
+         | W2  | highway | residential | abcde | :w-south |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+         | N2     | W1 |
+         | N3     | W2 |
+         | N4     | W2 |
+
+    Scenario: addr:place address
+        Given the scene road-with-alley
+        And the places
+         | osm | class | type   | addr_place | geometry |
+         | N1  | place | house  | myhamlet   | :n-alley |
+        And the places
+         | osm | class   | type        | name     | geometry |
+         | N2  | place   | hamlet      | myhamlet | :n-main-west |
+         | W1  | highway | residential | myhamlet | :w-main |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | N2 |
+
+    Scenario: addr:street is preferred over addr:place
+        Given the scene road-with-alley
+        And the places
+         | osm | class | type   | addr_place | street  | geometry |
+         | N1  | place | house  | myhamlet   | mystreet| :n-alley |
+        And the places
+         | osm | class   | type        | name     | geometry |
+         | N2  | place   | hamlet      | myhamlet | :n-main-west |
+         | W1  | highway | residential | mystreet | :w-main |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+
+    Scenario: Untagged address in simple associated street relation
+        Given the scene road-with-alley
+        And the places
+         | osm | class | type  | geometry |
+         | N1  | place | house | :n-alley |
+         | N2  | place | house | :n-corner |
+         | N3  | place | house | :n-main-west |
+        And the places
+         | osm | class   | type        | name | geometry |
+         | W1  | highway | residential | foo  | :w-main |
+         | W2  | highway | service     | bar  | :w-alley |
+        And the relations
+         | id | members            | tags+type |
+         | 1  | W1:street,N1,N2,N3 | associatedStreet |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+         | N2     | W1 |
+         | N3     | W1 |
+
+    Scenario: Avoid unnamed streets in simple associated street relation
+        Given the scene road-with-alley
+        And the places
+         | osm | class | type  | geometry |
+         | N1  | place | house | :n-alley |
+         | N2  | place | house | :n-corner |
+         | N3  | place | house | :n-main-west |
+         | W2  | highway | residential | :w-alley |
+        And the named places
+         | osm | class   | type        | geometry |
+         | W1  | highway | residential | :w-main |
+        And the relations
+         | id | members                      | tags+type |
+         | 1  | N1,N2,N3,W2:street,W1:street | associatedStreet |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+         | N2     | W1 |
+         | N3     | W1 |
+
+    Scenario: Associated street relation overrides addr:street
+        Given the scene road-with-alley
+        And the places
+         | osm | class | type  | street | geometry |
+         | N1  | place | house | bar    | :n-alley |
+        And the places
+         | osm | class   | type        | name | geometry |
+         | W1  | highway | residential | foo  | :w-main |
+         | W2  | highway | residential | bar  | :w-alley |
+        And the relations
+         | id | members            | tags+type |
+         | 1  | W1:street,N1,N2,N3 | associatedStreet |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+
+    Scenario: Building without tags, closest street from center point
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class    | type        | geometry |
+         | W1  | building | yes         | :w-building |
+         | W2  | highway  | primary     | :w-WE |
+         | W3  | highway  | residential | :w-NS |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | W1     | W3 |
+
+    Scenario: Building with addr:street tags
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class    | type | street | geometry |
+         | W1  | building | yes  | bar    | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | W1     | W2 |
+
+    Scenario: Building with addr:place tags
+        Given the scene building-on-street-corner
+        And the places
+         | osm | class    | type        | name | geometry |
+         | N1  | place    | village     | bar  | :n-outer |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        And the named places
+         | osm | class    | type | addr_place | geometry |
+         | W1  | building | yes  | bar        | :w-building |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | W1     | N1 |
+
+    Scenario: Building in associated street relation
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class    | type | geometry |
+         | W1  | building | yes  | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        And the relations
+         | id | members            | tags+type |
+         | 1  | W1:house,W2:street | associatedStreet |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | W1     | W2 |
+
+    Scenario: Building in associated street relation overrides addr:street
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class    | type | street | geometry |
+         | W1  | building | yes  | foo    | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        And the relations
+         | id | members            | tags+type |
+         | 1  | W1:house,W2:street | associatedStreet |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | W1     | W2 |
+
+    Scenario: Wrong member in associated street relation is ignored
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class | type  | geometry |
+         | N1  | place | house | :n-outer |
+        And the named places
+         | osm | class    | type | street | geometry |
+         | W1  | building | yes  | foo    | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        And the relations
+         | id | members                      | tags+type |
+         | 1  | N1:house,W1:street,W3:street | associatedStreet |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W3 |
+
+    Scenario: POIs in building inherit address
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class   | type       | geometry |
+         | N1  | amenity | bank       | :n-inner |
+         | N2  | shop    | bakery     | :n-edge-NS |
+         | N3  | shop    | supermarket| :n-edge-WE |
+        And the places
+         | osm | class    | type | street | addr_place | housenr | geometry |
+         | W1  | building | yes  | foo    | nowhere    | 3       | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        When importing
+        Then placex contains
+         | object | parent_place_id | street | addr_place | housenumber |
+         | W1     | W3              | foo    | nowhere    | 3 |
+         | N1     | W3              | foo    | nowhere    | 3 |
+         | N2     | W3              | foo    | nowhere    | 3 |
+         | N3     | W3              | foo    | nowhere    | 3 |
+
+    Scenario: POIs don't inherit from streets
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class   | type       | geometry |
+         | N1  | amenity | bank       | :n-inner |
+        And the places
+         | osm | class    | type | street | addr_place | housenr | geometry |
+         | W1  | highway  | path | foo    | nowhere    | 3       | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W3  | highway  | residential | foo  | :w-NS |
+        When importing
+        Then placex contains
+         | object | parent_place_id | street | addr_place | housenumber |
+         | N1     | W3              | None   | None       | None |
+
+    Scenario: POIs with own address do not inherit building address
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class   | type       | street | geometry |
+         | N1  | amenity | bank       | bar    | :n-inner |
+        And the named places
+         | osm | class   | type       | housenr | geometry |
+         | N2  | shop    | bakery     | 4       | :n-edge-NS |
+        And the named places
+         | osm | class   | type       | addr_place  | geometry |
+         | N3  | shop    | supermarket| nowhere     | :n-edge-WE |
+        And the places
+         | osm | class | type              | name     | geometry |
+         | N4  | place | isolated_dwelling | theplace | :n-outer |
+        And the places
+         | osm | class    | type | addr_place | housenr | geometry |
+         | W1  | building | yes  | theplace   | 3       | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        When importing
+        Then placex contains
+         | object | parent_place_id | street | addr_place | housenumber |
+         | W1     | N4              | None   | theplace   | 3 |
+         | N1     | W2              | bar    | None       | None |
+         | N2     | W3              | None   | None       | 4 |
+         | N3     | W2              | None   | nowhere    | None |
+
+    Scenario: POIs parent a road if they are attached to it
+        Given the scene points-on-roads
+        And the named places
+         | osm | class   | type     | street   | geometry |
+         | N1  | highway | bus_stop | North St | :n-SE |
+         | N2  | highway | bus_stop | South St | :n-NW |
+         | N3  | highway | bus_stop | North St | :n-S-unglued |
+         | N4  | highway | bus_stop | South St | :n-N-unglued |
+        And the places
+         | osm | class   | type         | name     | geometry |
+         | W1  | highway | secondary    | North St | :w-north |
+         | W2  | highway | unclassified | South St | :w-south |
+        And the ways
+         | id | nodes |
+         | 1  | 100,101,2,103,104 |
+         | 2  | 200,201,1,202,203 |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W1 |
+         | N2     | W2 |
+         | N3     | W1 |
+         | N4     | W2 |
+
+    Scenario: POIs do not parent non-roads they are attached to
+        Given the scene points-on-roads
+        And the named places
+         | osm | class   | type     | street   | geometry |
+         | N1  | highway | bus_stop | North St | :n-SE |
+         | N2  | highway | bus_stop | South St | :n-NW |
+        And the places
+         | osm | class   | type         | name     | geometry |
+         | W1  | landuse | residential  | North St | :w-north |
+         | W2  | waterway| river        | South St | :w-south |
+        And the ways
+         | id | nodes |
+         | 1  | 100,101,2,103,104 |
+         | 2  | 200,201,1,202,203 |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | 0 |
+         | N2     | 0 |
+
+    Scenario: POIs on building outlines inherit associated street relation
+        Given the scene building-on-street-corner
+        And the named places
+         | osm | class    | type  | geometry |
+         | N1  | place    | house | :n-edge-NS |
+         | W1  | building | yes   | :w-building |
+        And the places
+         | osm | class    | type        | name | geometry |
+         | W2  | highway  | primary     | bar  | :w-WE |
+         | W3  | highway  | residential | foo  | :w-NS |
+        And the relations
+         | id | members            | tags+type |
+         | 1  | W1:house,W2:street | associatedStreet |
+        And the ways
+         | id | nodes |
+         | 1  | 100,1,101,102,100 |
+        When importing
+        Then placex contains
+         | object | parent_place_id |
+         | N1     | W2 |
+

diff --git a/test/bdd/db/import/search_name.feature b/test/bdd/db/import/search_name.feature
index d66a538c91fe102989c62708081f9c24e87f0d65..98def330c0e2274446094413d78852ecb704f42c 100644 (file)
--- a/test/bdd/db/import/search_name.feature
+++ b/test/bdd/db/import/search_name.feature
@@ -24,7 +24,6 @@ Feature: Creation of search terms
          | object | name_vector | nameaddress_vector |
          | N1     | foo         | the road |
 
-    @wip
     Scenario: Roads take over the postcode from attached houses
         Given the scene roads-with-pois
         And the places

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index 7441e160c50f8ac8c55583e4c0eeabcd7742a1b6..405404d815ecd2b8a46fddb307a4e04d36440160 100644 (file)
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -63,7 +63,8 @@ class PlaceColumn:
         if self.columns['osm_type'] == 'N' and self.geometry is None:
             self.geometry = "ST_SetSRID(ST_Point(%f, %f), 4326)" % (
                             random.random()*360 - 180, random.random()*180 - 90)
-
+        else:
+            assert_is_not_none(self.geometry, "Geometry missing")
         query = 'INSERT INTO place (%s, geometry) values(%s, %s)' % (
                      ','.join(self.columns.keys()),
                      ','.join(['%s' for x in range(len(self.columns))]),
@@ -76,7 +77,7 @@ class NominatimID:
         identifier instead that is of the form <osmtype><osmid>[:<class>].
     """
 
-    id_regex = re.compile(r"(?P<tp>[NRW])(?P<id>\d+)(?P<cls>:\w+)?")
+    id_regex = re.compile(r"(?P<tp>[NRW])(?P<id>\d+)(:(?P<cls>\w+))?")
 
     def __init__(self, oid):
         self.typ = self.oid = self.cls = None
@@ -146,6 +147,55 @@ def add_data_to_place_table(context, named):
     cur.close()
     context.db.commit()
 
+@given("the relations")
+def add_data_to_planet_relations(context):
+    cur = context.db.cursor()
+    for r in context.table:
+        last_node = 0
+        last_way = 0
+        parts = []
+        members = []
+        for m in r['members'].split(','):
+            mid = NominatimID(m)
+            if mid.typ == 'N':
+                parts.insert(last_node, int(mid.oid))
+                members.insert(2 * last_node, mid.cls)
+                members.insert(2 * last_node, 'n' + mid.oid)
+                last_node += 1
+                last_way += 1
+            elif mid.typ == 'W':
+                parts.insert(last_way, int(mid.oid))
+                members.insert(2 * last_way, mid.cls)
+                members.insert(2 * last_way, 'w' + mid.oid)
+                last_way += 1
+            else:
+                parts.append(int(mid.oid))
+                members.extend(('r' + mid.oid, mid.cls))
+
+        tags = []
+        for h in r.headings:
+            if h.startswith("tags+"):
+                tags.extend((h[5:], r[h]))
+
+        cur.execute("""INSERT INTO planet_osm_rels (id, way_off, rel_off, parts, members, tags)
+                       VALUES (%s, %s, %s, %s, %s, %s)""",
+                    (r['id'], last_node, last_way, parts, members, tags))
+    context.db.commit()
+
+@given("the ways")
+def add_data_to_planet_ways(context):
+    cur = context.db.cursor()
+    for r in context.table:
+        tags = []
+        for h in r.headings:
+            if h.startswith("tags+"):
+                tags.extend((h[5:], r[h]))
+
+        nodes = [ int(x.strip()) for x in r['nodes'].split(',') ]
+
+        cur.execute("INSERT INTO planet_osm_ways (id, nodes, tags) VALUES (%s, %s, %s)",
+                    (r['id'], nodes, tags))
+    context.db.commit()
 
 @when("importing")
 def import_and_index_data_from_place_table(context):
@@ -188,6 +238,12 @@ def check_placex_contents(context, exact):
                     eq_(res['name'][name], row[h])
                 elif h.startswith('extratags+'):
                     eq_(res['extratags'][h[10:]], row[h])
+                elif h == 'parent_place_id':
+                    if row[h] == '0':
+                        eq_(0, res[h])
+                    else:
+                        eq_(NominatimID(row[h]).get_place_id(context.db.cursor()),
+                            res[h])
                 else:
                     assert_db_column(res, h, row[h])