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

remove self-reference from place-addressline

Browse Source
This commit is contained in:
Sarah Hoffmann
2019-01-13 21:07:01 +01:00
parent db6d3ba486
commit 3811d916b9
1 changed files with 92 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
sql/functions.sql
View File

@@ -1311,10 +1311,6 @@ BEGIN
--DEBUG: RAISE WARNING 'Waterway processed'; --DEBUG: RAISE WARNING 'Waterway processed';
END IF; END IF;
-- Adding ourselves to the list simplifies address calculations later
INSERT INTO place_addressline (place_id, address_place_id, fromarea, isaddress, distance, cached_rank_address)
VALUES (NEW.place_id, NEW.place_id, true, true, 0, NEW.rank_address);
-- What level are we searching from -- What level are we searching from
search_maxrank := NEW.rank_search; search_maxrank := NEW.rank_search;
@@ -2305,6 +2301,9 @@ create type addressline as (
distance FLOAT distance FLOAT
); );
-- Compute the list of address parts for the given place.
--
-- If in_housenumber is greator or equal 0, look for an interpolation.
CREATE OR REPLACE FUNCTION get_addressdata(in_place_id BIGINT, in_housenumber INTEGER) RETURNS setof addressline CREATE OR REPLACE FUNCTION get_addressdata(in_place_id BIGINT, in_housenumber INTEGER) RETURNS setof addressline
AS $$ AS $$
DECLARE DECLARE
@@ -2322,50 +2321,66 @@ DECLARE
searchclass TEXT; searchclass TEXT;
searchtype TEXT; searchtype TEXT;
countryname HSTORE; countryname HSTORE;
hadcountry BOOLEAN;
BEGIN BEGIN
-- The place ein question might not have a direct entry in place_addressline.
-- Look for the parent of such places then and save if in for_place_id.
-- first query osmline (interpolation lines) -- first query osmline (interpolation lines)
select parent_place_id, country_code, 30, postcode, null, 'place', 'house' from location_property_osmline IF in_housenumber >= 0 THEN
WHERE place_id = in_place_id AND in_housenumber>=startnumber AND in_housenumber <= endnumber SELECT parent_place_id, country_code, in_housenumber::text, 30, postcode,
INTO for_place_id,searchcountrycode, searchrankaddress, searchpostcode, searchhousename, searchclass, searchtype; null, 'place', 'house'
IF for_place_id IS NOT NULL THEN FROM location_property_osmline
searchhousenumber = in_housenumber::text; WHERE place_id = in_place_id AND in_housenumber>=startnumber
AND in_housenumber <= endnumber
INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
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 THEN IF for_place_id IS NULL AND in_housenumber >= 0 THEN
select parent_place_id,'us', 30, postcode, null, 'place', 'house' from location_property_tiger SELECT parent_place_id, 'us', in_housenumber::text, 30, postcode, null,
WHERE place_id = in_place_id AND in_housenumber>=startnumber AND in_housenumber <= endnumber 'place', 'house'
INTO for_place_id,searchcountrycode, searchrankaddress, searchpostcode, searchhousename, searchclass, searchtype; FROM location_property_tiger
IF for_place_id IS NOT NULL THEN WHERE place_id = in_place_id AND in_housenumber >= startnumber
searchhousenumber = in_housenumber::text; AND in_housenumber <= endnumber
END IF; INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
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' from location_property_aux SELECT parent_place_id, 'us', housenumber, 30, postcode, null, 'place', 'house'
FROM location_property_aux
WHERE place_id = in_place_id WHERE place_id = in_place_id
INTO for_place_id,searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename, searchclass, searchtype; INTO for_place_id,searchcountrycode, searchhousenumber, searchrankaddress,
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_address, postcode, 'place', 'postcode' SELECT parent_place_id, country_code, rank_address, 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, searchclass, searchtype; INTO for_place_id, searchcountrycode, searchrankaddress, searchpostcode,
searchclass, searchtype;
END IF; END IF;
-- 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, postcode, name, class, type from placex SELECT parent_place_id, country_code, housenumber, rank_search, postcode,
WHERE place_id = in_place_id and rank_search > 27 name, class, type
INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename, searchclass, searchtype; FROM placex
WHERE place_id = in_place_id and rank_search > 27
INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
searchpostcode, searchhousename, searchclass, searchtype;
END IF; END IF;
-- If for_place_id is still NULL at this point then the object has its own
-- entry in place_address line. However, still check if there is not linked
-- 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, null housenumber, rank_search, postcode, null
@@ -2375,52 +2390,51 @@ BEGIN
--RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode; --RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode;
found := 1000; found := 1000; -- the lowest rank_address included
hadcountry := false;
FOR location IN -- Return the record for the base entry.
select placex.place_id, osm_type, osm_id, name, FOR location IN
class, type, admin_level, true as isaddress, SELECT placex.place_id, osm_type, osm_id, name,
CASE WHEN rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address, class, type, admin_level,
0 as distance, country_code, postcode type not in ('postcode', 'postal_code') as isaddress,
from placex CASE WHEN rank_address = 0 THEN 100
where place_id = for_place_id WHEN rank_address = 11 THEN 5
ELSE rank_address END as rank_address,
0 as distance, country_code, postcode
FROM placex
WHERE place_id = for_place_id
LOOP LOOP
--RAISE WARNING '%',location; --RAISE WARNING '%',location;
IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
searchcountrycode := location.country_code; searchcountrycode := location.country_code;
END IF; END IF;
IF location.type in ('postcode', 'postal_code') THEN IF location.rank_address < 4 THEN
location.isaddress := FALSE; -- no country locations for ranks higher than country
ELSEIF location.rank_address = 4 THEN searchcountrycode := NULL;
hadcountry := true;
END IF; END IF;
IF location.rank_address < 4 AND NOT hadcountry THEN countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,
select name from country_name where country_code = searchcountrycode limit 1 INTO countryname; location.name, location.class, location.type,
IF countryname IS NOT NULL THEN location.admin_level, true, location.isaddress,
countrylocation := ROW(null, null, null, countryname, 'place', 'country', null, true, true, 4, 0)::addressline; location.rank_address, location.distance)::addressline;
RETURN NEXT countrylocation;
END IF;
END IF;
countrylocation := ROW(location.place_id, location.osm_type, location.osm_id, location.name, location.class,
location.type, location.admin_level, true, location.isaddress, location.rank_address,
location.distance)::addressline;
RETURN NEXT countrylocation; RETURN NEXT countrylocation;
found := location.rank_address; found := location.rank_address;
END LOOP; END LOOP;
FOR location IN FOR location IN
select placex.place_id, osm_type, osm_id, name, SELECT placex.place_id, osm_type, osm_id, name,
CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class, CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class,
CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type, CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type,
admin_level, fromarea, isaddress, admin_level, fromarea, isaddress,
CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address, CASE WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
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 > 0 AND cached_rank_address < searchrankaddress) AND (cached_rank_address >= 4 AND cached_rank_address < searchrankaddress)
and address_place_id != for_place_id and linked_place_id is null AND linked_place_id is null
and (placex.country_code IS NULL OR searchcountrycode IS NULL OR placex.country_code = searchcountrycode) AND (placex.country_code IS NULL OR searchcountrycode IS NULL
order by rank_address desc,isaddress desc,fromarea desc,distance asc,rank_search desc OR placex.country_code = searchcountrycode)
ORDER BY rank_address desc, isaddress desc, fromarea desc,
distance asc, rank_search desc
LOOP LOOP
--RAISE WARNING '%',location; --RAISE WARNING '%',location;
IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
@@ -2429,49 +2443,49 @@ BEGIN
IF location.type in ('postcode', 'postal_code') THEN IF location.type in ('postcode', 'postal_code') THEN
location.isaddress := FALSE; location.isaddress := FALSE;
END IF; END IF;
IF location.rank_address = 4 AND location.isaddress THEN countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,
hadcountry := true; location.name, location.class, location.type,
END IF; location.admin_level, location.fromarea,
IF location.rank_address < 4 AND NOT hadcountry THEN location.isaddress, location.rank_address,
select name from country_name where country_code = searchcountrycode limit 1 INTO countryname;
IF countryname IS NOT NULL THEN
countrylocation := ROW(null, null, null, countryname, 'place', 'country', null, true, true, 4, 0)::addressline;
RETURN NEXT countrylocation;
END IF;
END IF;
countrylocation := ROW(location.place_id, location.osm_type, location.osm_id, location.name, location.class,
location.type, location.admin_level, location.fromarea, location.isaddress, location.rank_address,
location.distance)::addressline; location.distance)::addressline;
RETURN NEXT countrylocation; RETURN NEXT countrylocation;
found := location.rank_address; found := location.rank_address;
END LOOP; END LOOP;
-- If no country was included yet, add the name information from country_name.
IF found > 4 THEN IF found > 4 THEN
select name from country_name where country_code = searchcountrycode limit 1 INTO countryname; SELECT name FROM country_name
WHERE country_code = searchcountrycode LIMIT 1 INTO countryname;
--RAISE WARNING '% % %',found,searchcountrycode,countryname; --RAISE WARNING '% % %',found,searchcountrycode,countryname;
IF countryname IS NOT NULL THEN IF countryname IS NOT NULL THEN
location := ROW(null, null, null, countryname, 'place', 'country', null, true, true, 4, 0)::addressline; location := ROW(null, null, null, countryname, 'place', 'country',
null, true, true, 4, 0)::addressline;
RETURN NEXT location; RETURN NEXT location;
END IF; END IF;
END IF; END IF;
-- Finally add some artificial rows.
IF searchcountrycode IS NOT NULL THEN IF searchcountrycode IS NOT NULL THEN
location := ROW(null, null, null, hstore('ref', searchcountrycode), 'place', 'country_code', null, true, false, 4, 0)::addressline; location := ROW(null, null, null, hstore('ref', searchcountrycode),
'place', 'country_code', null, true, false, 4, 0)::addressline;
RETURN NEXT location; RETURN NEXT location;
END IF; END IF;
IF searchhousename IS NOT NULL THEN IF searchhousename IS NOT NULL THEN
location := ROW(in_place_id, null, null, searchhousename, searchclass, searchtype, null, true, true, 29, 0)::addressline; location := ROW(in_place_id, null, null, searchhousename, searchclass,
searchtype, null, true, true, 29, 0)::addressline;
RETURN NEXT location; RETURN NEXT location;
END IF; END IF;
IF searchhousenumber IS NOT NULL THEN IF searchhousenumber IS NOT NULL THEN
location := ROW(in_place_id, null, null, hstore('ref', searchhousenumber), 'place', 'house_number', null, true, true, 28, 0)::addressline; location := ROW(in_place_id, null, null, hstore('ref', searchhousenumber),
'place', 'house_number', null, true, true, 28, 0)::addressline;
RETURN NEXT location; RETURN NEXT location;
END IF; END IF;
IF searchpostcode IS NOT NULL THEN IF searchpostcode IS NOT NULL THEN
location := ROW(null, null, null, hstore('ref', searchpostcode), 'place', 'postcode', null, true, true, 5, 0)::addressline; location := ROW(null, null, null, hstore('ref', searchpostcode), 'place',
'postcode', null, true, true, 5, 0)::addressline;
RETURN NEXT location; RETURN NEXT location;
END IF; END IF;