second argument of array_merge can be empty

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 18b47e1ddc5d1bcb2dd9a0a833ba4b660e91557e..c216c8848c3a07063fd448e92d1a2222ba1da2fa 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -13,19 +13,20 @@
        $fLat = CONST_Default_Lat;
        $fLon = CONST_Default_Lon;
        $iZoom = CONST_Default_Zoom;
        $fLat = CONST_Default_Lat;
        $fLon = CONST_Default_Lon;
        $iZoom = CONST_Default_Zoom;

-       $sSuggestionURL = false;

 
        $oGeocode =& new Geocode($oDB);
 
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 
 
        $oGeocode =& new Geocode($oDB);
 
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 

-    /*
-       if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
-       if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
-       if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
-       if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);
-    */
+       if (CONST_Search_ReversePlanForAll
+               || isset($aLangPrefOrder['name:de'])
+               || isset($aLangPrefOrder['name:ru'])
+               || isset($aLangPrefOrder['name:ja'])
+               || isset($aLangPrefOrder['name:pl']))
+       {
+               $oGeocode->setReverseInPlan(true);
+       }

 
        // Format for output
        $sOutputFormat = 'html';
 
        // Format for output
        $sOutputFormat = 'html';


@@ -47,11 +48,11 @@
                $bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
                $bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
                if ( ( ($bAsGeoJSON?1:0)
                $bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
                $bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
                if ( ( ($bAsGeoJSON?1:0)

-                    + ($bAsKML?1:0)
-                    + ($bAsSVG?1:0)
-                    + ($bAsText?1:0)
-                    + ($bAsPoints?1:0)
-                    ) > CONST_PolygonOutput_MaximumTypes)
+                                + ($bAsKML?1:0)
+                                + ($bAsSVG?1:0)
+                                + ($bAsText?1:0)
+                                + ($bAsPoints?1:0)
+                                ) > CONST_PolygonOutput_MaximumTypes)

                {
                        if (CONST_PolygonOutput_MaximumTypes)
                        {
                {
                        if (CONST_PolygonOutput_MaximumTypes)
                        {


@@ -91,31 +92,36 @@
                }
                include(CONST_BasePath.'/lib/template/search-batch-json.php');
                exit;
                }
                include(CONST_BasePath.'/lib/template/search-batch-json.php');
                exit;

-       } else {
-        if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
-        {
-            $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
-
-            // reverse order of '/' separated string
-            $aPhrases = explode('/', $sQuery);
-            $aPhrases = array_reverse($aPhrases);
-            $sQuery = join(', ',$aPhrases);
-            $oGeocode->setQuery($sQuery);
-        }
-        else
-        {
-            $oGeocode->setQueryFromParams($_GET);
-        }
-
-    }
+       }
+       else
+       {
+               if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
+               {
+                       $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
+
+                       // reverse order of '/' separated string
+                       $aPhrases = explode('/', $sQuery);
+                       $aPhrases = array_reverse($aPhrases);
+                       $sQuery = join(', ',$aPhrases);
+                       $oGeocode->setQuery($sQuery);
+               }
+               else
+               {
+                       $oGeocode->setQueryFromParams($_GET);
+               }
+       }

 
        $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 
        $aSearchResults = $oGeocode->lookup();
        if ($aSearchResults === false) $aSearchResults = array();
 
 
        $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 
        $aSearchResults = $oGeocode->lookup();
        if ($aSearchResults === false) $aSearchResults = array();
 

-       $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-
+       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));
 
        $bAsText = $oGeocode->getIncludePolygonAsText();
        logEnd($oDB, $hLog, sizeof($aSearchResults));
 
        $bAsText = $oGeocode->getIncludePolygonAsText();


@@ -124,10 +130,12 @@
        $bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
        $aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
 
        $bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
        $aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
 

-       $sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
+       $sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());

        if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
        if ($bShowPolygons) $sMoreURL .= '&polygon=1';
        if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';
        if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
        if ($bShowPolygons) $sMoreURL .= '&polygon=1';
        if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';

+       if ($oGeocode->getIncludeExtraTags()) $sMoreURL .= '&extratags=1';
+       if ($oGeocode->getIncludeNameDetails()) $sMoreURL .= '&namedetails=1';

        if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox);
        if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
        $sMoreURL .= '&q='.urlencode($sQuery);
        if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox);
        if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
        $sMoreURL .= '&q='.urlencode($sQuery);