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 d3db2eddaeb04ac376e0535b1499587fc94c7470..a17da738215b0ee0c354aa239750df4698f3999e 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -1,103 +1,87 @@
 <?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 "<reversegeocode";
+echo '<reversegeocode';

 echo " timestamp='".date(DATE_RFC822)."'";
 echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
 echo ">\n";
 
 echo " timestamp='".date(DATE_RFC822)."'";
 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))
-{
+if (empty($aPlace)) {

     if (isset($sError))
         echo "<error>$sError</error>";
     if (isset($sError))
         echo "<error>$sError</error>";

-    else
-        echo "<error>Unable to geocode</error>";
-}
-else
-{
-    echo "<result";
+    else echo '<error>Unable to geocode</error>';
+} else {
+    echo '<result';

     if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
     if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
     if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
     if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
     if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
     if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
     if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
     if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';

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

         echo ' boundingbox="';
         echo join(',', $aPlace['aBoundingBox']);
         echo '"';
     }
 
         echo ' boundingbox="';
         echo join(',', $aPlace['aBoundingBox']);
         echo '"';
     }
 

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

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

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

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

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

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

-    echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
+    echo '>'.htmlspecialchars($aPlace['langaddress']).'</result>';

 
 

-    if (isset($aPlace['aAddress']))
-    {
-        echo "<addressparts>";
-        foreach($aPlace['aAddress'] as $sKey => $sValue)
-        {
-            $sKey = str_replace(' ','_',$sKey);
+    if (isset($aPlace['address'])) {
+        echo '<addressparts>';
+        foreach ($aPlace['address']->getAddressNames() as $sKey => $sValue) {
+            $sKey = str_replace(' ', '_', $sKey);

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

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

     }
 
     }
 

-    if (isset($aPlace['sExtraTags']))
-    {
-        echo "<extratags>";
-        foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
-        {
+    if (isset($aPlace['sExtraTags'])) {
+        echo '<extratags>';
+        foreach ($aPlace['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($aPlace['sNameDetails']))
-    {
-        echo "<namedetails>";
-        foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
-        {
+    if (isset($aPlace['sNameDetails'])) {
+        echo '<namedetails>';
+        foreach ($aPlace['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($aPlace['askml']))
-    {
+    if (isset($aPlace['askml'])) {

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

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

     }
     }

-

 }
 
 }
 

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