Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / template / search-xml.php

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 80091b0aeedecc123c4ab0e3d4f7c2a2bacd7aed..80414fce6829be2f18534e06431aabbb2b9f8db3 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -10,16 +10,13 @@ echo (isset($sXmlRootTag)?$sXmlRootTag:'searchresults');
 echo " timestamp='".date(DATE_RFC822)."'";
 echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
-if ($sViewBox) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
-echo " polygon='".($bShowPolygons?'true':'false')."'";
-if (sizeof($aExcludePlaceIDs))
+if (isset($aMoreParams['viewbox'])) echo " viewbox='".htmlspecialchars($aMoreParams['viewbox'], ENT_QUOTES)."'";
+echo " polygon='".(isset($aMoreParams['polygon'])?'true':'false')."'";
+if (isset($aMoreParams['exclude_place_ids']))
 {
-    echo " exclude_place_ids='".htmlspecialchars(join(',',$aExcludePlaceIDs))."'";
-}
-if ($sMoreURL)
-{
-    echo " more_url='".htmlspecialchars($sMoreURL)."'";
+    echo " exclude_place_ids='".htmlspecialchars($aMoreParams['exclude_place_ids'])."'";
 }
+echo " more_url='".htmlspecialchars($sMoreURL)."'";
 echo ">\n";
 
 foreach($aSearchResults as $iResNum => $aResult)
@@ -39,7 +36,7 @@ foreach($aSearchResults as $iResNum => $aResult)
         echo join(',',$aResult['aBoundingBox']);
         echo '"';
 
-        if ($bShowPolygons && isset($aResult['aPolyPoints']))
+        if (isset($aResult['aPolyPoints']))
         {
             echo ' polygonpoints=\'';
             echo json_encode($aResult['aPolyPoints']);