X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1e9f37ab82db1758235bedf83c659693f4ca6c3e..e4796bb876bf75dd674ee3f25a89bebb7e037443:/lib-sql/functions/address_lookup.sql?ds=sidebyside diff --git a/lib-sql/functions/address_lookup.sql b/lib-sql/functions/address_lookup.sql index b6c552c4..3e25c6fc 100644 --- a/lib-sql/functions/address_lookup.sql +++ b/lib-sql/functions/address_lookup.sql @@ -1,3 +1,10 @@ +-- SPDX-License-Identifier: GPL-2.0-only +-- +-- This file is part of Nominatim. (https://nominatim.org) +-- +-- Copyright (C) 2022 by the Nominatim developer community. +-- For a full list of authors see the git log. + -- Functions for returning address information for a place. DROP TYPE IF EXISTS addressline CASCADE; @@ -101,6 +108,7 @@ CREATE OR REPLACE FUNCTION get_addressdata(in_place_id BIGINT, in_housenumber IN DECLARE place addressdata_place; location RECORD; + country RECORD; current_rank_address INTEGER; location_isaddress BOOLEAN; BEGIN @@ -191,6 +199,16 @@ BEGIN WHERE place_id = place.place_id LOOP --RAISE WARNING '%',location; + -- mix in default names for countries + IF location.rank_address = 4 and place.country_code is not NULL THEN + FOR country IN + SELECT coalesce(name, ''::hstore) as name FROM country_name + WHERE country_code = place.country_code LIMIT 1 + LOOP + place.name := country.name || place.name; + END LOOP; + END IF; + IF location.rank_address < 4 THEN -- no country locations for ranks higher than country place.country_code := NULL::varchar(2); @@ -223,11 +241,13 @@ BEGIN OR placex.country_code = place.country_code) ORDER BY rank_address desc, (place_addressline.place_id = in_place_id) desc, - (fromarea and place.centroid is not null and not isaddress - and (place.address is null or avals(name) && avals(place.address)) - and ST_Contains(geometry, place.centroid)) desc, - isaddress desc, fromarea desc, - distance asc, rank_search desc + (CASE WHEN coalesce((avals(name) && avals(place.address)), False) THEN 2 + WHEN isaddress THEN 0 + WHEN fromarea + and place.centroid is not null + and ST_Contains(geometry, place.centroid) THEN 1 + ELSE -1 END) desc, + fromarea desc, distance asc, rank_search desc LOOP -- RAISE WARNING '%',location; location_isaddress := location.rank_address != current_rank_address; @@ -263,7 +283,8 @@ BEGIN -- If no country was included yet, add the name information from country_name. IF current_rank_address > 4 THEN FOR location IN - SELECT name FROM country_name WHERE country_code = place.country_code LIMIT 1 + SELECT name || coalesce(derived_name, ''::hstore) as name FROM country_name + WHERE country_code = place.country_code LIMIT 1 LOOP --RAISE WARNING '% % %',current_rank_address,searchcountrycode,countryname; RETURN NEXT ROW(null, null, null, location.name, 'place', 'country', NULL,