hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-14 10:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2799 from lonvia/fix-inclusions-with-extratags

Browse Source 
Ignore irrelevant extra tags on address interpolations
This commit is contained in:
Sarah Hoffmann
2022-08-13 19:02:27 +02:00
committed by GitHub
parent 07d72f950b dddfa3a075
commit bcfe817212
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-sql/functions/interpolation.sql
View File

@@ -15,7 +15,7 @@ DECLARE
location RECORD;
waynodes BIGINT[];
BEGIN
IF akeys(in_address) != ARRAY['interpolation'] THEN
IF in_address ? 'street' or in_address ? 'place' THEN
RETURN in_address;
END IF;

30
test/bdd/db/import/interpolation.feature
View File

@@ -403,3 +403,33 @@ Feature: Import of address interpolations
Then results contain
| ID | osm_type | osm_id | type | display_name |
| 0 | node | 1 | house | 0 |
Scenario: Parenting of interpolation with additional tags
Given the grid
| 1 | | | | | |
| | | | | | |
| | 8 | | | 9 | |
| | | | | | |
| 2 | | | | | 3 |
Given the places
| osm | class | type | housenr | addr+street |
| N8 | place | house | 10 | Horiz St |
| N9 | place | house | 16 | Horiz St |
And the places
| osm | class | type | name | geometry |
| W1 | highway | residential | Vert St | 1,2 |
| W2 | highway | residential | Horiz St | 2,3 |
And the places
| osm | class | type | addr+interpolation | addr+inclusion | geometry |
| W10 | place | houses | even | actual | 8,9 |
And the ways
| id | nodes |
| 10 | 8,9 |
When importing
Then placex contains
| object | parent_place_id |
| N8 | W2 |
| N9 | W2 |
And W10 expands to interpolation
| start | end | parent_place_id |
| 12 | 14 | W2 |

2
test/bdd/steps/steps_db_ops.py
View File

@@ -370,6 +370,6 @@ def check_location_property_osmline(context, oid, neg):
DBRow(oid, res, context).assert_row(row, ('start', 'end'))
assert not todo
assert not todo, f"Unmatched lines in table: {list(context.table[i] for i in todo)}"