X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6a3c6c43ea7133c934834ce1face9212f4e3d239..27bc8d4f7bb907699dbb974e8159f75bead831c9:/lib/PlaceLookup.php diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index 4fce7e36..bd6fa171 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -164,12 +164,12 @@ class PlaceLookup $aResults = $this->lookup(array($iPlaceID => new Result($iPlaceID))); - return sizeof($aResults) ? reset($aResults) : null; + return empty($aResults) ? null : reset($aResults); } public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30) { - if (!sizeof($aResults)) { + if (empty($aResults)) { return array(); } $aSubSelects = array(); @@ -408,7 +408,7 @@ class PlaceLookup if (CONST_Debug) var_dump($aSubSelects); - if (!sizeof($aSubSelects)) { + if (empty($aSubSelects)) { return array(); } @@ -462,7 +462,7 @@ class PlaceLookup return $aPlaces; } - private function getAddressDetails($iPlaceID, $bAll, $sHousenumber) + public function getAddressDetails($iPlaceID, $bAll = false, $sHousenumber = -1) { $sSQL = 'SELECT *,'; $sSQL .= ' get_name_by_language(name,'.$this->aLangPrefOrderSql.') as localname';