adapt to code style conventions

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index ca823d3cdf60d1be6d1da3cfa4ae4e2dc1e06dfa..fd1f5c27c2f7cb43683d4315dee6bc5f67da67d9 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,8 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-       require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
@@ -102,13 +103,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);
 
-               foreach($aOutlineResult as $k => $v)
+               if ($aOutlineResult)
                {
-                       $aPlace[$k] = $v;
+                       $aPlace = array_merge($aPlace, $aOutlineResult);
                }
-
        }
        else
        {