hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessayly nested ifs

Browse Source 
Found by Sonarqube.
This commit is contained in:
Sarah Hoffmann
2021-07-11 19:11:37 +02:00
parent 1cdc30c5e8
commit d933ead2b5
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib-php/AddressDetails.php
View File

@@ -79,12 +79,11 @@ class AddressDetails
$sName = $aLine['housenumber']; $sName = $aLine['housenumber'];
} }
if (isset($sName)) { if (isset($sName)
if (!isset($aAddress[$sTypeLabel]) && (!isset($aAddress[$sTypeLabel])
|| $aLine['class'] == 'place' || $aLine['class'] == 'place')
) { ) {
$aAddress[$sTypeLabel] = $sName; $aAddress[$sTypeLabel] = $sName;
}
} }
} }

6
lib-php/Geocode.php
View File

@@ -817,10 +817,8 @@ class Geocode
// No results? Done // No results? Done
if (empty($aResults)) { if (empty($aResults)) {
if ($this->bFallback) { if ($this->bFallback && $this->fallbackStructuredQuery()) {
if ($this->fallbackStructuredQuery()) { return $this->lookup();
return $this->lookup();
}
} }
return array(); return array();

16
lib-php/ParameterParser.php
View File

@@ -90,16 +90,16 @@ class ParameterParser
$aLanguages = array(); $aLanguages = array();
$sLangString = $this->getString('accept-language', $sFallback); $sLangString = $this->getString('accept-language', $sFallback);
if ($sLangString) { if ($sLangString
if (preg_match_all('/(([a-z]{1,8})([-_][a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) { && preg_match_all('/(([a-z]{1,8})([-_][a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)
foreach ($aLanguagesParse as $iLang => $aLanguage) { ) {
$aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100); foreach ($aLanguagesParse as $iLang => $aLanguage) {
if (!isset($aLanguages[$aLanguage[2]])) { $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
$aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10; if (!isset($aLanguages[$aLanguage[2]])) {
} $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
} }
arsort($aLanguages);
} }
arsort($aLanguages);
} }
if (empty($aLanguages) && CONST_Default_Language) { if (empty($aLanguages) && CONST_Default_Language) {
$aLanguages[CONST_Default_Language] = 1; $aLanguages[CONST_Default_Language] = 1;