From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 19 Jun 2019 21:16:43 +0000 (+0200)
Subject: generally remove all country and state places from address
X-Git-Tag: v3.4.0~32^2~2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/b0e6fb73c6ccabbc28464e5a9910ef7bd3293e0e?ds=sidebyside;hp=dd50f1737b1032f92b4e884a08354caad44571f9

generally remove all country and state places from address

Gets rid of the hard-coded expection for place nodes and sets
the address rank generally via the address level config instead.
That means only administrative boundaries are now used at that
level in addresses.
---

diff --git a/settings/address-levels.json b/settings/address-levels.json
index c29266ac..8a47f7e5 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,
diff --git a/sql/functions.sql b/sql/functions.sql
index 8a5c9bc5..0cfeaf0c 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