params = [self.typ, self. oid]
if self.cls is not None:
- where += ' class = %s'
+ where += ' and class = %s'
params.append(self.cls)
return where, params
return
if column.startswith('centroid'):
- fac = float(column[9:]) if h.startswith('centroid*') else 1.0
+ fac = float(column[9:]) if column.startswith('centroid*') else 1.0
x, y = value.split(' ')
- assert_almost_equal(float(x) * fac, row['cx'])
- assert_almost_equal(float(y) * fac, row['cy'])
+ assert_almost_equal(float(x) * fac, row['cx'], "Bad x coordinate")
+ assert_almost_equal(float(y) * fac, row['cy'], "Bad y coordinate")
elif column == 'geometry':
geom = context.osm.parse_geometry(value, context.scene)
cur = context.db.cursor()
- cur.execute("SELECT ST_MaxDistance(%s, ST_SetSRID(%%s::geometry, 4326))" % geom,
- (row['geomtxt'],))
- assert_less(cur.fetchone()[0], 0.005)
+ query = "SELECT ST_Equals(ST_SnapToGrid(%s, 0.00001, 0.00001), ST_SnapToGrid(ST_SetSRID('%s'::geometry, 4326), 0.00001, 0.00001))" % (
+ geom, row['geomtxt'],)
+ cur.execute(query)
+ eq_(cur.fetchone()[0], True, "(Row %s failed: %s)" % (column, query))
+ elif value == '-':
+ assert_is_none(row[column], "Row %s" % column)
else:
eq_(value, str(row[column]),
"Row '%s': expected: %s, got: %s"
context.db.commit()
context.nominatim.run_setup_script('index', 'index-noanalyse')
+@when("updating places")
+def update_place_table(context):
+ context.nominatim.run_setup_script(
+ 'create-functions', 'create-partition-functions', 'enable-diff-updates')
+ cur = context.db.cursor()
+ for r in context.table:
+ col = PlaceColumn(context, False)
+
+ for h in r.headings:
+ col.add(h, r[h])
+ col.db_insert(cur)
+
+ context.db.commit()
+ context.nominatim.run_update_script('index')
+
+@when("marking for delete (?P<oids>.*)")
+def delete_places(context, oids):
+ context.nominatim.run_setup_script(
+ 'create-functions', 'create-partition-functions', 'enable-diff-updates')
+ cur = context.db.cursor()
+ for oid in oids.split(','):
+ where, params = NominatimID(oid).table_select()
+ cur.execute("DELETE FROM place WHERE " + where, params)
+ context.db.commit()
+ context.nominatim.run_update_script('index')
@then("placex contains(?P<exact> exactly)?")
def check_placex_contents(context, exact):
ST_X(centroid) as cx, ST_Y(centroid) as cy
FROM placex where %s""" % where,
params)
+ assert_less(0, cur.rowcount, "No rows found for " + row['object'])
for res in cur:
if exact:
context.db.commit()
+@then("place contains(?P<exact> exactly)?")
+def check_placex_contents(context, exact):
+ cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
+
+ expected_content = set()
+ for row in context.table:
+ nid = NominatimID(row['object'])
+ where, params = nid.table_select()
+ cur.execute("""SELECT *, ST_AsText(geometry) as geomtxt,
+ ST_GeometryType(geometry) as geometrytype
+ FROM place where %s""" % where,
+ params)
+ assert_less(0, cur.rowcount, "No rows found for " + row['object'])
+
+ for res in cur:
+ if exact:
+ expected_content.add((res['osm_type'], res['osm_id'], res['class']))
+ for h in row.headings:
+ msg = "%s: %s" % (row['object'], h)
+ if h in ('name', 'extratags'):
+ if row[h] == '-':
+ assert_is_none(res[h], msg)
+ else:
+ vdict = eval('{' + row[h] + '}')
+ assert_equals(vdict, res[h], msg)
+ elif h.startswith('name+'):
+ assert_equals(res['name'][h[5:]], row[h], msg)
+ elif h.startswith('extratags+'):
+ assert_equals(res['extratags'][h[10:]], row[h], msg)
+ elif h in ('linked_place_id', 'parent_place_id'):
+ if row[h] == '0':
+ assert_equals(0, res[h], msg)
+ elif row[h] == '-':
+ assert_is_none(res[h], msg)
+ else:
+ assert_equals(NominatimID(row[h]).get_place_id(context.db.cursor()),
+ res[h], msg)
+ else:
+ assert_db_column(res, h, row[h], context)
+
+ if exact:
+ cur.execute('SELECT osm_type, osm_id, class from place')
+ eq_(expected_content, set([(r[0], r[1], r[2]) for r in cur]))
+
+ context.db.commit()
+
@then("search_name contains")
def check_search_name_contents(context):
cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
pid = NominatimID(row['object']).get_place_id(cur)
cur.execute("""SELECT *, ST_X(centroid) as cx, ST_Y(centroid) as cy
FROM search_name WHERE place_id = %s""", (pid, ))
+ assert_less(0, cur.rowcount, "No rows found for " + row['object'])
for res in cur:
for h in row.headings:
context.db.commit()
-@then("(?P<oid>\w+) expands to interpolation")
-def check_location_property_osmline(context, oid):
+@then("(?P<oid>\w+) expands to(?P<neg> no)? interpolation")
+def check_location_property_osmline(context, oid, neg):
cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
nid = NominatimID(oid)
FROM location_property_osmline WHERE osm_id = %s""",
(nid.oid, ))
- todo = list(range(len([context.table])))
+ if neg:
+ eq_(0, cur.rowcount)
+ return
+
+ todo = list(range(len(list(context.table))))
for res in cur:
for i in todo:
row = context.table[i]
todo.remove(i)
break
else:
- assert(False, "Unexpected row %s" % (str(res)))
+ assert False, "Unexpected row %s" % (str(res))
for h in row.headings:
if h in ('start', 'end'):
eq_(todo, [])
-@then("placex has no entry for (?P<oid>.*)")
-def check_placex_has_entry(context, oid):
+@then("(?P<table>placex|place) has no entry for (?P<oid>.*)")
+def check_placex_has_entry(context, table, oid):
cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
nid = NominatimID(oid)
where, params = nid.table_select()
- cur.execute("SELECT * FROM placex where %s" % where, params)
+ cur.execute("SELECT * FROM %s where %s" % (table, where), params)
eq_(0, cur.rowcount)
context.db.commit()
projects / nominatim.git / blobdiff