From 15cf7dd41628e88bac30a39f6b2f0dd03f7f5312 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 5 Jun 2022 21:39:17 +0200 Subject: [PATCH] add testcase for #2551 This test proves that places that are linked need to be reindexed. --- lib-sql/functions/placex_triggers.sql | 4 +++- test/bdd/db/update/linked_places.feature | 26 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql index 37b57b64..50467cf5 100644 --- a/lib-sql/functions/placex_triggers.sql +++ b/lib-sql/functions/placex_triggers.sql @@ -1036,7 +1036,9 @@ BEGIN || coalesce(NEW.extratags, ''::hstore); -- mark the linked place (excludes from search results) - UPDATE placex set linked_place_id = NEW.place_id + -- Force reindexing to remove any traces from the search indexes and + -- reset the address rank if necessary. + UPDATE placex set linked_place_id = NEW.place_id, indexed_status = 2 WHERE place_id = location.place_id; -- ensure that those places are not found anymore {% if 'search_name' in db.tables %} diff --git a/test/bdd/db/update/linked_places.feature b/test/bdd/db/update/linked_places.feature index 3dedc468..8bc9585f 100644 --- a/test/bdd/db/update/linked_places.feature +++ b/test/bdd/db/update/linked_places.feature @@ -238,3 +238,29 @@ Feature: Updates of linked places Then placex contains | object | extratags | | R1 | 'linked_place' : 'town' | + + + Scenario: Keep linking and ranks when place type changes + Given the grid + | 1 | | | 2 | + | | | 9 | | + | 4 | | | 3 | + And the places + | osm | class | type | name | admin | geometry | + | R1 | boundary | administrative | foo | 8 | (1,2,3,4,1) | + And the places + | osm | class | type | name | geometry | + | N1 | place | city | foo | 9 | + When importing + Then placex contains + | object | linked_place_id | rank_address | + | N1 | R1 | 16 | + | R1 | - | 16 | + + When updating places + | osm | class | type | name | geometry | + | N1 | place | town | foo | 9 | + Then placex contains + | object | linked_place_id | rank_address | + | N1 | R1 | 16 | + | R1 | - | 16 |