Merge remote-tracking branch 'upstream/master' into cmake-port

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

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index ba085eea9fd27b757270659d8a6e374b0dbf7c5a..2bfcffbf5ac0b3a3d8bb6b0e646e3139b5b90697 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -22,11 +22,38 @@
        {
                echo "<result";
                if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
-               $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+               $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']))
+               {
+                       echo ' boundingbox="';
+                       echo join(',', $aPlace['aBoundingBox']);
+                       echo '"';
+               }
+
+               if (isset($aPlace['asgeojson']))
+               {
+                       echo ' geojson=\'';
+                       echo $aPlace['asgeojson'];
+                       echo '\'';
+               }
+
+               if (isset($aPlace['assvg']))
+               {
+                       echo ' geosvg=\'';
+                       echo $aPlace['assvg'];
+                       echo '\'';
+               }
+
+               if (isset($aPlace['astext']))
+               {
+                       echo ' geotext=\'';
+                       echo $aPlace['astext'];
+                       echo '\'';
+               }
                echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
                if (isset($aPlace['aAddress']))
@@ -47,9 +74,7 @@
                        echo "<extratags>";
                        foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
                        {
-                               echo '<tag key="'.htmlspecialchars($sKey).'">';
-                               echo htmlspecialchars($sValue);
-                               echo "</tag>";
+                               echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
                        }
                        echo "</extratags>";
                }
@@ -59,12 +84,20 @@
                        echo "<namedetails>";
                        foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
                        {
-                               echo '<name key="'.htmlspecialchars($sKey).'">';
+                               echo '<name desc="'.htmlspecialchars($sKey).'">';
                                echo htmlspecialchars($sValue);
                                echo "</name>";
                        }
                        echo "</namedetails>";
                }
+
+               if (isset($aPlace['askml']))
+               {
+                       echo "\n<geokml>";
+                       echo $aPlace['askml'];
+                       echo "</geokml>";
+               }
+
        }
 
        echo "</reversegeocode>";