From 63a660ccdc105d9cfa9bd040311245712854dd29 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 11 May 2013 21:36:36 +0200 Subject: [PATCH] prefer local data over fallback for country codes --- sql/functions.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/functions.sql b/sql/functions.sql index bb1081fb..99272d89 100644 --- a/sql/functions.sql +++ b/sql/functions.sql @@ -495,6 +495,12 @@ BEGIN --DEBUG: RAISE WARNING 'get_country_code, start: %', ST_AsText(place_centre); + -- Try for a OSM polygon + FOR nearcountry IN select country_code from location_area_country where country_code is not null and not isguess and st_covers(geometry, place_centre) limit 1 + LOOP + RETURN nearcountry.country_code; + END LOOP; + --DEBUG: RAISE WARNING 'osm fallback: %', ST_AsText(place_centre); -- Try for OSM fallback data @@ -504,12 +510,6 @@ BEGIN RETURN nearcountry.country_code; END LOOP; - -- Try for a OSM polygon - FOR nearcountry IN select country_code from location_area_country where country_code is not null and not isguess and st_covers(geometry, place_centre) limit 1 - LOOP - RETURN nearcountry.country_code; - END LOOP; - --DEBUG: RAISE WARNING 'natural earth: %', ST_AsText(place_centre); -- Natural earth data -- 2.39.5