merge in the postcode and is_in terms into the address vector for search

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

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 0521de0ec960c1f1a9b53d18e8d6b6d31672dc9e..be05cb40c85b336b44bb241f9b80fac39a0c0c09 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,6 +1,5 @@
 <?php
        header("content-type: text/xml; charset=UTF-8");
 <?php
        header("content-type: text/xml; charset=UTF-8");

-       header("Access-Control-Allow-Origin: *");

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


@@ -8,7 +7,7 @@
 
        echo "<searchresults";
        echo " timestamp='".date(DATE_RFC822)."'";
 
        echo "<searchresults";
        echo " timestamp='".date(DATE_RFC822)."'";

-       echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";
+       echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";

        echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
        if (isset($sViewBox)) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
        echo " polygon='".($bShowPolygons?'true':'false')."'";
        echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
        if (isset($sViewBox)) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
        echo " polygon='".($bShowPolygons?'true':'false')."'";


@@ -45,11 +44,32 @@
                        if ($bShowPolygons && isset($aResult['aPolyPoints']))
                        {
                                echo ' polygonpoints=\'';
                        if ($bShowPolygons && isset($aResult['aPolyPoints']))
                        {
                                echo ' polygonpoints=\'';

-                               echo javascript_renderData($aResult['aPolyPoints']);
+                               echo json_encode($aResult['aPolyPoints']);

                                echo '\'';
                        }
                }
 
                                echo '\'';
                        }
                }
 

+               if (isset($aResult['asgeojson']))
+               {
+                       echo ' geojson=\'';
+                       echo $aResult['asgeojson'];
+                       echo '\'';
+               }
+
+               if (isset($aResult['assvg']))
+               {
+                       echo ' geosvg=\'';
+                       echo $aResult['assvg'];
+                       echo '\'';
+               }
+
+               if (isset($aResult['astext']))
+               {
+                       echo ' geotext=\'';
+                       echo $aResult['astext'];
+                       echo '\'';
+               }
+

                if (isset($aResult['zoom']))
                {
                        echo " zoom='".$aResult['zoom']."'";
                if (isset($aResult['zoom']))
                {
                        echo " zoom='".$aResult['zoom']."'";


@@ -61,14 +81,27 @@
 
                echo " class='".htmlspecialchars($aResult['class'])."'";
                echo " type='".htmlspecialchars($aResult['type'])."'";
 
                echo " class='".htmlspecialchars($aResult['class'])."'";
                echo " type='".htmlspecialchars($aResult['type'])."'";

-               if ($aResult['icon'])
+               echo " importance='".htmlspecialchars($aResult['importance'])."'";
+               if (isset($aResult['icon']) && $aResult['icon'])

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

-               if (isset($aResult['address']))
+               if (isset($aResult['address']) || isset($aResult['askml']))

                {
                        echo ">";
                {
                        echo ">";

+               }
+
+               if (isset($aResult['askml']))
+               {
+                       echo "\n<geokml>";
+                       echo $aResult['askml'];
+                       echo "</geokml>";
+               }
+
+               if (isset($aResult['address']))
+               {
+                       echo "\n";

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


@@ -76,7 +109,10 @@
                                echo htmlspecialchars($sValue);
                                echo "</$sKey>";
                        }
                                echo htmlspecialchars($sValue);
                                echo "</$sKey>";
                        }

+               }

 
 

+               if (isset($aResult['address']) || isset($aResult['askml']))
+               {

                        echo "</place>";
                }
                else
                        echo "</place>";
                }
                else