Implement geocoding and reverse geocoding with tiger interpolation lines instead...

[nominatim.git] / website / lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index b6ecbd639aed3189be464d8ba5f4cc95a919c1aa..dfa09d3b7ffe8a84d5fc2484b5633340b0157d1e 100755 (executable)
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -1,7 +1,8 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Reverse');
 
 <?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/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
 


@@ -27,10 +28,6 @@
                $sOutputFormat = $_GET['format'];
        }
 
                $sOutputFormat = $_GET['format'];
        }
 

-       // Show address breakdown
-       $bShowAddressDetails = true;
-       if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
-

        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();
 
        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();
 


@@ -42,7 +39,9 @@
        {
                $oPlaceLookup = new PlaceLookup($oDB);
                $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
        {
                $oPlaceLookup = new PlaceLookup($oDB);
                $oPlaceLookup->setLanguagePreference($aLangPrefOrder);

-               $oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
+               $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
+               $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
+               $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));

                
                $aOsmIds = explode(',', $_GET['osm_ids']);
                
                
                $aOsmIds = explode(',', $_GET['osm_ids']);