Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index fcd90b85e63cc6b9ea55c2accde01763244bebfa..0747844a67ac6db8a8306f0dc74152c3b36d6364 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-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\" ?";


@@ -29,9 +28,9 @@
                if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
                echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
                if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
                echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 

-        if ($bShowAddressDetails) {
+               if ($bShowAddressDetails) {

                        echo "<addressparts>";
                        echo "<addressparts>";

-                       foreach($aAddress as $sKey => $sValue)
+                       foreach($aPlace['aAddress'] as $sKey => $sValue)

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


@@ -39,7 +38,7 @@
                                echo "</$sKey>";
                        }
                        echo "</addressparts>";
                                echo "</$sKey>";
                        }
                        echo "</addressparts>";

-        }
+               }

        }
        }

-       
+

        echo "</reversegeocode>";
        echo "</reversegeocode>";