Merge pull request #436 from lonvia/remove-location-property-tables

[nominatim.git] / website / hierarchy.php

diff --git a/website/hierarchy.php b/website/hierarchy.php
index 5e3d7299db68d8513d5bbdec3e9b348a828dc995..6a281aa871dc01415130c69d87545536aafeb1de 100755 (executable)
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -47,13 +47,13 @@
 
        $iPlaceID = (int)$_GET['place_id'];
 
 
        $iPlaceID = (int)$_GET['place_id'];
 

-       $sAuxHouseNumber = false;
-       $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID);
-       if ($iParentPlaceID)
+       if (CONST_Use_US_Tiger_Data)

        {
        {

-               $iPlaceID = $iParentPlaceID;
+               $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID);
+               if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;

        }
        }

-       else
+
+       if (CONST_Use_Aux_Location_data)

        {
                $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID);
                if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
        {
                $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID);
                if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;