X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/12eb91b2bcc0fc543f588453418b49d3214a1be3..bd6366ea56fcc8ef76b1eb3422aa846d3569214b:/lib/lib.php?ds=sidebyside diff --git a/lib/lib.php b/lib/lib.php index 3417c95b..b2f85ca2 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -846,12 +846,12 @@ $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1'; //var_dump($sSQL); $aPlace = $oDB->getRow($sSQL); - $iPlaceID = $aPlace['place_id']; - if (PEAR::IsError($iPlaceID)) + if (PEAR::IsError($aPlace)) { - var_Dump($sSQL, $iPlaceID); + var_Dump($sSQL, $aPlace); exit; } + $iPlaceID = $aPlace['place_id']; } // The point we found might be too small - use the address to find what it is a child of @@ -884,21 +884,6 @@ return $iPlaceID; } - function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, &$aAddressRankList, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues) - { - if (!isset($_GET[$sKey])) return false; - $sValue = trim($_GET[$sKey]); - if (!$sValue) return false; - $aStructuredQuery[$sKey] = $sValue; - if ($iMinAddressRank == 0 && $iMaxAddressRank == 30) - { - $iMinAddressRank = $iNewMinAddressRank; - $iMaxAddressRank = $iNewMaxAddressRank; - } - if ($aItemListValues) $aAddressRankList = array_merge($aAddressRankList, $aItemListValues); - return true; - } - function addQuotes($s) { return "'".$s."'";