Allow map to wrap-around, still longitude should be -180..+180

[nominatim.git] / sql / functions.sql

diff --git a/sql/functions.sql b/sql/functions.sql
index 0903356713799a22a94716367b39bc2a3b9e955f..ad2007cb2165bc86a9782122dff7dcdb40dc1b14 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -2622,7 +2622,7 @@ END;
 $$
 LANGUAGE plpgsql IMMUTABLE;
 
-DROP TYPE wikipedia_article_match CASCADE;
+DROP TYPE IF EXISTS wikipedia_article_match CASCADE;
 create type wikipedia_article_match as (
   language TEXT,
   title TEXT,
@@ -2703,7 +2703,7 @@ BEGIN
   IF extratags ? 'wikidata' THEN
     FOR match IN SELECT * FROM wikipedia_article
                   WHERE wd_page_title = extratags->'wikidata'
-                  ORDER BY importance DESC limit 1 LOOP
+                  ORDER BY language = 'en' DESC, langcount DESC LIMIT 1 LOOP
       result.importance := match.importance;
       result.wikipedia := match.language || ':' || match.title;
       RETURN result;