X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c96b5b951c9d39a22cf770e2402ef296fa2a6dc4..1d06a4eef19bc91c11543f09648788593302e364:/app/views/site/index.rhtml?ds=sidebyside

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index e83261a2b..6971e5faa 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,15 +1,17 @@
+
+
 <div id="geocoder">
-  <form action="/search.html">
-    <input type="text" name="query" value="" size="60">
-    <input type="submit" value="Search">
-  </form>
+  <%= start_form_tag :controller => 'way_tag', :action => 'search' %>
+  <%= text_field 'query', 'query'%>
+  <%= submit_tag 'Search' %>
+  <%= end_form_tag %>
 </div>
 
-<div id="map" style="WIDTH: 700px; HEIGHT: 500px;"></div>
+
 
 <% lon =  params['lon'] || '-0.1' %>
 <% lat =  params['lat'] || '51.5' %>
-<% zoom =  params['zoom'] || '5' %>
+<% zoom =  params['zoom'] || '4' %>
 
 <script type="text/javascript">
   var lon = <%= lon %>;
@@ -28,62 +30,38 @@
 </script>
 <script type="text/javascript" src="/javascripts/OpenLayers.js"></script>
 
-    <script type="text/javascript">
-        <!--
-        var map, layer;
-
-
-        function init(){
-
-			OpenLayers.Util.onImageLoadError = function() {
-				this.src = "http://<%= SERVER_URL %>/javascript/img/404.png";
-			}
-            map = new OpenLayers.Map( "map", 
-				{maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxZoomLevel:18, maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
-            layer = new OpenLayers.Layer.LikeGoogle( "Mapnik", "http://tile.openstreetmap.org/", {type:'png'} );
-            map.addLayer(layer);
-            layer = new OpenLayers.Layer.LikeGoogle( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png'} );
-            map.addLayer(layer);
-
-            map.addControl(new OpenLayers.Control.LayerSwitcher());
-            map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
-
-          map.events.register("moveend", map, function() { 
-           var lonlat = map.getCenter();
-    
-           var lon_deg = (lonlat.lon / 20037508.34) * 180;
-           var lat_deg = (lonlat.lat / 20037508.34) * 180;
-           var PI = 3.14159265358979323846;
-           lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
-           var zoom = map.getZoom();
-           updatelinks(lon_deg,lat_deg,zoom);
-          });
-        }        
-
-
-        init();
-        // -->
-    </script>
-      
-      </head>
-
-  <% unless @user %>
-  <div id="gads">
-    <br>We're trialing the adverts below to support the project. Login and they go away.
-  <script type="text/javascript"><!--
-    google_ad_client = "pub-7727744269903103";
-    google_ad_width = 728;
-    google_ad_height = 90;
-    google_ad_format = "728x90_as";
-    google_ad_type = "text";
-    google_ad_channel ="";
-    google_color_border = "CCCCCC";
-    google_color_bg = "FFFFFF";
-    google_color_link = "000000";
-    google_color_url = "000080";
-    google_color_text = "000000";
-    //--></script><script type="text/javascript"
-    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-    </script>  </div>
-  <% end %>
+<script type="text/javascript">
+  <!--
+  var map, layer;
+
 
+  function init(){
+
+    OpenLayers.Util.onImageLoadError = function() {
+      this.src = "http://<%= SERVER_URL %>/javascript/img/404.png";
+    }
+    map = new OpenLayers.Map( "map", 
+        {maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxZoomLevel:18, maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
+    layer = new OpenLayers.Layer.LikeGoogle( "Mapnik", "http://tile.openstreetmap.org/", {type:'png'} );
+    map.addLayer(layer);
+    layer = new OpenLayers.Layer.LikeGoogle( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png'} );
+    map.addLayer(layer);
+
+    map.addControl(new OpenLayers.Control.LayerSwitcher());
+    map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
+
+    map.events.register("moveend", map, function() { 
+        var lonlat = map.getCenter();
+
+        var lon_deg = (lonlat.lon / 20037508.34) * 180;
+        var lat_deg = (lonlat.lat / 20037508.34) * 180;
+        var PI = 3.14159265358979323846;
+        lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
+        var zoom = map.getZoom();
+        updatelinks(lon_deg,lat_deg,zoom);
+        });
+  }        
+
+init();
+// -->
+</script>