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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index fb5327b81..35e542699 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,76 +1,75 @@
+
+
 <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 => 'geocoder', :action => 'search' %>
+  <%= text_field 'query', 'postcode'%>
+  <%= text_field 'query', 'place_name'%>
+  <%= submit_tag 'Search' %>
+  <%= end_form_tag %>
+<div id="postcode-helper">
+eg SW15 6JH
+</div>
+<div id="placename-helper">
+Essen
+</div>
 </div>
 
-<div id="map" style="WIDTH: 700px; HEIGHT: 500px;"></div>
-
-<script src="lib/OpenLayers.js"></script>
-<script type="text/javascript">
-  <!--
-  function init(){
-    var map = new OpenLayers.Map('map');
 
-    var osm_wms = new OpenLayers.Layer.WMS( "OpenStreetMap Streets",
-        "http://tile.openstreetmap.org/cgi-bin/mapserv?map=/usr/lib/cgi-bin/steve/osm.map",
-        {layers: "default_segment,segments,class_segment",
-transparent: "true", format: "image/png" });
 
-    // FIXME this should be landsat.openstreetmap.org
 
-    var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
-        "http://wms.jpl.nasa.gov/wms.cgi",
-        {layers: "modis,global_mosaic"});
+<% lon =  params['lon'] || '-0.1' %>
+<% lat =  params['lat'] || '51.5' %>
+<% zoom =  params['zoom'] || '4' %>
 
+<script type="text/javascript">
+  var lon = <%= lon %>;
+  var lat = <%= lat %>;
+  var zoom = <%= zoom %>;
+  var PI = 3.14159265358979323846;
 
-    map.addLayers([jpl_wms, osm_wms]);
-    map.zoomToFullExtent();
-  }
+  <% if params['scale'] and params['scale'].length > 0 then %>
+  zoom = Math.log(360.0/(( <% print params['scale'].to_f() %> ) * 512.0)) / Math.log(2.0);
+  <% end %>
+  zoom = zoom;
+  lon = lon * 20037508.34 / 180;
+  lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
+  lat = lat * 20037508.34 / 180;
 
-init();
-// -->
 </script>
+<script type="text/javascript" src="/javascripts/OpenLayers.js"></script>
 
+<script type="text/javascript">
+  <!--
+  var map, layer;
 
-<!--
-<div id="drag" style="WIDTH: 700px; HEIGHT: 500px;">
-  <div id='controls'>
-    <a id="zoomout" class="mapcontrol"><img src="/images/map_zoomout.png" alt="zoom out"></a>
-    <a id="zoomin" class="mapcontrol"> <img src="/images/map_zoomin.png" alt="zoom in">  </a>
-  </div>
-</div>
 
-<div id="debuginfo"></div>
--->
-<% unless @user %>
-<div id="gads">
-  <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>We're trialing adverts to support the project. Login and they go away.
-  </div>
-  <% end %>
+  function init(){
 
-  <!--
-  <script type="text/javascript">
-    lat = 0;
-    lon = 0;
-    zoom = 0;
+    OpenLayers.Util.onImageLoadError = function() {
+      this.src = "http://www.openstreetmap.org/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);
 
-    init();
-  </script>
+    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>