Merge pull request #436 from lonvia/remove-location-property-tables

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

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index b61ff22f55fe2eed589466c682a8f650ac14b52b..54217933ef7d8962a5e3934b3186b6ae9cb8d57d 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -25,7 +25,7 @@
        foreach($aSearchResults as $iResNum => $aResult)
        {
                echo "<place place_id='".$aResult['place_id']."'";
        foreach($aSearchResults as $iResNum => $aResult)
        {
                echo "<place place_id='".$aResult['place_id']."'";

-               $sOSMType = ($aResult['osm_type'] == 'N'?'node':($aResult['osm_type'] == 'W'?'way':($aResult['osm_type'] == 'R'?'relation':'')));
+               $sOSMType = ($aResult['osm_type'] == 'N'?'node':($aResult['osm_type'] == 'W'?'way':($aResult['osm_type'] == 'R'?'relation':($aResult['osm_type'] == 'T'?'tiger':''))));

                if ($sOSMType)
                {
                        echo " osm_type='$sOSMType'";
                if ($sOSMType)
                {
                        echo " osm_type='$sOSMType'";


@@ -36,10 +36,7 @@
                if (isset($aResult['aBoundingBox']))
                {
                        echo ' boundingbox="';
                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']))
                        echo '"';
 
                        if ($bShowPolygons && isset($aResult['aPolyPoints']))