<?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 "<";
+echo '<';
echo (isset($sXmlRootTag)?$sXmlRootTag:'searchresults');
echo " timestamp='".date(DATE_RFC822)."'";
echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
-if ($sViewBox) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
-echo " polygon='".($bShowPolygons?'true':'false')."'";
-if (sizeof($aExcludePlaceIDs))
-{
- echo " exclude_place_ids='".htmlspecialchars(join(',',$aExcludePlaceIDs))."'";
-}
-if ($sMoreURL)
-{
- echo " more_url='".htmlspecialchars($sMoreURL)."'";
+if (isset($aMoreParams['viewbox'])) echo " viewbox='".htmlspecialchars($aMoreParams['viewbox'], ENT_QUOTES)."'";
+if (isset($aMoreParams['exclude_place_ids'])) {
+ echo " exclude_place_ids='".htmlspecialchars($aMoreParams['exclude_place_ids'])."'";
}
+echo " more_url='".htmlspecialchars($sMoreURL)."'";
echo ">\n";
-foreach($aSearchResults as $iResNum => $aResult)
-{
+foreach ($aSearchResults as $iResNum => $aResult) {
echo "<place place_id='".$aResult['place_id']."'";
$sOSMType = formatOSMType($aResult['osm_type']);
- if ($sOSMType)
- {
+ if ($sOSMType) {
echo " osm_type='$sOSMType'";
echo " osm_id='".$aResult['osm_id']."'";
}
echo " place_rank='".$aResult['rank_search']."'";
+ echo " address_rank='".$aResult['rank_address']."'";
- if (isset($aResult['aBoundingBox']))
- {
+ if (isset($aResult['aBoundingBox'])) {
echo ' boundingbox="';
- echo join(',',$aResult['aBoundingBox']);
+ echo join(',', $aResult['aBoundingBox']);
echo '"';
-
- if ($bShowPolygons && isset($aResult['aPolyPoints']))
- {
- echo ' polygonpoints=\'';
- echo json_encode($aResult['aPolyPoints']);
- echo '\'';
- }
}
- if (isset($aResult['asgeojson']))
- {
+ if (isset($aResult['asgeojson'])) {
echo ' geojson=\'';
echo $aResult['asgeojson'];
echo '\'';
}
- if (isset($aResult['assvg']))
- {
+ if (isset($aResult['assvg'])) {
echo ' geosvg=\'';
echo $aResult['assvg'];
echo '\'';
}
- if (isset($aResult['astext']))
- {
+ if (isset($aResult['astext'])) {
echo ' geotext=\'';
echo $aResult['astext'];
echo '\'';
}
- if (isset($aResult['zoom']))
- {
+ if (isset($aResult['zoom'])) {
echo " zoom='".$aResult['zoom']."'";
}
echo " class='".htmlspecialchars($aResult['class'])."'";
echo " type='".htmlspecialchars($aResult['type'], ENT_QUOTES)."'";
echo " importance='".htmlspecialchars($aResult['importance'])."'";
- if (isset($aResult['icon']) && $aResult['icon'])
- {
+ if (isset($aResult['icon']) && $aResult['icon']) {
echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
}
$bHasDelim = false;
- if (isset($aResult['askml']))
- {
- if (!$bHasDelim)
- {
+ if (isset($aResult['askml'])) {
+ if (!$bHasDelim) {
$bHasDelim = true;
- echo ">";
+ echo '>';
}
echo "\n<geokml>";
echo $aResult['askml'];
- echo "</geokml>";
+ echo '</geokml>';
}
- if (isset($aResult['sExtraTags']))
- {
- if (!$bHasDelim)
- {
+ if (isset($aResult['sExtraTags'])) {
+ if (!$bHasDelim) {
$bHasDelim = true;
- echo ">";
+ echo '>';
}
echo "\n<extratags>";
- foreach ($aResult['sExtraTags'] as $sKey => $sValue)
- {
+ foreach ($aResult['sExtraTags'] as $sKey => $sValue) {
echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
}
- echo "</extratags>";
+ echo '</extratags>';
}
- if (isset($aResult['sNameDetails']))
- {
- if (!$bHasDelim)
- {
+ if (isset($aResult['sNameDetails'])) {
+ if (!$bHasDelim) {
$bHasDelim = true;
- echo ">";
+ echo '>';
}
echo "\n<namedetails>";
- foreach ($aResult['sNameDetails'] as $sKey => $sValue)
- {
+ foreach ($aResult['sNameDetails'] as $sKey => $sValue) {
echo '<name desc="'.htmlspecialchars($sKey).'">';
echo htmlspecialchars($sValue);
- echo "</name>";
+ echo '</name>';
}
- echo "</namedetails>";
+ echo '</namedetails>';
}
- if (isset($aResult['address']))
- {
- if (!$bHasDelim)
- {
+ if (isset($aResult['address'])) {
+ if (!$bHasDelim) {
$bHasDelim = true;
- echo ">";
+ echo '>';
}
echo "\n";
- foreach($aResult['address'] as $sKey => $sValue)
- {
- $sKey = str_replace(' ','_',$sKey);
+ foreach ($aResult['address']->getAddressNames() as $sKey => $sValue) {
+ $sKey = str_replace(' ', '_', $sKey);
echo "<$sKey>";
echo htmlspecialchars($sValue);
echo "</$sKey>";
}
}
- if ($bHasDelim)
- {
- echo "</place>";
- }
- else
- {
- echo "/>";
+ if ($bHasDelim) {
+ echo '</place>';
+ } else {
+ echo '/>';
}
}
-echo "</" . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . ">";
+echo '</' . (isset($sXmlRootTag)?$sXmlRootTag:'searchresults') . '>';