consider possibility that values with number in near start of search might be a house...

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

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 3b664e544d3d9f503007f341edcdca05ac5e7cb4..f701379329a41d17065ebe59b47525c916283997 100644 (file)
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -9,7 +9,7 @@
        <link href="nominatim.xml" rel="search" title="Nominatim Search" type="application/opensearchdescription+xml" />
 
        <script src="js/OpenLayers.js"></script>
        <link href="nominatim.xml" rel="search" title="Nominatim Search" type="application/opensearchdescription+xml" />
 
        <script src="js/OpenLayers.js"></script>

-       <script src="js/OpenStreetMap.js"></script>
+       <script src="js/tiles.js"></script>

        <script src="js/prototype-1.6.0.3.js"></script>
 
        <style>
        <script src="js/prototype-1.6.0.3.js"></script>
 
        <style>


@@ -293,7 +293,7 @@ form{
                                                                        "moveend": mapEventMove,
                                                                }
                } );
                                                                        "moveend": mapEventMove,
                                                                }
                } );

-                       map.addLayer(new OpenLayers.Layer.OSM.Mapnik("Mapnik"));
+                       map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));

 
                        var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
                        layer_style.fillOpacity = 0.2;
 
                        var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
                        layer_style.fillOpacity = 0.2;


@@ -372,7 +372,10 @@ target="_blank">FAQ</a></td>
                echo ' <span class="name">'.$aResult['name'].'</span>';
                echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],3).'</span>';
                echo ' <span class="place_id">'.$aResult['place_id'].'</span>';
                echo ' <span class="name">'.$aResult['name'].'</span>';
                echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],3).'</span>';
                echo ' <span class="place_id">'.$aResult['place_id'].'</span>';

-               echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
+               if (isset($aResult['label']))
+                       echo ' <span class="type">('.$aResult['label'].')</span>';
+               else
+                       echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';

                echo ' <span class="details">(<a href="details.php?place_id='.$aResult['place_id'].'">details</a>)</span>';
                echo '</div>';
        }
                echo ' <span class="details">(<a href="details.php?place_id='.$aResult['place_id'].'">details</a>)</span>';
                echo '</div>';
        }