From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Jul 2019 20:34:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~276
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/b522ea6dc77f39132d6ab4b288fb18c25d2104c0?hp=b8ebc169b104dae171731288a5a8a7b569d22530

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

diff --git a/settings/address-levels.json b/settings/address-levels.json
index c29266ac..c13b681b 100644
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -3,8 +3,8 @@
       "place" : {
           "sea" : [2, 0],
           "continent" : [2, 0],
-          "country" : [4, 4],
-          "state" : [8, 8],
+          "country" : [4, 0],
+          "state" : [8, 0],
           "region" : [18, 0],
           "county" : 12,
           "city" : 16,
@@ -83,6 +83,16 @@
           "neighbourhood" : [30, 0]
       }
   }
+},
+{ "countries" : [ "de" ],
+  "tags" : {
+      "place" : {
+          "county" : [12, 0]
+      },
+      "boundary" : {
+          "administrative5" : [10, 0]
+      }
+  }
 }
 ]
 
diff --git a/sql/functions.sql b/sql/functions.sql
index 75ccfd68..97f78d24 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -887,11 +887,7 @@ BEGIN
     END IF;
 
     -- some postcorrections
-    IF NEW.class = 'place' THEN
-      IF NEW.type in ('continent', 'sea', 'country', 'state') AND NEW.osm_type = 'N' THEN
-        NEW.rank_address := 0;
-      END IF;
-    ELSEIF NEW.class = 'waterway' AND NEW.osm_type = 'R' THEN
+    IF NEW.class = 'waterway' AND NEW.osm_type = 'R' THEN
         -- Slightly promote waterway relations so that they are processed
         -- before their members.
         NEW.rank_search := NEW.rank_search - 1;
@@ -908,11 +904,6 @@ BEGIN
     NEW.country_code := NULL;
   END IF;
 
--- Block import below rank 22
---  IF NEW.rank_search > 22 THEN
---    RETURN NULL;
---  END IF;
-
   --DEBUG: RAISE WARNING 'placex_insert:END: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
 
   RETURN NEW; -- %DIFFUPDATES% The following is not needed until doing diff updates, and slows the main index process down
diff --git a/test/bdd/db/import/placex.feature b/test/bdd/db/import/placex.feature
index 0284736b..f17d09df 100644
--- a/test/bdd/db/import/placex.feature
+++ b/test/bdd/db/import/placex.feature
@@ -220,8 +220,8 @@ Feature: Import into placex
           | R21    | 30          | 30 |
           | R22    | 30          | 30 |
           | R23    | 30          | 30 |
-          | R40    | 4           | 4 |
-          | R41    | 8           | 8 |
+          | R40    | 4           | 0 |
+          | R41    | 8           | 0 |
 
     Scenario: search and address ranks for highways correctly assigned
         Given the scene roads-with-pois