Correct merge error in Geocode.php.

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a37455faf92c66ccc244b5142e0a32222eb8d07b..0fb333aa49b5f1eb7a6f8e469545fbd357314e55 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1502,7 +1502,6 @@
                                                                }
 
                                                                //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
                                                                }
 
                                                                //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)

-                                                               $searchedHousenumber = intval($aSearch['sHouseNumber']);

                                                                if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
                                                                {
                                                                        //new query for lines, not housenumbers anymore
                                                                if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
                                                                {
                                                                        //new query for lines, not housenumbers anymore


@@ -1682,7 +1681,8 @@
                                                        $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                        if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
                                                }
                                                        $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                        if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
                                                }

-                                               $sSQL .= ")";
+                                               $sSQL .= ") UNION select place_id from location_property_osmline where place_id in (".join(',',array_keys($aResultPlaceIDs)).")";
+                                               $sSQL .= " and (30 between $this->iMinAddressRank and $this->iMaxAddressRank)";

                                                if (CONST_Debug) var_dump($sSQL);
                                                $aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
                                                $tempIDs = array();
                                                if (CONST_Debug) var_dump($sSQL);
                                                $aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
                                                $tempIDs = array();

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 0921711e95664c607e7f4f9b5485d88a565830e6..30e74234088f2f4c22e76e11a7a6de8b36975ea5 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -163,7 +163,7 @@
                                $fSearchDiam = 0.001;
                                if ($aPlace['rank_search'] == 30)
                                {
                                $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)
                                        // because a road can be closer to the point than the house from above
                                        $iRoadID = null;
                                        while(!$iRoadID && $fSearchDiam < $fMaxAreaDistance)