Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index b6ecbd639aed3189be464d8ba5f4cc95a919c1aa..51abe1f2ed6dd79aa0ad24b5e7edddadd980053f 100755 (executable)
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -27,10 +27,6 @@
                $sOutputFormat = $_GET['format'];
        }
 
-       // Show address breakdown
-       $bShowAddressDetails = true;
-       if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
-
        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();
 
@@ -42,7 +38,9 @@
        {
                $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']);