X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ca53f9c1bf1576e4750483ee9538b1de49e141ed..5f19b23f49aee9989267ac03b488049f9d681166:/lib/AddressDetails.php?ds=sidebyside diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php index 618e10c9..b62335d1 100644 --- a/lib/AddressDetails.php +++ b/lib/AddressDetails.php @@ -17,7 +17,7 @@ class AddressDetails $mLangPref = 'ARRAY['.join(',', array_map('getDBQuoted', $mLangPref)).']'; } - if (!$sHousenumber) { + if (!isset($sHousenumber)) { $sHousenumber = -1; } @@ -26,12 +26,12 @@ class AddressDetails $sSQL .= ' FROM get_addressdata('.$iPlaceID.','.$sHousenumber.')'; $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) @@ -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; }