From: Sarah Hoffmann Date: Fri, 18 Sep 2020 13:09:35 +0000 (+0200) Subject: remove postcodes entirely from indexing X-Git-Tag: v3.6.0~74^2~2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4c9cfe2532273955619e7a651260c0e085c070e1?ds=inline;hp=-c remove postcodes entirely from indexing place=postcode places are artificial places that collect addr:postcode points for aggration. They should neither show up in the address nor be searchable. That means that there is no need to index them at all. Only let boundary=postal_code through which define correct areas for postcodes. --- 4c9cfe2532273955619e7a651260c0e085c070e1 diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index 3ddb97c0..0102d2c8 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -581,6 +581,15 @@ BEGIN RETURN NEW; END IF; + -- Postcodes are just here to compute the centroids. They are not searchable + -- unless they are a boundary=postal_code. + -- There was an error in the style so that boundary=postal_code used to be + -- imported as place=postcode. That's why relations are allowed to pass here. + -- This can go away in a couple of versions. + IF NEW.class = 'place' and NEW.type = 'postcode' and NEW.osm_type != 'R' THEN + RETURN NEW; + END IF; + -- Speed up searches - just use the centroid of the feature -- cheaper but less acurate NEW.centroid := ST_PointOnSurface(NEW.geometry); diff --git a/sql/functions/ranking.sql b/sql/functions/ranking.sql index 98e70a42..0c8f4c49 100644 --- a/sql/functions/ranking.sql +++ b/sql/functions/ranking.sql @@ -145,10 +145,6 @@ BEGIN THEN SELECT * INTO search_rank, address_rank FROM get_postcode_rank(country, postcode); - - IF NOT extended_type = 'A' THEN - address_rank := 0; - END IF; ELSEIF extended_type = 'N' AND place_class = 'highway' THEN search_rank = 30; address_rank = 0; diff --git a/test/bdd/db/import/addressing.feature b/test/bdd/db/import/addressing.feature index 2fdd2812..0d4798e8 100644 --- a/test/bdd/db/import/addressing.feature +++ b/test/bdd/db/import/addressing.feature @@ -139,8 +139,8 @@ Feature: Address computation | R1 | boundary | administrative | 6 | 112 | :b0 | | R34 | boundary | administrative | 8 | 112 DE | :b1:E | And the places - | osm | class | type | addr+postcode | geometry | - | R4 | place | postcode | 112 DE 34 | :b2:N | + | osm | class | type | addr+postcode | geometry | + | R4 | boundary | postal_code | 112 DE 34 | :b2:N | And the named places | osm | class | type | geometry | | W93 | highway | residential | :w2N | diff --git a/test/bdd/db/import/placex.feature b/test/bdd/db/import/placex.feature index 2b7c8cd8..1a62638d 100644 --- a/test/bdd/db/import/placex.feature +++ b/test/bdd/db/import/placex.feature @@ -69,10 +69,10 @@ Feature: Import into placex | N3 | place | postcode | Y45 | country:gb | When importing Then placex contains - | object | postcode | country_code | rank_search | rank_address | - | N1 | E45 2CD | gb | 25 | 0 | - | N2 | E45 2 | gb | 23 | 0 | - | N3 | Y45 | gb | 21 | 0 | + | object | addr+postcode | country_code | rank_search | rank_address | + | N1 | E45 2CD | gb | 25 | 5 | + | N2 | E45 2 | gb | 23 | 5 | + | N3 | Y45 | gb | 21 | 5 | Scenario: wrongly formatted GB postcodes are down-ranked Given the places @@ -82,8 +82,8 @@ Feature: Import into placex When importing Then placex contains | object | country_code | rank_search | rank_address | - | N1 | gb | 30 | 0 | - | N2 | gb | 30 | 0 | + | N1 | gb | 30 | 30 | + | N2 | gb | 30 | 30 | Scenario: search and address rank for DE postcodes correctly assigned Given the places @@ -95,10 +95,10 @@ Feature: Import into placex When importing Then placex contains | object | country_code | rank_search | rank_address | - | N1 | de | 21 | 0 | - | N2 | de | 30 | 0 | - | N3 | de | 30 | 0 | - | N4 | de | 30 | 0 | + | N1 | de | 21 | 11 | + | N2 | de | 30 | 30 | + | N3 | de | 30 | 30 | + | N4 | de | 30 | 30 | Scenario: search and address rank for other postcodes are correctly assigned Given the places @@ -115,15 +115,15 @@ Feature: Import into placex When importing Then placex contains | object | country_code | rank_search | rank_address | - | N1 | ca | 21 | 0 | - | N2 | ca | 21 | 0 | - | N3 | ca | 21 | 0 | - | N4 | ca | 21 | 0 | - | N5 | ca | 21 | 0 | - | N6 | ca | 21 | 0 | - | N7 | ca | 25 | 0 | - | N8 | ca | 25 | 0 | - | N9 | ca | 25 | 0 | + | N1 | ca | 21 | 11 | + | N2 | ca | 21 | 11 | + | N3 | ca | 21 | 11 | + | N4 | ca | 21 | 11 | + | N5 | ca | 21 | 11 | + | N6 | ca | 21 | 11 | + | N7 | ca | 25 | 11 | + | N8 | ca | 25 | 11 | + | N9 | ca | 25 | 11 | Scenario: search and address ranks for boundaries are correctly assigned Given the named places