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

Merge pull request #396 from mtmail/fix-array-merge-warning

Browse Source 
second argument of array_merge can be empty
This commit is contained in:
Sarah Hoffmann
2016-03-13 21:37:40 +01:00
parent 1d89098f77 22ebd1c7a9
commit b097840ba4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Geocode.php
View File

@@ -1647,8 +1647,11 @@
$oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
$aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
$aResult = array_merge($aResult, $aOutlineResult);
if ($aOutlineResult)
{
$aResult = array_merge($aResult, $aOutlineResult);
}
if ($aResult['extra_place'] == 'city')
{
$aResult['class'] = 'place';

7
website/reverse.php
View File

@@ -102,9 +102,12 @@
$oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
$fRadius = $fDiameter = getResultDiameter($aPlace);
$aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'],$aPlace['lon'],$aPlace['lat'],$fRadius);
$aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius);
$aPlace = array_merge($aPlace, $aOutlineResult);
if ($aOutlineResult)
{
$aPlace = array_merge($aPlace, $aOutlineResult);
}
}
else
{