Remove interpolation lines from placex and save them in an extra table.

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

diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index c1fd58f02ed4f612424eeebdd3d1829394207f15..dd02b7c7a2364c87ed18a10854dbd6644c4300a5 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -25,7 +25,8 @@
        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 = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':
+               ($aPointDetails['osm_type'] == 'T'?'tiger':($aPointDetails['osm_type'] == 'I'?'interpolation':'')))));

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


@@ -36,10 +37,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']))


@@ -88,20 +86,59 @@
                        echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
                }
 
                        echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
                }
 

-               if (isset($aResult['address']) || isset($aResult['askml']))
-               {
-                       echo ">";
-               }
+               $bHasDelim = false;

 
                if (isset($aResult['askml']))
                {
 
                if (isset($aResult['askml']))
                {

+                       if (!$bHasDelim)
+                       {
+                               $bHasDelim = true;
+                               echo ">";
+                       }

                        echo "\n<geokml>";
                        echo $aResult['askml'];
                        echo "</geokml>";
                }
 
                        echo "\n<geokml>";
                        echo $aResult['askml'];
                        echo "</geokml>";
                }
 

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

                if (isset($aResult['address']))
                {
                if (isset($aResult['address']))
                {

+                       if (!$bHasDelim)
+                       {
+                               $bHasDelim = true;
+                               echo ">";
+                       }

                        echo "\n";
                        foreach($aResult['address'] as $sKey => $sValue)
                        {
                        echo "\n";
                        foreach($aResult['address'] as $sKey => $sValue)
                        {


@@ -112,7 +149,7 @@
                        }
                }
 
                        }
                }
 

-               if (isset($aResult['address']) || isset($aResult['askml']))
+               if ($bHasDelim)

                {
                        echo "</place>";
                }
                {
                        echo "</place>";
                }