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..68d985f3cc3111fd6f7aece1cce916efb7bb3f73 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,75 +1,56 @@
 <?php
 <?php

-header("content-type: text/xml; charset=UTF-8");
+header('content-type: text/xml; charset=UTF-8');

 
 

-echo "<";
-echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
+echo '<';
+echo '?xml version="1.0" encoding="UTF-8" ?';

 echo ">\n";
 
 echo ">\n";
 

-echo "<";
+echo '<';

 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)."'";
 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))
-{
-    echo " exclude_place_ids='".htmlspecialchars(join(',',$aExcludePlaceIDs))."'";
-}
-if ($sMoreURL)
-{
-    echo " more_url='".htmlspecialchars($sMoreURL)."'";
+if (isset($aMoreParams['viewbox'])) echo " viewbox='".htmlspecialchars($aMoreParams['viewbox'], ENT_QUOTES)."'";
+if (isset($aMoreParams['exclude_place_ids'])) {
+    echo " exclude_place_ids='".htmlspecialchars($aMoreParams['exclude_place_ids'])."'";

 }
 }

+echo " more_url='".htmlspecialchars($sMoreURL)."'";

 echo ">\n";
 
 echo ">\n";
 

-foreach($aSearchResults as $iResNum => $aResult)
-{
+foreach ($aSearchResults as $iResNum => $aResult) {

     echo "<place place_id='".$aResult['place_id']."'";
     $sOSMType = formatOSMType($aResult['osm_type']);
     echo "<place place_id='".$aResult['place_id']."'";
     $sOSMType = formatOSMType($aResult['osm_type']);

-    if ($sOSMType)
-    {
+    if ($sOSMType) {

         echo " osm_type='$sOSMType'";
         echo " osm_id='".$aResult['osm_id']."'";
     }
     echo " place_rank='".$aResult['rank_search']."'";
 
         echo " osm_type='$sOSMType'";
         echo " osm_id='".$aResult['osm_id']."'";
     }
     echo " place_rank='".$aResult['rank_search']."'";
 

-    if (isset($aResult['aBoundingBox']))
-    {
+    if (isset($aResult['aBoundingBox'])) {

         echo ' boundingbox="';
         echo ' boundingbox="';

-        echo join(',',$aResult['aBoundingBox']);
+        echo join(',', $aResult['aBoundingBox']);

         echo '"';
         echo '"';

-
-        if ($bShowPolygons && isset($aResult['aPolyPoints']))
-        {
-            echo ' polygonpoints=\'';
-            echo json_encode($aResult['aPolyPoints']);
-            echo '\'';
-        }

     }
 
     }
 

-    if (isset($aResult['asgeojson']))
-    {
+    if (isset($aResult['asgeojson'])) {

         echo ' geojson=\'';
         echo $aResult['asgeojson'];
         echo '\'';
     }
 
         echo ' geojson=\'';
         echo $aResult['asgeojson'];
         echo '\'';
     }
 

-    if (isset($aResult['assvg']))
-    {
+    if (isset($aResult['assvg'])) {

         echo ' geosvg=\'';
         echo $aResult['assvg'];
         echo '\'';
     }
 
         echo ' geosvg=\'';
         echo $aResult['assvg'];
         echo '\'';
     }
 

-    if (isset($aResult['astext']))
-    {
+    if (isset($aResult['astext'])) {

         echo ' geotext=\'';
         echo $aResult['astext'];
         echo '\'';
     }
 
         echo ' geotext=\'';
         echo $aResult['astext'];
         echo '\'';
     }
 

-    if (isset($aResult['zoom']))
-    {
+    if (isset($aResult['zoom'])) {

         echo " zoom='".$aResult['zoom']."'";
     }
 
         echo " zoom='".$aResult['zoom']."'";
     }
 


@@ -80,82 +61,67 @@ foreach($aSearchResults as $iResNum => $aResult)
     echo " class='".htmlspecialchars($aResult['class'])."'";
     echo " type='".htmlspecialchars($aResult['type'], ENT_QUOTES)."'";
     echo " importance='".htmlspecialchars($aResult['importance'])."'";
     echo " class='".htmlspecialchars($aResult['class'])."'";
     echo " type='".htmlspecialchars($aResult['type'], ENT_QUOTES)."'";
     echo " importance='".htmlspecialchars($aResult['importance'])."'";

-    if (isset($aResult['icon']) && $aResult['icon'])
-    {
+    if (isset($aResult['icon']) && $aResult['icon']) {

         echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
     }
 
     $bHasDelim = false;
 
         echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
     }
 
     $bHasDelim = false;
 

-    if (isset($aResult['askml']))
-    {
-        if (!$bHasDelim)
-        {
+    if (isset($aResult['askml'])) {
+        if (!$bHasDelim) {

             $bHasDelim = true;
             $bHasDelim = true;

-            echo ">";
+            echo '>';

         }
         echo "\n<geokml>";
         echo $aResult['askml'];
         }
         echo "\n<geokml>";
         echo $aResult['askml'];

-        echo "</geokml>";
+        echo '</geokml>';

     }
 
     }
 

-    if (isset($aResult['sExtraTags']))
-    {
-        if (!$bHasDelim)
-        {
+    if (isset($aResult['sExtraTags'])) {
+        if (!$bHasDelim) {

             $bHasDelim = true;
             $bHasDelim = true;

-            echo ">";
+            echo '>';

         }
         echo "\n<extratags>";
         }
         echo "\n<extratags>";

-        foreach ($aResult['sExtraTags'] as $sKey => $sValue)
-        {
+        foreach ($aResult['sExtraTags'] as $sKey => $sValue) {

             echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
         }
             echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
         }

-        echo "</extratags>";
+        echo '</extratags>';

     }
 
     }
 

-    if (isset($aResult['sNameDetails']))
-    {
-        if (!$bHasDelim)
-        {
+    if (isset($aResult['sNameDetails'])) {
+        if (!$bHasDelim) {

             $bHasDelim = true;
             $bHasDelim = true;

-            echo ">";
+            echo '>';

         }
         echo "\n<namedetails>";
         }
         echo "\n<namedetails>";

-        foreach ($aResult['sNameDetails'] as $sKey => $sValue)
-        {
+        foreach ($aResult['sNameDetails'] as $sKey => $sValue) {

             echo '<name desc="'.htmlspecialchars($sKey).'">';
             echo htmlspecialchars($sValue);
             echo '<name desc="'.htmlspecialchars($sKey).'">';
             echo htmlspecialchars($sValue);

-            echo "</name>";
+            echo '</name>';

         }
         }

-        echo "</namedetails>";
+        echo '</namedetails>';

     }
 
     }
 

-    if (isset($aResult['address']))
-    {
-        if (!$bHasDelim)
-        {
+    if (isset($aResult['address'])) {
+        if (!$bHasDelim) {

             $bHasDelim = true;
             $bHasDelim = true;

-            echo ">";
+            echo '>';

         }
         echo "\n";
         }
         echo "\n";

-        foreach($aResult['address'] as $sKey => $sValue)
-        {
-            $sKey = str_replace(' ','_',$sKey);
+        foreach ($aResult['address']->getAddressNames() as $sKey => $sValue) {
+            $sKey = str_replace(' ', '_', $sKey);

             echo "<$sKey>";
             echo htmlspecialchars($sValue);
             echo "</$sKey>";
         }
     }
 
             echo "<$sKey>";
             echo htmlspecialchars($sValue);
             echo "</$sKey>";
         }
     }
 

-    if ($bHasDelim)
-    {
-        echo "</place>";
-    }
-    else
-    {
-        echo "/>";
+    if ($bHasDelim) {
+        echo '</place>';
+    } else {
+        echo '/>';

     }
 }
 
     }
 }
 

-echo "</" . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . ">";
+echo '</' . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . '>';