mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-11-22 12:06:27 +03:00
do not rename parameters in existing SQL function
This commit is contained in:
parent
6415c9cf95
commit
981b879830
@ -175,18 +175,18 @@ $$
|
|||||||
LANGUAGE plpgsql STABLE;
|
LANGUAGE plpgsql STABLE;
|
||||||
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION get_country_code(place_centre geometry)
|
CREATE OR REPLACE FUNCTION get_country_code(place geometry)
|
||||||
RETURNS TEXT
|
RETURNS TEXT
|
||||||
AS $$
|
AS $$
|
||||||
DECLARE
|
DECLARE
|
||||||
nearcountry RECORD;
|
nearcountry RECORD;
|
||||||
countries TEXT[];
|
countries TEXT[];
|
||||||
BEGIN
|
BEGIN
|
||||||
-- RAISE WARNING 'get_country_code, start: %', ST_AsText(place_centre);
|
-- RAISE WARNING 'get_country_code, start: %', ST_AsText(place);
|
||||||
|
|
||||||
-- Try for a OSM polygon
|
-- Try for a OSM polygon
|
||||||
SELECT array_agg(country_code) FROM location_area_country
|
SELECT array_agg(country_code) FROM location_area_country
|
||||||
WHERE country_code is not null and st_covers(geometry, place_centre)
|
WHERE country_code is not null and st_covers(geometry, place)
|
||||||
INTO countries;
|
INTO countries;
|
||||||
|
|
||||||
IF array_length(countries, 1) = 1 THEN
|
IF array_length(countries, 1) = 1 THEN
|
||||||
@ -197,7 +197,7 @@ BEGIN
|
|||||||
-- more than one country found, confirm against the fallback data what to choose
|
-- more than one country found, confirm against the fallback data what to choose
|
||||||
FOR nearcountry IN
|
FOR nearcountry IN
|
||||||
SELECT country_code FROM country_osm_grid
|
SELECT country_code FROM country_osm_grid
|
||||||
WHERE ST_Covers(geometry, place_centre) AND country_code = ANY(countries)
|
WHERE ST_Covers(geometry, place) AND country_code = ANY(countries)
|
||||||
ORDER BY area ASC
|
ORDER BY area ASC
|
||||||
LOOP
|
LOOP
|
||||||
RETURN nearcountry.country_code;
|
RETURN nearcountry.country_code;
|
||||||
@ -217,18 +217,18 @@ BEGIN
|
|||||||
RETURN countries[1];
|
RETURN countries[1];
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
-- RAISE WARNING 'osm fallback: %', ST_AsText(place_centre);
|
-- RAISE WARNING 'osm fallback: %', ST_AsText(place);
|
||||||
|
|
||||||
-- Try for OSM fallback data
|
-- Try for OSM fallback data
|
||||||
-- The order is to deal with places like HongKong that are 'states' within another polygon
|
-- The order is to deal with places like HongKong that are 'states' within another polygon
|
||||||
FOR nearcountry IN
|
FOR nearcountry IN
|
||||||
SELECT country_code from country_osm_grid
|
SELECT country_code from country_osm_grid
|
||||||
WHERE st_covers(geometry, place_centre) order by area asc limit 1
|
WHERE st_covers(geometry, place) order by area asc limit 1
|
||||||
LOOP
|
LOOP
|
||||||
RETURN nearcountry.country_code;
|
RETURN nearcountry.country_code;
|
||||||
END LOOP;
|
END LOOP;
|
||||||
|
|
||||||
-- RAISE WARNING 'near osm fallback: %', ST_AsText(place_centre);
|
-- RAISE WARNING 'near osm fallback: %', ST_AsText(place);
|
||||||
|
|
||||||
RETURN NULL;
|
RETURN NULL;
|
||||||
END;
|
END;
|
||||||
|
Loading…
Reference in New Issue
Block a user