hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests for linking

Browse Source
This commit is contained in:
Sarah Hoffmann
2016-11-26 23:04:31 +01:00
parent e36e485698
commit 82a0e23265
2 changed files with 130 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/bdd/steps/db_ops.py
View File

@@ -154,23 +154,23 @@ def add_data_to_planet_relations(context):
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))
if r['members']:
members = []
for m in r['members'].split(','):
mid = NominatimID(m)
if mid.typ == 'N':
parts.insert(last_node, int(mid.oid))
last_node += 1
last_way += 1
elif mid.typ == 'W':
parts.insert(last_way, int(mid.oid))
last_way += 1
else:
parts.append(int(mid.oid))
members.extend((mid.typ.lower() + mid.oid, mid.cls or ''))
else:
members = None
tags = []
for h in r.headings:
@@ -238,9 +238,11 @@ 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':
elif h in ('linked_place_id', 'parent_place_id'):
if row[h] == '0':
eq_(0, res[h])
elif row[h] == '-':
assert_is_none(res[h])
else:
eq_(NominatimID(row[h]).get_place_id(context.db.cursor()),
res[h])