Merge pull request #385 from mtmail/query-lastupdated-only-for-html-output

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

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 9989bb31aa0a515ffe508f3aef4a68be5563ee59..39d9a14792171a0c0d0cd0efc60ff8fa73c7257b 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -22,15 +22,17 @@
        {
                echo "<result";
                if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
        {
                echo "<result";
                if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';

-               if ($aPlace['osm_type'] && $aPlace['osm_id']) echo ' osm_type="'.($aPlace['osm_type']=='N'?'node':($aPlace['osm_type']=='W'?'way':'relation')).'"'.' osm_id="'.$aPlace['osm_id'].'"';
+               $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+               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']).'"';
                echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
                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']).'"';
                echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 

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

                        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,6 +41,28 @@
                        }
                        echo "</addressparts>";
                }
                        }
                        echo "</addressparts>";
                }

+
+               if (isset($aPlace['sExtraTags']))
+               {
+                       echo "<extratags>";
+                       foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
+                       {
+                               echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+                       }
+                       echo "</extratags>";
+               }
+
+               if (isset($aPlace['sNameDetails']))
+               {
+                       echo "<namedetails>";
+                       foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
+                       {
+                               echo '<name desc="'.htmlspecialchars($sKey).'">';
+                               echo htmlspecialchars($sValue);
+                               echo "</name>";
+                       }
+                       echo "</namedetails>";
+               }

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