X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/25baaf530dea28b7cf3c72ba4e83f3ebed05629f..c148b768f4926d578c499d24d93dbf6ea5b0b7e2:/lib/AddressDetails.php?ds=inline diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php index 8a4005d9..2d40c84f 100644 --- a/lib/AddressDetails.php +++ b/lib/AddressDetails.php @@ -22,16 +22,16 @@ class AddressDetails } $sSQL = 'SELECT *,'; - $sSQL .= ' get_name_by_language(name,'.$mLangPref.') as localname'; + $sSQL .= ' get_name_by_language(name,'.$mLangPref.') as localname'; $sSQL .= ' FROM get_addressdata('.$iPlaceID.','.$sHousenumber.')'; - $sSQL .= ' ORDER BY rank_address desc,isaddress DESC'; + $sSQL .= ' ORDER BY rank_address DESC, isaddress DESC'; - $this->aAddressLines = chksql($oDB->getAll($sSQL)); + $this->aAddressLines = $oDB->getAll($sSQL); } private static function isAddress($aLine) { - return $aLine['isaddress'] == 't' || $aLine['type'] == 'country_code'; + return $aLine['isaddress'] || $aLine['type'] == 'country_code'; } public function getAddressDetails($bAll = false) @@ -40,7 +40,7 @@ class AddressDetails return $this->aAddressLines; } - return array_filter($this->aAddressLines, 'AddressDetails::isAddress'); + return array_filter($this->aAddressLines, array(__CLASS__, 'isAddress')); } public function getLocaleAddress() @@ -49,7 +49,7 @@ class AddressDetails $sPrevResult = ''; foreach ($this->aAddressLines as $aLine) { - if ($aLine['isaddress'] == 't' && $sPrevResult != $aLine['localname']) { + if ($aLine['isaddress'] && $sPrevResult != $aLine['localname']) { $sPrevResult = $aLine['localname']; $aParts[] = $sPrevResult; } @@ -103,7 +103,7 @@ class AddressDetails public function getAdminLevels() { $aAddress = array(); - foreach ($this->aAddressLines as $aLine) { + foreach (array_reverse($this->aAddressLines) as $aLine) { if (self::isAddress($aLine) && isset($aLine['admin_level']) && $aLine['admin_level'] < 15 @@ -114,4 +114,9 @@ class AddressDetails } return $aAddress; } + + public function debugInfo() + { + return $this->aAddressLines; + } }