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 94bb7ec96a44cdbfae7a150e6044883650a4ead2..68d985f3cc3111fd6f7aece1cce916efb7bb3f73 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -11,7 +11,6 @@ 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 (isset($aMoreParams['viewbox'])) echo " viewbox='".htmlspecialchars($aMoreParams['viewbox'], ENT_QUOTES)."'";
 echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
 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($aMoreParams['exclude_place_ids'])."'";
 }
 if (isset($aMoreParams['exclude_place_ids'])) {
     echo " exclude_place_ids='".htmlspecialchars($aMoreParams['exclude_place_ids'])."'";
 }


@@ -31,12 +30,6 @@ foreach ($aSearchResults as $iResNum => $aResult) {
         echo ' boundingbox="';
         echo join(',', $aResult['aBoundingBox']);
         echo '"';
         echo ' boundingbox="';
         echo join(',', $aResult['aBoundingBox']);
         echo '"';

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

     }
 
     if (isset($aResult['asgeojson'])) {
     }
 
     if (isset($aResult['asgeojson'])) {


@@ -116,7 +109,7 @@ foreach ($aSearchResults as $iResNum => $aResult) {
             echo '>';
         }
         echo "\n";
             echo '>';
         }
         echo "\n";

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

             $sKey = str_replace(' ', '_', $sKey);
             echo "<$sKey>";
             echo htmlspecialchars($sValue);
             $sKey = str_replace(' ', '_', $sKey);
             echo "<$sKey>";
             echo htmlspecialchars($sValue);