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

remove postcodes entirely from indexing

Browse Source 
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.
This commit is contained in:
Sarah Hoffmann
2020-09-18 15:09:35 +02:00
parent 7fb62ea904
commit 4c9cfe2532
4 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/functions/placex_triggers.sql
View File

@@ -581,6 +581,15 @@ BEGIN
RETURN NEW; RETURN NEW;
END IF; 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 -- Speed up searches - just use the centroid of the feature
-- cheaper but less acurate -- cheaper but less acurate
NEW.centroid := ST_PointOnSurface(NEW.geometry); NEW.centroid := ST_PointOnSurface(NEW.geometry);

4
sql/functions/ranking.sql
View File

@@ -145,10 +145,6 @@ BEGIN
THEN THEN
SELECT * INTO search_rank, address_rank SELECT * INTO search_rank, address_rank
FROM get_postcode_rank(country, postcode); 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 ELSEIF extended_type = 'N' AND place_class = 'highway' THEN
search_rank = 30; search_rank = 30;
address_rank = 0; address_rank = 0;

4
test/bdd/db/import/addressing.feature
View File

@@ -139,8 +139,8 @@ Feature: Address computation
| R1 | boundary | administrative | 6 | 112 | :b0 | | R1 | boundary | administrative | 6 | 112 | :b0 |
| R34 | boundary | administrative | 8 | 112 DE | :b1:E | | R34 | boundary | administrative | 8 | 112 DE | :b1:E |
And the places And the places
| osm | class | type | addr+postcode | geometry | | osm | class | type | addr+postcode | geometry |
| R4 | place | postcode | 112 DE 34 | :b2:N | | R4 | boundary | postal_code | 112 DE 34 | :b2:N |
And the named places And the named places
| osm | class | type | geometry | | osm | class | type | geometry |
| W93 | highway | residential | :w2N | | W93 | highway | residential | :w2N |

38
test/bdd/db/import/placex.feature
View File

@@ -69,10 +69,10 @@ Feature: Import into placex
| N3 | place | postcode | Y45 | country:gb | | N3 | place | postcode | Y45 | country:gb |
When importing When importing
Then placex contains Then placex contains
| object | postcode | country_code | rank_search | rank_address | | object | addr+postcode | country_code | rank_search | rank_address |
| N1 | E45 2CD | gb | 25 | 0 | | N1 | E45 2CD | gb | 25 | 5 |
| N2 | E45 2 | gb | 23 | 0 | | N2 | E45 2 | gb | 23 | 5 |
| N3 | Y45 | gb | 21 | 0 | | N3 | Y45 | gb | 21 | 5 |
Scenario: wrongly formatted GB postcodes are down-ranked Scenario: wrongly formatted GB postcodes are down-ranked
Given the places Given the places
@@ -82,8 +82,8 @@ Feature: Import into placex
When importing When importing
Then placex contains Then placex contains
| object | country_code | rank_search | rank_address | | object | country_code | rank_search | rank_address |
| N1 | gb | 30 | 0 | | N1 | gb | 30 | 30 |
| N2 | gb | 30 | 0 | | N2 | gb | 30 | 30 |
Scenario: search and address rank for DE postcodes correctly assigned Scenario: search and address rank for DE postcodes correctly assigned
Given the places Given the places
@@ -95,10 +95,10 @@ Feature: Import into placex
When importing When importing
Then placex contains Then placex contains
| object | country_code | rank_search | rank_address | | object | country_code | rank_search | rank_address |
| N1 | de | 21 | 0 | | N1 | de | 21 | 11 |
| N2 | de | 30 | 0 | | N2 | de | 30 | 30 |
| N3 | de | 30 | 0 | | N3 | de | 30 | 30 |
| N4 | de | 30 | 0 | | N4 | de | 30 | 30 |
Scenario: search and address rank for other postcodes are correctly assigned Scenario: search and address rank for other postcodes are correctly assigned
Given the places Given the places
@@ -115,15 +115,15 @@ Feature: Import into placex
When importing When importing
Then placex contains Then placex contains
| object | country_code | rank_search | rank_address | | object | country_code | rank_search | rank_address |
| N1 | ca | 21 | 0 | | N1 | ca | 21 | 11 |
| N2 | ca | 21 | 0 | | N2 | ca | 21 | 11 |
| N3 | ca | 21 | 0 | | N3 | ca | 21 | 11 |
| N4 | ca | 21 | 0 | | N4 | ca | 21 | 11 |
| N5 | ca | 21 | 0 | | N5 | ca | 21 | 11 |
| N6 | ca | 21 | 0 | | N6 | ca | 21 | 11 |
| N7 | ca | 25 | 0 | | N7 | ca | 25 | 11 |
| N8 | ca | 25 | 0 | | N8 | ca | 25 | 11 |
| N9 | ca | 25 | 0 | | N9 | ca | 25 | 11 |
Scenario: search and address ranks for boundaries are correctly assigned Scenario: search and address ranks for boundaries are correctly assigned
Given the named places Given the named places