]> git.openstreetmap.org Git - nominatim.git/commitdiff
only places that are part of the address should be used as a parent
authorBrian Quinion <brian.quinion@mapquest.com>
Mon, 9 Sep 2013 13:06:57 +0000 (14:06 +0100)
committerBrian Quinion <brian.quinion@mapquest.com>
Mon, 9 Sep 2013 13:07:33 +0000 (14:07 +0100)
sql/functions.sql

index ab9658939aa4fa90cd2d7fed437d5e87d842a87c..6d2ae5f8cfd6b99011a56369b5f73a17e6e8b852 100644 (file)
@@ -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;