From 06aa0f0b763aa3f263652a91031a2309d8942b3f Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 9 Aug 2020 14:43:23 +0200 Subject: [PATCH 1/1] use address rank for address forming when available --- sql/functions/placex_triggers.sql | 4 +++- test/bdd/db/import/rank_computation.feature | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index e1790248..f9d5b60f 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -861,7 +861,9 @@ BEGIN END IF; 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 AND NEW.rank_search < 30 THEN NEW.geometry ELSE NEW.centroid END) diff --git a/test/bdd/db/import/rank_computation.feature b/test/bdd/db/import/rank_computation.feature index 18590520..38d15e96 100644 --- a/test/bdd/db/import/rank_computation.feature +++ b/test/bdd/db/import/rank_computation.feature @@ -91,15 +91,15 @@ Feature: Rank assignment | 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) | When importing - Then place_addressline contains - | object | address | cached_rank_address | - | R21 | R20 | 16 | - | R22 | R20 | 16 | Then placex contains | object | rank_search | rank_address | | R20 | 12 | 16 | | R21 | 16 | 18 | | 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 Given the named places -- 2.39.5