From: Brian Quinion <brian.quinion@mapquest.com>
Date: Mon, 9 Sep 2013 13:06:57 +0000 (+0100)
Subject: only places that are part of the address should be used as a parent
X-Git-Tag: v2.2.0~34
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5d147e76fa384566686e8402c6892fcf72869df0?hp=--cc

only places that are part of the address should be used as a parent
---

5d147e76fa384566686e8402c6892fcf72869df0
diff --git a/sql/functions.sql b/sql/functions.sql
index ab965893..6d2ae5f8 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1837,19 +1837,21 @@ BEGIN
         INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, true, location_isaddress, location.distance, location.rank_address);
 
         IF location_isaddress THEN
-            address_havelevel[location.rank_address] := true;
-            IF NOT location.isguess THEN
-                SELECT geometry FROM placex WHERE place_id = location.place_id INTO location_parent;
-            END IF;
-        END IF;
 
---RAISE WARNING '  Terms: (%) %',location, nameaddress_vector;
+          address_havelevel[location.rank_address] := true;
+          IF NOT location.isguess THEN
+            SELECT geometry FROM placex WHERE place_id = location.place_id INTO location_parent;
+          END IF;
+
+          IF location.rank_address > parent_place_id_rank THEN
+            NEW.parent_place_id = location.place_id;
+            parent_place_id_rank = location.rank_address;
+          END IF;
 
-        IF location.rank_address > parent_place_id_rank THEN
-          NEW.parent_place_id = location.place_id;
-          parent_place_id_rank = location.rank_address;
         END IF;
 
+--RAISE WARNING '  Terms: (%) %',location, nameaddress_vector;
+
       END IF;
 
     END LOOP;