X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/06110ba358f5171d48b2003ad24a7e42c755fff4..c84e7e72f11825f9a0bf20fc05dc1d71093b92fb:/sql/functions/address_lookup.sql?ds=sidebyside diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql index 7885d0a9..b20cb364 100644 --- a/sql/functions/address_lookup.sql +++ b/sql/functions/address_lookup.sql @@ -101,6 +101,7 @@ DECLARE postcode_isexact BOOL; searchclass TEXT; searchtype TEXT; + search_unlisted_place TEXT; countryname HSTORE; BEGIN -- The place ein question might not have a direct entry in place_addressline. @@ -155,11 +156,13 @@ BEGIN IF for_place_id IS NULL THEN SELECT parent_place_id, country_code, housenumber, rank_search, postcode, address is not null and address ? 'postcode', - name, class, type + name, class, type, + address -> '_unlisted_place' as unlisted_place FROM placex WHERE place_id = in_place_id and rank_search > 27 INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, - searchpostcode, postcode_isexact, searchhousename, searchclass, searchtype; + searchpostcode, postcode_isexact, searchhousename, searchclass, + searchtype, search_unlisted_place; END IF; -- If for_place_id is still NULL at this point then the object has its own @@ -180,6 +183,7 @@ BEGIN -- Return the record for the base entry. FOR location IN SELECT placex.place_id, osm_type, osm_id, name, + coalesce(extratags->'linked_place', extratags->'place') as place_type, class, type, admin_level, type not in ('postcode', 'postal_code') as isaddress, CASE WHEN rank_address = 0 THEN 100 @@ -198,7 +202,8 @@ BEGIN searchcountrycode := NULL; END IF; countrylocation := ROW(location.place_id, location.osm_type, location.osm_id, - location.name, location.class, location.type, NULL, + location.name, location.class, location.type, + location.place_type, location.admin_level, true, location.isaddress, location.rank_address, location.distance)::addressline; RETURN NEXT countrylocation; @@ -207,7 +212,7 @@ BEGIN FOR location IN SELECT placex.place_id, osm_type, osm_id, name, class, type, - coalesce(extratags->'place', extratags->'linked_place') as place_type, + coalesce(extratags->'linked_place', extratags->'place') as place_type, admin_level, fromarea, isaddress, CASE WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address, distance, country_code, postcode @@ -272,11 +277,16 @@ BEGIN END IF; IF searchhousenumber IS NOT NULL THEN - location := ROW(in_place_id, null, null, hstore('ref', searchhousenumber), + location := ROW(null, null, null, hstore('ref', searchhousenumber), 'place', 'house_number', null, null, true, true, 28, 0)::addressline; RETURN NEXT location; END IF; + IF search_unlisted_place is not null THEN + RETURN NEXT ROW(null, null, null, hstore('name', search_unlisted_place), + 'place', 'locality', null, null, true, true, 26, 0)::addressline; + END IF; + IF searchpostcode IS NOT NULL THEN location := ROW(null, null, null, hstore('ref', searchpostcode), 'place', 'postcode', null, null, false, true, 5, 0)::addressline;