hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: update for osm2gsql changes

Browse Source 
Also fixes a missing type set for query.php tests.
This commit is contained in:
Sarah Hoffmann
2016-03-25 11:18:27 +01:00
parent 92bedbb881
commit 8534ce5ec2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/steps/db_setup.py
View File

@@ -184,9 +184,9 @@ def import_fill_planet_osm_rels(step):
if not members: if not members:
members = None members = None
cur.execute("""INSERT INTO planet_osm_rels cur.execute("""INSERT INTO planet_osm_rels
(id, way_off, rel_off, parts, members, tags, pending) (id, way_off, rel_off, parts, members, tags)
VALUES (%s, %s, %s, %s, %s, %s, false)""", VALUES (%s, %s, %s, %s, %s, %s)""",
(line['id'], len(parts['n']), len(parts['n']) + len(parts['w']), (line['id'], len(parts['n']), len(parts['n']) + len(parts['w']),
parts['n'] + parts['w'] + parts['r'], members, tags)) parts['n'] + parts['w'] + parts['r'], members, tags))
world.conn.commit() world.conn.commit()
@@ -202,9 +202,8 @@ def import_fill_planet_osm_ways(step):
tags = None tags = None
nodes = [int(x.strip()) for x in line['nodes'].split(',')] nodes = [int(x.strip()) for x in line['nodes'].split(',')]
cur.execute("""INSERT INTO planet_osm_ways cur.execute("""INSERT INTO planet_osm_ways (id, nodes, tags)
(id, nodes, tags, pending) VALUES (%s, %s, %s)""",
VALUES (%s, %s, %s, false)""",
(line['id'], nodes, tags)) (line['id'], nodes, tags))
world.conn.commit() world.conn.commit()
@@ -271,6 +270,7 @@ def query_cmd(step, query, with_dups):
(outp, err) = proc.communicate() (outp, err) = proc.communicate()
assert (proc.returncode == 0), "query.php failed with message: %s" % err assert (proc.returncode == 0), "query.php failed with message: %s" % err
world.page = outp world.page = outp
world.response_format = 'json' world.response_format = 'json'
world.request_type = 'search'
world.returncode = 200 world.returncode = 200