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

linked centroids must always be within geometry

Browse Source 
When using a linked place as centroid for a boundary, check
first that it is really within the area. If it is outside,
just keep the computed centroid because a centroid outside the
area just causes havok.

Fixes #1352.
This commit is contained in:
Sarah Hoffmann
2020-03-04 09:59:57 +01:00
parent a00ea23847
commit 6d431aebb7
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/bdd/db/import/linking.feature
View File

@@ -198,3 +198,21 @@ Feature: Linking of places
| ID | osm_type | osm_id |
| 0 | N | 2 |
# github #1352
Scenario: Do not use linked centroid when it is outside the area
Given the named places
| osm | class | type | admin | geometry |
| R13 | boundary | administrative | 4 | poly-area:0.01 |
And the named places
| osm | class | type | geometry |
| N2 | place | city | 0.1 0.1 |
And the relations
| id | members | tags+type |
| 13 | N2:label | boundary |
When importing
Then placex contains
| object | linked_place_id |
| N2 | R13 |
And placex contains
| object | centroid |
| R13 | in geometry |

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

@@ -197,10 +197,18 @@ def assert_db_column(row, column, value, context):
return
if column.startswith('centroid'):
fac = float(column[9:]) if column.startswith('centroid*') else 1.0
x, y = value.split(' ')
assert_almost_equal(float(x) * fac, row['cx'], "Bad x coordinate")
assert_almost_equal(float(y) * fac, row['cy'], "Bad y coordinate")
if value == 'in geometry':
query = """SELECT ST_Within(ST_SetSRID(ST_Point({}, {}), 4326),
ST_SetSRID('{}'::geometry, 4326))""".format(
row['cx'], row['cy'], row['geomtxt'])
cur = context.db.cursor()
cur.execute(query)
eq_(cur.fetchone()[0], True, "(Row %s failed: %s)" % (column, query))
else:
fac = float(column[9:]) if column.startswith('centroid*') else 1.0
x, y = value.split(' ')
assert_almost_equal(float(x) * fac, row['cx'], msg="Bad x coordinate")
assert_almost_equal(float(y) * fac, row['cy'], msg="Bad y coordinate")
elif column == 'geometry':
geom = context.osm.parse_geometry(value, context.scene)
cur = context.db.cursor()