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

Merge pull request #2447 from lonvia/fix-dynamic-address-assignment

Browse Source 
Fix dynamic assignment of address parts
This commit is contained in:
Sarah Hoffmann
2021-09-19 15:57:28 +02:00
committed by GitHub
parent 2b2109c89a c335025167
commit e9d54f752c
3 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-tests.yml vendored
View File

@@ -185,7 +185,7 @@ jobs:
- name: Prepare container (CentOS)
run: |
dnf update -y
dnf install -y sudo
dnf install -y sudo glibc-langpack-en
shell: bash
if: matrix.flavour == 'centos'

12
lib-sql/functions/address_lookup.sql
View File

@@ -223,11 +223,13 @@ BEGIN
OR placex.country_code = place.country_code)
ORDER BY rank_address desc,
(place_addressline.place_id = in_place_id) desc,
(fromarea and place.centroid is not null and not isaddress
and (place.address is null or avals(name) && avals(place.address))
and ST_Contains(geometry, place.centroid)) desc,
isaddress desc, fromarea desc,
distance asc, rank_search desc
(CASE WHEN coalesce((avals(name) && avals(place.address)), False) THEN 2
WHEN isaddress THEN 0
WHEN fromarea
and place.centroid is not null
and ST_Contains(geometry, place.centroid) THEN 1
ELSE -1 END) desc,
fromarea desc, distance asc, rank_search desc
LOOP
-- RAISE WARNING '%',location;
location_isaddress := location.rank_address != current_rank_address;

73
test/bdd/db/import/addressing.feature
View File

@@ -433,3 +433,76 @@ Feature: Address computation
Then results contain
| osm | display_name |
| N2 | Leftside, Wonderway, Right |
Scenario: POIs can correct address parts on the fly (with partial unmatching address)
Given the grid
| 1 | | | | 2 | | 5 |
| | | | 9 | | 8 | |
| | 10| 11| | | 12| |
| 4 | | | | 3 | | 6 |
And the places
| osm | class | type | admin | name | geometry |
| R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) |
| R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) |
And the places
| osm | class | type | name | geometry |
| W1 | highway | primary | Wonderway | 10,11,12 |
And the places
| osm | class | type | name | addr+suburb | geometry |
| N1 | amenity | cafe | Bolder | Boring | 9 |
| N2 | amenity | cafe | Leftside | Boring | 8 |
When importing
Then place_addressline contains
| object | address | isaddress |
| W1 | R1 | True |
| W1 | R2 | False |
And place_addressline doesn't contain
| object | address |
| N1 | R1 |
| N2 | R2 |
When sending search query "Bolder"
Then results contain
| osm | display_name |
| N1 | Bolder, Wonderway, Left |
When sending search query "Leftside"
Then results contain
| osm | display_name |
| N2 | Leftside, Wonderway, Right |
Scenario: POIs can correct address parts on the fly (with partial matching address)
Given the grid
| 1 | | | | 2 | | 5 |
| | | | 9 | | 8 | |
| | 10| 11| | | 12| |
| 4 | | | | 3 | | 6 |
And the places
| osm | class | type | admin | name | geometry |
| R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) |
| R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) |
And the places
| osm | class | type | name | geometry |
| W1 | highway | primary | Wonderway | 10,11,12 |
And the places
| osm | class | type | name | addr+state | geometry |
| N1 | amenity | cafe | Bolder | Left | 9 |
| N2 | amenity | cafe | Leftside | Left | 8 |
When importing
Then place_addressline contains
| object | address | isaddress |
| W1 | R1 | True |
| W1 | R2 | False |
And place_addressline doesn't contain
| object | address |
| N1 | R1 |
| N2 | R2 |
When sending search query "Bolder"
Then results contain
| osm | display_name |
| N1 | Bolder, Wonderway, Left |
When sending search query "Leftside"
Then results contain
| osm | display_name |
| N2 | Leftside, Wonderway, Left |