remove unused variables

As reported by sonarqube.
This commit is contained in:
Sarah Hoffmann
2021-07-09 16:36:42 +02:00
parent 106d960f84
commit 500c61685b
6 changed files with 4 additions and 20 deletions

View File

@@ -61,7 +61,7 @@ class AddressDetails
return join(', ', $aParts); return join(', ', $aParts);
} }
public function getAddressNames($sCountry = null) public function getAddressNames()
{ {
$aAddress = array(); $aAddress = array();

View File

@@ -78,7 +78,7 @@ class Debug
echo '<th>Address Tokens</th><th>Address Not</th>'; echo '<th>Address Tokens</th><th>Address Not</th>';
echo '<th>country</th><th>operator</th>'; echo '<th>country</th><th>operator</th>';
echo '<th>class</th><th>type</th><th>postcode</th><th>housenumber</th></tr>'; echo '<th>class</th><th>type</th><th>postcode</th><th>housenumber</th></tr>';
foreach ($aSearches as $iRank => $aRankedSet) { foreach ($aSearches as $aRankedSet) {
foreach ($aRankedSet as $aRow) { foreach ($aRankedSet as $aRow) {
$aRow->dumpAsHtmlTableRow($aWordsIDs); $aRow->dumpAsHtmlTableRow($aWordsIDs);
} }

View File

@@ -417,7 +417,7 @@ class Geocode
$iSearchCount = 0; $iSearchCount = 0;
$aSearches = array(); $aSearches = array();
foreach ($aGroupedSearches as $iScore => $aNewSearches) { foreach ($aGroupedSearches as $aNewSearches) {
$iSearchCount += count($aNewSearches); $iSearchCount += count($aNewSearches);
$aSearches = array_merge($aSearches, $aNewSearches); $aSearches = array_merge($aSearches, $aNewSearches);
if ($iSearchCount > 50) break; if ($iSearchCount > 50) break;
@@ -503,10 +503,6 @@ class Geocode
Debug::newSection('Query Preprocessing'); Debug::newSection('Query Preprocessing');
$sLanguagePrefArraySQL = $this->oDB->getArraySQL(
$this->oDB->getDBQuotedList($this->aLangPrefOrder)
);
$sQuery = $this->sQuery; $sQuery = $this->sQuery;
if (!preg_match('//u', $sQuery)) { if (!preg_match('//u', $sQuery)) {
userError('Query string is not UTF-8 encoded.'); userError('Query string is not UTF-8 encoded.');
@@ -891,15 +887,8 @@ class Geocode
$aToFilter = $aSearchResults; $aToFilter = $aSearchResults;
$aSearchResults = array(); $aSearchResults = array();
$bFirst = true;
foreach ($aToFilter as $aResult) { foreach ($aToFilter as $aResult) {
$this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id']; $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
if ($bFirst) {
$fLat = $aResult['lat'];
$fLon = $aResult['lon'];
if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
$bFirst = false;
}
if (!$this->oPlaceLookup->doDeDupe() || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']]) if (!$this->oPlaceLookup->doDeDupe() || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']])) && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))
) { ) {

View File

@@ -74,8 +74,6 @@ class ReverseGeocode
protected function lookupLargeArea($sPointSQL, $iMaxRank) protected function lookupLargeArea($sPointSQL, $iMaxRank)
{ {
$oResult = null;
if ($iMaxRank > 4) { if ($iMaxRank > 4) {
$aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
if ($aPlace) { if ($aPlace) {
@@ -190,7 +188,6 @@ class ReverseGeocode
if ($aPoly) { if ($aPoly) {
// if a polygon is found, search for placenodes begins ... // if a polygon is found, search for placenodes begins ...
$iParentPlaceID = $aPoly['parent_place_id'];
$iRankAddress = $aPoly['rank_address']; $iRankAddress = $aPoly['rank_address'];
$iRankSearch = $aPoly['rank_search']; $iRankSearch = $aPoly['rank_search'];
$iPlaceID = $aPoly['place_id']; $iPlaceID = $aPoly['place_id'];
@@ -356,7 +353,6 @@ class ReverseGeocode
$oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
$oResult->iHouseNumber = closestHouseNumber($aHouse); $oResult->iHouseNumber = closestHouseNumber($aHouse);
$aPlace = $aHouse; $aPlace = $aHouse;
$iRankAddress = 30;
} }
} }

View File

@@ -415,7 +415,6 @@ class SearchDescription
public function query(&$oDB, $iMinRank, $iMaxRank, $iLimit) public function query(&$oDB, $iMinRank, $iMaxRank, $iLimit)
{ {
$aResults = array(); $aResults = array();
$iHousenumber = -1;
if ($this->sCountryCode if ($this->sCountryCode
&& empty($this->aName) && empty($this->aName)

View File

@@ -105,7 +105,7 @@ class Tokenizer
// now compute all possible tokens // now compute all possible tokens
$aWordLists = array(); $aWordLists = array();
$aTokens = array(); $aTokens = array();
foreach ($aNormPhrases as $sTitle => $sPhrase) { foreach ($aNormPhrases as $sPhrase) {
if (strlen($sPhrase) > 0) { if (strlen($sPhrase) > 0) {
$aWords = explode(' ', $sPhrase); $aWords = explode(' ', $sPhrase);
Tokenizer::addTokens($aTokens, $aWords); Tokenizer::addTokens($aTokens, $aWords);