From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 1 Aug 2018 21:39:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~316
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/2d7441f381c0ecd2b110b4af47fd9003c7d46773?hp=-c

Merge remote-tracking branch 'upstream/master'
---

2d7441f381c0ecd2b110b4af47fd9003c7d46773
diff --combined sql/functions.sql
index c9797a5c,ada9fb50..18ce50dc
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@@ -35,7 -35,7 +35,7 @@@ CREATE OR REPLACE FUNCTION make_standar
  DECLARE
    o TEXT;
  BEGIN
-   o := gettokenstring(transliteration(name));
+   o := public.gettokenstring(public.transliteration(name));
    RETURN trim(substr(o,1,length(o)));
  END;
  $$
@@@ -2462,7 -2462,7 +2462,7 @@@ BEGI
      select placex.place_id, osm_type, osm_id, name,
        CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class,
        CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type,
 -      admin_level, fromarea, isaddress,
 +      admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
        CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
        distance,country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id)