Correct merge error in Geocode.php.

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 5713143402675e43130edb236ba94b0b77ffc519..30e74234088f2f4c22e76e11a7a6de8b36975ea5 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -163,7 +163,7 @@
                                $fSearchDiam = 0.001;
                                if ($aPlace['rank_search'] == 30)
                                {
-                                       // if a house was found, the closest road needs to be searched, to use its place id as parent_place_id of the interpolation line
+                                       // if a house was found, the closest road needs to be searched, to use its place id as parent_place_id for the interpolation line search
                                        // because a road can be closer to the point than the house from above
                                        $iRoadID = null;
                                        while(!$iRoadID && $fSearchDiam < $fMaxAreaDistance)
@@ -259,7 +259,7 @@
                        }
                        
                        // Only street found? If it's in the US we can check TIGER data for nearest housenumber
-                       if ($bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 ))
+                       if (CONST_Use_US_Tiger_Data && $bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 ))
                        {
                                $fSearchDiam = 0.001;
                                $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';