hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge addr:postcode from houses into search index of attached road

Browse Source 
Makes house number searchable by postcode when the postcode is
only available in addr:postcode.
This commit is contained in:
Sarah Hoffmann
2015-05-08 19:34:33 +02:00
parent 4ba93dcb50
commit 2f8a29ba39
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/functions.sql
View File

@@ -1403,6 +1403,26 @@ BEGIN
select * from search_name where place_id = NEW.parent_place_id INTO location; select * from search_name where place_id = NEW.parent_place_id INTO location;
NEW.calculated_country_code := location.country_code; NEW.calculated_country_code := location.country_code;
-- Merge the postcode into the parent's address if necessary XXXX
IF NEW.postcode IS NOT NULL THEN
isin_tokens := '{}'::int[];
address_street_word_id := getorcreate_word_id(make_standard_name(NEW.postcode));
IF address_street_word_id is not null
and not ARRAY[address_street_word_id] <@ location.nameaddress_vector THEN
isin_tokens := isin_tokens || address_street_word_id;
END IF;
address_street_word_id := getorcreate_name_id(make_standard_name(NEW.postcode));
IF address_street_word_id is not null
and not ARRAY[address_street_word_id] <@ location.nameaddress_vector THEN
isin_tokens := isin_tokens || address_street_word_id;
END IF;
IF isin_tokens != '{}'::int[] THEN
UPDATE search_name
SET nameaddress_vector = search_name.nameaddress_vector || isin_tokens
WHERE place_id = NEW.parent_place_id;
END IF;
END IF;
--RAISE WARNING '%', NEW.name; --RAISE WARNING '%', NEW.name;
-- If there is no name it isn't searchable, don't bother to create a search record -- If there is no name it isn't searchable, don't bother to create a search record
IF NEW.name is NULL THEN IF NEW.name is NULL THEN

14
tests/features/db/import/search_terms.feature
View File

@@ -26,3 +26,17 @@ Feature: Creation of search terms
Then search_name table contains Then search_name table contains
| place_id | name_vector | nameaddress_vector | place_id | name_vector | nameaddress_vector
| N1 | foo | the road | N1 | foo | the road
Scenario: Roads take over the postcode from attached houses
Given the scene roads-with-pois
And the place nodes
| osm_id | class | type | housenumber | postcode | street | geometry
| 1 | place | house | 1 | 12345 | North St |:p-S1
And the place ways
| osm_id | class | type | name | geometry
| 1 | highway | residential | North St | :w-north
When importing
Then search_name table contains
| place_id | nameaddress_vector
| W1 | 12345