From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 4 Jun 2017 12:55:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~386
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/1020a888346295466acc6cd3c366760f434d3f6c?hp=4d0a119b9e4b4675b0f2b5609bbcd64610349f2a

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index efd5315d..7ebd6b9d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,6 +33,7 @@ Please add the following information to your issue:
  * hardware configuration: RAM size, kind of disks
  * Operating system (also mention if you are running on a cloud server)
  * Postgres and Postgis version
+ * list of settings you changed in your Postgres configuration
  * Nominatim version (commit id, if you run from the github repo)
  * (if applicable) exact command line of the command that was causing the issues
 
diff --git a/sql/functions.sql b/sql/functions.sql
index 434ab318..8b1372d4 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1491,7 +1491,7 @@ BEGIN
     IF relation_members IS NOT NULL THEN
       FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['label']) as member LOOP
 
-        FOR linkedPlacex IN select * from placex where osm_type = upper(substring(relMember.member,1,1))::char(1) 
+        FOR linkedPlacex IN select * from placex where osm_type = upper(substring(relMember.member,1,1))::"char"
           and osm_id = substring(relMember.member,2,10000)::bigint order by rank_search desc limit 1 LOOP
 
           -- If we don't already have one use this as the centre point of the geometry
@@ -1522,7 +1522,7 @@ BEGIN
 
         FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['admin_center','admin_centre']) as member LOOP
 
-          FOR linkedPlacex IN select * from placex where osm_type = upper(substring(relMember.member,1,1))::char(1) 
+          FOR linkedPlacex IN select * from placex where osm_type = upper(substring(relMember.member,1,1))::"char"
             and osm_id = substring(relMember.member,2,10000)::bigint order by rank_search desc limit 1 LOOP
 
             -- For an admin centre we also want a name match - still not perfect, for example 'new york, new york'
@@ -1571,7 +1571,7 @@ BEGIN
         make_standard_name(name->'name') = make_standard_name(NEW.name->'name')
         AND placex.rank_address = NEW.rank_address
         AND placex.place_id != NEW.place_id
-        AND placex.osm_type = 'N'::char(1) AND placex.rank_search < 26
+        AND placex.osm_type = 'N' AND placex.rank_search < 26
         AND st_covers(NEW.geometry, placex.geometry)
       LOOP
 
@@ -1621,7 +1621,7 @@ BEGIN
 
     -- Still null? how about looking it up by the node id
     IF NEW.importance IS NULL THEN
-      select language||':'||title,importance from wikipedia_article where osm_type = 'N'::char(1) and osm_id = linked_node_id order by importance desc limit 1 INTO NEW.wikipedia,NEW.importance;
+      select language||':'||title,importance from wikipedia_article where osm_type = 'N' and osm_id = linked_node_id order by importance desc limit 1 INTO NEW.wikipedia,NEW.importance;
     END IF;
 
   END IF;