Merge pull request #219 from mizabrik/master

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index ac0b4bdd65b25279fb12ee21da5cf3d441fcb900..31944974070007e8aca276c287c2c0a48cc9f90b 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -1,7 +1,8 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Search');
 
-       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/Geocode.php');
 
@@ -9,11 +10,6 @@
 
        $oDB =& getDB();
 
-       // Display defaults
-       $fLat = CONST_Default_Lat;
-       $fLon = CONST_Default_Lon;
-       $iZoom = CONST_Default_Zoom;
-
        $oGeocode = new Geocode($oDB);
 
        $aLangPrefOrder = getPreferredLanguages();
@@ -119,8 +115,6 @@
        if ($sOutputFormat=='html')
        {
                $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-               $sTileURL = CONST_Map_Tile_URL;
-               $sTileAttribution = CONST_Map_Tile_Attribution;
        }
        logEnd($oDB, $hLog, sizeof($aSearchResults));