hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 05:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

use address rank for address forming when available

Browse Source
This commit is contained in:
Sarah Hoffmann
2020-08-09 14:43:23 +02:00
parent fb8bb30144
commit 06aa0f0b76
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/functions/placex_triggers.sql
View File

@@ -861,7 +861,9 @@ BEGIN
END IF; END IF;
SELECT * FROM insert_addresslines(NEW.place_id, NEW.partition, SELECT * FROM insert_addresslines(NEW.place_id, NEW.partition,
NEW.rank_search, NEW.address, CASE WHEN NEW.rank_address = 0
THEN NEW.rank_search ELSE NEW.rank_address END,
NEW.address,
CASE WHEN NEW.rank_search >= 26 CASE WHEN NEW.rank_search >= 26
AND NEW.rank_search < 30 AND NEW.rank_search < 30
THEN NEW.geometry ELSE NEW.centroid END) THEN NEW.geometry ELSE NEW.centroid END)

8
test/bdd/db/import/rank_computation.feature
View File

@@ -91,15 +91,15 @@ Feature: Rank assignment
| R21 | boundary | administrative | 8 | | (0 0, 0 1, 1 1, 1 0, 0 0) | | R21 | boundary | administrative | 8 | | (0 0, 0 1, 1 1, 1 0, 0 0) |
| R22 | boundary | administrative | 8 | suburb | (0 0, 0 1, 1 1, 1 0, 0 0) | | R22 | boundary | administrative | 8 | suburb | (0 0, 0 1, 1 1, 1 0, 0 0) |
When importing When importing
Then place_addressline contains
| object | address | cached_rank_address |
| R21 | R20 | 16 |
| R22 | R20 | 16 |
Then placex contains Then placex contains
| object | rank_search | rank_address | | object | rank_search | rank_address |
| R20 | 12 | 16 | | R20 | 12 | 16 |
| R21 | 16 | 18 | | R21 | 16 | 18 |
| R22 | 16 | 20 | | R22 | 16 | 20 |
Then place_addressline contains
| object | address | cached_rank_address |
| R21 | R20 | 16 |
| R22 | R20 | 16 |
Scenario: Admin levels must not be larger than 25 Scenario: Admin levels must not be larger than 25
Given the named places Given the named places