X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/54126633f6078ebb86b53c614fcb243039e839fb..eda837a9e5dae51fbe39fbbde3c7f415af5b2a1c:/lib/template/search-xml.php diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php index c1fd58f0..6a382ebf 100644 --- a/lib/template/search-xml.php +++ b/lib/template/search-xml.php @@ -36,10 +36,7 @@ if (isset($aResult['aBoundingBox'])) { echo ' boundingbox="'; - echo $aResult['aBoundingBox'][0]; - echo ','.$aResult['aBoundingBox'][1]; - echo ','.$aResult['aBoundingBox'][2]; - echo ','.$aResult['aBoundingBox'][3]; + echo join(',',$aResult['aBoundingBox']); echo '"'; if ($bShowPolygons && isset($aResult['aPolyPoints'])) @@ -88,20 +85,59 @@ echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'"; } - if (isset($aResult['address']) || isset($aResult['askml'])) - { - echo ">"; - } + $bHasDelim = false; if (isset($aResult['askml'])) { + if (!$bHasDelim) + { + $bHasDelim = true; + echo ">"; + } echo "\n"; echo $aResult['askml']; echo ""; } + if (isset($aResult['sExtraTags'])) + { + if (!$bHasDelim) + { + $bHasDelim = true; + echo ">"; + } + echo "\n"; + foreach ($aResult['sExtraTags'] as $sKey => $sValue) + { + echo ''; + } + echo ""; + } + + if (isset($aResult['sNameDetails'])) + { + if (!$bHasDelim) + { + $bHasDelim = true; + echo ">"; + } + echo "\n"; + foreach ($aResult['sNameDetails'] as $sKey => $sValue) + { + echo ''; + echo htmlspecialchars($sValue); + echo ""; + } + echo ""; + } + if (isset($aResult['address'])) { + if (!$bHasDelim) + { + $bHasDelim = true; + echo ">"; + } echo "\n"; foreach($aResult['address'] as $sKey => $sValue) { @@ -112,7 +148,7 @@ } } - if (isset($aResult['address']) || isset($aResult['askml'])) + if ($bHasDelim) { echo ""; }