From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 11 May 2013 19:36:36 +0000 (+0200)
Subject: prefer local data over fallback for country codes
X-Git-Tag: v2.2.0~72
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/63a660ccdc105d9cfa9bd040311245712854dd29

prefer local data over fallback for country codes
---

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