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

ignore places without housenumber in interpolations

Browse Source 
fixes trac ticket 5311
This commit is contained in:
Sarah Hoffmann
2015-04-18 17:47:49 +02:00
parent a5a0e1dd0b
commit b82c8ceab9
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/functions.sql
View File

@@ -689,7 +689,7 @@ BEGIN
-- one with the smallest id because the original node was created first. -- one with the smallest id because the original node was created first.
-- Ignore all nodes marked for deletion. (Might happen when the type changes.) -- Ignore all nodes marked for deletion. (Might happen when the type changes.)
select * from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT select * from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT
and indexed_status < 100 and indexed_status < 100 and housenumber is not NULL
order by (type = 'address'),place_id limit 1 INTO nextnode; order by (type = 'address'),place_id limit 1 INTO nextnode;
IF nextnode.place_id IS NOT NULL THEN IF nextnode.place_id IS NOT NULL THEN

17
tests/features/db/import/interpolation.feature
View File

@@ -422,3 +422,20 @@ Feature: Import of address interpolations
| 4 | 144.963016723312,-37.7629464422819+-0.000005 | 4 | 144.963016723312,-37.7629464422819+-0.000005
| 8 | 144.9631440856,-37.762223694978+-0.000005 | 8 | 144.9631440856,-37.762223694978+-0.000005
Scenario: Place with missing address information
Given the place nodes
| osm_id | class | type | housenumber | geometry
| 1 | place | house | 23 | 0.0001 0.0001
| 2 | amenity | school | | 0.0001 0.0002
| 3 | place | house | 29 | 0.0001 0.0004
And the place ways
| osm_id | class | type | housenumber | geometry
| 1 | place | houses | odd | 0.0001 0.0001,0.0001 0.0002,0.0001 0.0004
And the ways
| id | nodes
| 1 | 1,2,3
When importing
Then way 1 expands to housenumbers
| housenumber | centroid
| 25 | 0.0001,0.0002
| 27 | 0.0001,0.0003

3
tests/steps/db_setup.py
View File

@@ -95,6 +95,9 @@ def _format_placex_cols(cols, geomtype, force_name):
else: else:
coords = "'%s'::geometry" % coords.wkt coords = "'%s'::geometry" % coords.wkt
cols['geometry'] = coords cols['geometry'] = coords
for k in cols:
if not cols[k]:
cols[k] = None
def _insert_place_table_nodes(places, force_name): def _insert_place_table_nodes(places, force_name):