From: Sarah Hoffmann Date: Sun, 19 Aug 2012 21:53:19 +0000 (+0200) Subject: Merge branch 'master' of http://github.com/twain47/Nominatim X-Git-Tag: deploy~683 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/5605725ebe2c70ecd3d07353e1c51c320642cdf3?hp=f2ad6c961c68a0fd49e180906bc75cb577f23041 Merge branch 'master' of http://github.com/twain47/Nominatim --- diff --git a/data/gb_postcode.sql b/data/gb_postcode.sql index 119574d5..487de9d5 100644 --- a/data/gb_postcode.sql +++ b/data/gb_postcode.sql @@ -1696067,3 +1696067,4 @@ COPY gb_postcode (id, postcode, geometry) FROM stdin; -- PostgreSQL database dump complete -- +GRANT SELECT ON TABLE gb_postcode TO "www-data"; diff --git a/sql/functions.sql b/sql/functions.sql index 548362ad..382cb003 100644 --- a/sql/functions.sql +++ b/sql/functions.sql @@ -2178,7 +2178,7 @@ BEGIN FOR location IN select * from get_addressdata(for_place_id) where isaddress order by rank_address desc LOOP currresult := trim(get_name_by_language(location.name, languagepref)); - IF currresult != prevresult AND currresult IS NOT NULL THEN + IF currresult != prevresult AND currresult IS NOT NULL AND result[(100 - location.rank_address)] IS NULL THEN result[(100 - location.rank_address)] := trim(get_name_by_language(location.name, languagepref)); prevresult := currresult; END IF;