include the type (not just class) in the dedupe

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

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 450f8fb567d8bc594f242ef8767b89ba9f110d0c..9989bb31aa0a515ffe508f3aef4a68be5563ee59 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\" ?";


@@ -8,13 +7,13 @@
 
        echo "<reversegeocode";
        echo " timestamp='".date(DATE_RFC822)."'";
 
        echo "<reversegeocode";
        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($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
        echo ">\n";
 
        if (!sizeof($aPlace))
        {
        echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
        echo ">\n";
 
        if (!sizeof($aPlace))
        {

-               if ($sError)
+               if (isset($sError))

                        echo "<error>$sError</error>";
                else
                        echo "<error>Unable to geocode</error>";
                        echo "<error>$sError</error>";
                else
                        echo "<error>Unable to geocode</error>";


@@ -29,7 +28,7 @@
                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>";
                        foreach($aAddress as $sKey => $sValue)
                        {
                        echo "<addressparts>";
                        foreach($aAddress as $sKey => $sValue)
                        {


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

-        }
+               }

        }
        }

-       
+

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