respect addressdetails parameter in json output

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

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index be98fa4a738d3f8bdb6ea7c00c7937f1f74b6e2a..09b7021f314458b9774213c5017555997175ef48 100644 (file)
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -9,8 +9,8 @@
        <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="prototype-1.6.0.3.js"></script>
+       <script src="js/tiles.js"></script>
+       <script src="js/prototype-1.6.0.3.js"></script>

 
        <style>
 * {-moz-box-sizing: border-box;}
 
        <style>
 * {-moz-box-sizing: border-box;}


@@ -290,10 +290,10 @@ form{
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326"),
                 eventListeners: {
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326"),
                 eventListeners: {

-                                                                       "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;


@@ -317,7 +317,7 @@ form{
        <div id="seachheaderfade1"></div><div id="seachheaderfade2"></div><div id="seachheaderfade3"></div><div id="seachheaderfade4"></div>
 
        <div id="seachheader">
        <div id="seachheaderfade1"></div><div id="seachheaderfade2"></div><div id="seachheaderfade3"></div><div id="seachheaderfade4"></div>
 
        <div id="seachheader">

-               <form action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">
+               <form accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">

                        <table border="0" width="100%">
                                <tr>
                                        <td valign="center" style="width:30px;"><img src="images/logo.gif"></td>
                        <table border="0" width="100%">
                                <tr>
                                        <td valign="center" style="width:30px;"><img src="images/logo.gif"></td>


@@ -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>';
        }