From: Sarah Hoffmann Date: Fri, 18 Sep 2020 14:18:02 +0000 (+0200) Subject: remove special casing for rank 25 postcodes X-Git-Tag: v3.6.0~74^2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b219374d363bf967c891287188c0809a80f64090?ds=sidebyside;hp=-c remove special casing for rank 25 postcodes They can be computed like any other place. --- b219374d363bf967c891287188c0809a80f64090 diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index 0102d2c8..a935b75a 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -703,7 +703,7 @@ BEGIN -- --------------------------------------------------------------------------- -- For low level elements we inherit from our parent road - IF (NEW.rank_search > 27 OR (NEW.type = 'postcode' AND NEW.rank_search = 25)) THEN + IF NEW.rank_search > 27 THEN --DEBUG: RAISE WARNING 'finding street for % %', NEW.osm_type, NEW.osm_id; NEW.parent_place_id := null; @@ -766,11 +766,6 @@ BEGIN -- Performance, it would be more acurate to do all the rest of the import -- process but it takes too long -- Just be happy with inheriting from parent road only - IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN - result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, upper(trim(NEW.address->'postcode')), NEW.geometry); - --DEBUG: RAISE WARNING 'Place added to location table'; - END IF; - result := insertSearchName(NEW.partition, NEW.place_id, name_vector, NEW.rank_search, NEW.rank_address, NEW.geometry); diff --git a/test/bdd/api/search/structured.feature b/test/bdd/api/search/structured.feature index ec7eb1be..e94cd4cc 100644 --- a/test/bdd/api/search/structured.feature +++ b/test/bdd/api/search/structured.feature @@ -18,7 +18,7 @@ Feature: Structured search queries | 22547 | Then results contain | type | - | postcode | + | ^post(al_)?code | And result addresses contain | postcode | | 22547 |