From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 13 Jun 2018 22:16:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~322
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/bfd36863a0f238bffef8806978aebde4dd312768?hp=1d8e2961f0527a548989c1e38bb062f2f9e5877e

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

diff --git a/docs/admin/Import-and-Update.md b/docs/admin/Import-and-Update.md
index 26ed9eb9..25954ba0 100644
--- a/docs/admin/Import-and-Update.md
+++ b/docs/admin/Import-and-Update.md
@@ -108,7 +108,7 @@ instance by following these steps:
        * Ubuntu: `sudo apt-get install python-gdal unzip`
        * CentOS: `sudo yum install gdal-python unzip`
 
-  2. Get preprocessed TIGER 2015 data and unpack it into the
+  2. Get preprocessed TIGER 2017 data and unpack it into the
      data directory in your Nominatim sources:
 
         cd Nominatim/data
@@ -135,13 +135,9 @@ You can also process the data from the original TIGER data to create the
 SQL files, Nominatim needs for the import:
 
   1. Get the TIGER 2017 data. You will need the EDGES files
-     (3,234 zip files, 11GB total). Choose one of the two sources:
+     (3,234 zip files, 11GB total).
 
          wget -r ftp://ftp2.census.gov/geo/tiger/TIGER2017/EDGES/
-         wget -r ftp://mirror1.shellbot.com/census/geo/tiger/TIGER2017/EDGES/
-
-     The first one is the original source, the second a considerably faster
-     mirror.
 
   2. Convert the data into SQL statements: 
 
diff --git a/sql/partition-functions.src.sql b/sql/partition-functions.src.sql
index cc11cf96..9ae020e4 100644
--- a/sql/partition-functions.src.sql
+++ b/sql/partition-functions.src.sql
@@ -96,7 +96,7 @@ BEGIN
       SELECT place_id, name_vector, address_rank, search_rank,
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
-          WHERE name_vector @> isin_token
+          WHERE name_vector && isin_token
           AND ST_DWithin(centroid, point, 0.015)
           AND search_rank between 26 and 27
       ORDER BY distance ASC limit 1
@@ -124,7 +124,7 @@ BEGIN
       SELECT place_id, name_vector, address_rank, search_rank,
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
-          WHERE name_vector @> isin_token
+          WHERE name_vector && isin_token
           AND ST_DWithin(centroid, point, 0.03) 
           AND search_rank between 16 and 22
       ORDER BY distance ASC limit 1
diff --git a/test/bdd/db/import/parenting.feature b/test/bdd/db/import/parenting.feature
index 87467fd2..a3648539 100644
--- a/test/bdd/db/import/parenting.feature
+++ b/test/bdd/db/import/parenting.feature
@@ -441,3 +441,22 @@ Feature: Parenting of objects
          | object | parent_place_id |
          | N1     | W2 |
 
+    # github #1056
+    Scenario: Full names should be preferably matched for nearest road
+        Given the grid
+            | 1 |   | 2 | 5 |
+            |   |   |   |   |
+            | 3 |   |   | 4 |
+            |   | 10|   |   |
+        And the places
+            | osm | class   | type    | name+name               | geometry |
+            | W1  | highway | residential | Via Cavassico superiore | 1, 2 |
+            | W3  | highway | residential | Via Cavassico superiore | 2, 5 |
+            | W2  | highway | primary | Via Frazione Cavassico  | 3, 4     |
+        And the named places
+            | osm | class   | type    | addr+street             |
+            | N10 | shop    | yes     | Via Cavassico superiore |
+        When importing
+        Then placex contains
+          | object | parent_place_id |
+          | N10    | W1 |