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

Remove more rank_search usage from address computation

Browse Source 
Fixes #1904.
This commit is contained in:
Sarah Hoffmann
2020-09-25 17:50:36 +02:00
parent eeb2b1f998
commit f8694da3c9
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sql/functions/address_lookup.sql
View File

@@ -96,7 +96,6 @@ DECLARE
searchcountrycode varchar(2); searchcountrycode varchar(2);
searchhousenumber TEXT; searchhousenumber TEXT;
searchhousename HSTORE; searchhousename HSTORE;
searchrankaddress INTEGER;
searchpostcode TEXT; searchpostcode TEXT;
postcode_isexact BOOL; postcode_isexact BOOL;
searchclass TEXT; searchclass TEXT;
@@ -111,56 +110,56 @@ BEGIN
-- first query osmline (interpolation lines) -- first query osmline (interpolation lines)
IF in_housenumber >= 0 THEN IF in_housenumber >= 0 THEN
SELECT parent_place_id, country_code, in_housenumber::text, 30, postcode, SELECT parent_place_id, country_code, in_housenumber::text, postcode,
null, 'place', 'house' null, 'place', 'house'
FROM location_property_osmline FROM location_property_osmline
WHERE place_id = in_place_id AND in_housenumber>=startnumber WHERE place_id = in_place_id AND in_housenumber>=startnumber
AND in_housenumber <= endnumber AND in_housenumber <= endnumber
INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, INTO for_place_id, searchcountrycode, searchhousenumber,
searchpostcode, searchhousename, searchclass, searchtype; searchpostcode, searchhousename, searchclass, searchtype;
END IF; END IF;
--then query tiger data --then query tiger data
-- %NOTIGERDATA% IF 0 THEN -- %NOTIGERDATA% IF 0 THEN
IF for_place_id IS NULL AND in_housenumber >= 0 THEN IF for_place_id IS NULL AND in_housenumber >= 0 THEN
SELECT parent_place_id, 'us', in_housenumber::text, 30, postcode, null, SELECT parent_place_id, 'us', in_housenumber::text, postcode, null,
'place', 'house' 'place', 'house'
FROM location_property_tiger FROM location_property_tiger
WHERE place_id = in_place_id AND in_housenumber >= startnumber WHERE place_id = in_place_id AND in_housenumber >= startnumber
AND in_housenumber <= endnumber AND in_housenumber <= endnumber
INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, INTO for_place_id, searchcountrycode, searchhousenumber,
searchpostcode, searchhousename, searchclass, searchtype; searchpostcode, searchhousename, searchclass, searchtype;
END IF; END IF;
-- %NOTIGERDATA% END IF; -- %NOTIGERDATA% END IF;
-- %NOAUXDATA% IF 0 THEN -- %NOAUXDATA% IF 0 THEN
IF for_place_id IS NULL THEN IF for_place_id IS NULL THEN
SELECT parent_place_id, 'us', housenumber, 30, postcode, null, 'place', 'house' SELECT parent_place_id, 'us', housenumber, postcode, null, 'place', 'house'
FROM location_property_aux FROM location_property_aux
WHERE place_id = in_place_id WHERE place_id = in_place_id
INTO for_place_id,searchcountrycode, searchhousenumber, searchrankaddress, INTO for_place_id,searchcountrycode, searchhousenumber,
searchpostcode, searchhousename, searchclass, searchtype; searchpostcode, searchhousename, searchclass, searchtype;
END IF; END IF;
-- %NOAUXDATA% END IF; -- %NOAUXDATA% END IF;
-- postcode table -- postcode table
IF for_place_id IS NULL THEN IF for_place_id IS NULL THEN
SELECT parent_place_id, country_code, rank_search, postcode, 'place', 'postcode' SELECT parent_place_id, country_code, postcode, 'place', 'postcode'
FROM location_postcode FROM location_postcode
WHERE place_id = in_place_id WHERE place_id = in_place_id
INTO for_place_id, searchcountrycode, searchrankaddress, searchpostcode, INTO for_place_id, searchcountrycode, searchpostcode,
searchclass, searchtype; searchclass, searchtype;
END IF; END IF;
-- POI objects in the placex table -- POI objects in the placex table
IF for_place_id IS NULL THEN IF for_place_id IS NULL THEN
SELECT parent_place_id, country_code, housenumber, rank_search, SELECT parent_place_id, country_code, housenumber,
postcode, address is not null and address ? 'postcode', postcode, address is not null and address ? 'postcode',
name, class, type, name, class, type,
address -> '_unlisted_place' as unlisted_place address -> '_unlisted_place' as unlisted_place
FROM placex FROM placex
WHERE place_id = in_place_id and rank_search > 27 WHERE place_id = in_place_id and rank_search > 27
INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, INTO for_place_id, searchcountrycode, searchhousenumber,
searchpostcode, postcode_isexact, searchhousename, searchclass, searchpostcode, postcode_isexact, searchhousename, searchclass,
searchtype, search_unlisted_place; searchtype, search_unlisted_place;
END IF; END IF;
@@ -170,13 +169,13 @@ BEGIN
-- place we should be using instead. -- place we should be using instead.
IF for_place_id IS NULL THEN IF for_place_id IS NULL THEN
select coalesce(linked_place_id, place_id), country_code, select coalesce(linked_place_id, place_id), country_code,
housenumber, rank_search, postcode, housenumber, postcode,
address is not null and address ? 'postcode', null address is not null and address ? 'postcode', null
from placex where place_id = in_place_id from placex where place_id = in_place_id
INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, postcode_isexact, searchhousename; INTO for_place_id, searchcountrycode, searchhousenumber, searchpostcode, postcode_isexact, searchhousename;
END IF; END IF;
--RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode; --RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchpostcode;
found := 1000; -- the lowest rank_address included found := 1000; -- the lowest rank_address included
@@ -218,7 +217,6 @@ BEGIN
distance, country_code, postcode distance, country_code, postcode
FROM place_addressline join placex on (address_place_id = placex.place_id) FROM place_addressline join placex on (address_place_id = placex.place_id)
WHERE place_addressline.place_id = for_place_id WHERE place_addressline.place_id = for_place_id
AND (cached_rank_address >= 4 AND cached_rank_address < searchrankaddress)
AND linked_place_id is null AND linked_place_id is null
AND (placex.country_code IS NULL OR searchcountrycode IS NULL AND (placex.country_code IS NULL OR searchcountrycode IS NULL
OR placex.country_code = searchcountrycode) OR placex.country_code = searchcountrycode)

2
sql/partition-functions.src.sql
View File

@@ -44,7 +44,7 @@ BEGIN
FROM location_area_large_-partition- FROM location_area_large_-partition-
WHERE geometry && feature WHERE geometry && feature
AND is_relevant_geometry(ST_Relate(geometry, feature), ST_GeometryType(feature)) AND is_relevant_geometry(ST_Relate(geometry, feature), ST_GeometryType(feature))
AND rank_search < maxrank AND rank_address < maxrank AND rank_address < maxrank
GROUP BY place_id, keywords, rank_address, rank_search, isguess, postcode, centroid GROUP BY place_id, keywords, rank_address, rank_search, isguess, postcode, centroid
ORDER BY rank_address, isin_tokens && keywords desc, isguess asc, ORDER BY rank_address, isin_tokens && keywords desc, isguess asc,
ST_Distance(feature, centroid) * ST_Distance(feature, centroid) *