X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/69158665f3dfa5dbede350cc2aa4e58342480de1..b982bc6b19a3b14eba653088d917c6fe514db396:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index a7dbd15e3..f8c0f02f4 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,101 +1,174 @@
-<div id="geocoder">
-  <form action="/search.html">
-    <input type="text" name="query" value="" size="60">
-    <input type="submit" value="Search">
-  </form>
-</div>
-
-<div id="map" style="WIDTH: 700px; HEIGHT: 500px;"></div>
-
+<%= render :partial => 'search' %>
+
+<% if params['mlon'] and params['mlat'] %>
+<% marker = true %>
+<% mlon = params['mlon'] %> 
+<% mlat = params['mlat'] %>
+<% lon =  params['mlon'] %>
+<% lat =  params['mlat']  %>
+<% zoom =  params['zoom'] || '12' %>
+<script type="text/javascript">
+  var mlat = <%= lat %>;
+  var mlon = <%= lon %>;
+</script>
+<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
+<% lon =  @user.home_lon %>
+<% lat =  @user.home_lat %>
+<% zoom = '10' %>
+<%else%>
 <% lon =  params['lon'] || '-0.1' %>
 <% lat =  params['lat'] || '51.5' %>
-<% zoom =  params['zoom'] || '11' %>
+<% zoom =  params['zoom'] || '4' %>
+<% end %>
+
+
 
 <script type="text/javascript">
-  var lon = <%= lon %>;
   var lat = <%= lat %>;
+  var lon = <%= lon %>;
   var zoom = <%= zoom %>;
   var PI = 3.14159265358979323846;
 
+
+
   <% 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 -3;
+  zoom = zoom;
   lon = lon * 20037508.34 / 180;
   lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
   lat = lat * 20037508.34 / 180;
+  <% if marker %>
+  mlon = mlon * 20037508.34 / 180;
+  mlat = Math.log(Math.tan( (90 + mlat) * PI / 360)) / (PI / 180);
+  mlat = mlat * 20037508.34 / 180;
+  <%end%>
 
 </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://www.openstreetmap.org/javascript/img/404.png";
-			}
-            map = new OpenLayers.Map( "map", 
-				{maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
-            layer = new OpenLayers.Layer.LikeGoogle( "Mapnik", "http://artem.dev.openstreetmap.org/osm_tiles/", {type:'png'} );
-            map.addLayer(layer);
-            layer = new OpenLayers.Layer.LikeGoogle( "Osmarender", "http://osmathome.bandnet.org/Tiles/", {type:'png'} );
-            map.addLayer(layer);
-            layer = new OpenLayers.Layer.WMS( "Mapnik WMS-C", "http://labs.metacarta.com/wms-c/Basic.py?", {layers:'osm-merc'});
-            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() + 3;
-           updatelinks(lon_deg,lat_deg,zoom);
-          });
-        }        
-
-
-        init();
-        // -->
-    </script>
-      
-      </head>
-
-  <% 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 %>
+<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 
+<script type="text/javascript">
   <!--
-  <script type="text/javascript">
-    lat = 0;
-    lon = 0;
-    zoom = 0;
-
-    init();
-    </script>
-
-    -->
+  var map, layer, markers;
+  var ie6 = ! ( window.addEventListener || window.XMLHttpRequest );
+
+  function init(){
+
+    OpenLayers.Util.onImageLoadError = function() {
+      this.src = OpenLayers.Util.getImagesLocation() + "404.png";
+    }
+    map = new OpenLayers.Map( "map", 
+        {maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), numZoomLevels:19, maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
+    layer = new OpenLayers.Layer.TMS( "Mapnik", "http://tile.openstreetmap.org/", {type:'png', getURL:getTileURL} );
+    map.addLayer(layer);
+    layer = new OpenLayers.Layer.TMS( "Osmarender", "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/", {type:'png', getURL:getTileURL} );
+    map.addLayer(layer);
+
+    //Marker stuff
+
+    <% if marker %>
+    markers = new OpenLayers.Layer.Markers("markers");
+    map.addLayer(markers); 
+
+    marker = new OpenLayers.Marker(new OpenLayers.LonLat(mlon,mlat));
+    markers.addMarker(marker);
+    <%end%>
+
+    map.setOptions({theme:''});
+    map.addControl(new OpenLayers.Control.LayerSwitcher());
+    map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
+
+    map.events.register("moveend", map, updateLocation);
+    document.getElementById( 'map_OpenLayers_ViewPort' ).style.position = 'absolute';
+    if( ie6 ) {
+      handleResize();
+    }
+    updateLocation();
+  }        
+
+  function getTileURL( bounds ) {
+    var res = this.map.getResolution();
+    var x = Math.round ((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+    var y = Math.round ((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
+    var z = this.map.getZoom();
+    return this.url + z + "/" + x + "/" + y + "." + this.type; 
+  }
+
+  function updateLocation() {
+    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);
+  }
+
+  function getStyle( el, property ) {
+    var style;
+    if( el.currentStyle ) {
+        style = el.currentStyle[property];
+    } else if( window.getComputedStyle ) {
+        style = document.defaultView.getComputedStyle(el,null).getPropertyValue(property);
+    } else {
+        style = el.style[property];
+    }
+    return style;
+  }
+  
+  function handleResize() {
+    var el = document.getElementById( 'map' );
+    var left = getStyle( el, 'left' );
+    var top = getStyle( el, 'top' );
+    var bottom = getStyle( el, 'bottom' );
+    var right = getStyle( el, 'right' );
+    var width = el.old_width;
+    if( ! width ) {
+        width = getStyle( el, 'width' );
+    }
+    var height = el.old_height;
+    if( ! height ) {
+        height = getStyle( el, 'height' );
+    }
+    var pwidth, pheight;
+    if( el.offsetParent.nodeName == 'BODY' || el.offsetParent.nodeName == 'HTML' ) {
+      if( typeof( window.innerWidth ) == 'number' ) {
+          pwidth = window.innerWidth;
+          height = window.innerHeight;
+      } else if( document.documentElement &&
+          ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
+          pwidth = document.documentElement.clientWidth;
+          pheight = document.documentElement.clientHeight;
+      } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
+          pwidth = document.body.clientWidth;
+          pheight = document.body.clientHeight;
+      }
+    } else {
+      pwidth = el.offsetParent.offsetWidth;
+      pheight = el.offsetParent.offsetHeight;
+    }
+    if( left != 'auto' && right != 'auto' && width == 'auto' ) {
+      el.old_width = width;
+      var new_width = (pwidth - el.offsetLeft - parseInt( right ) );
+      el.style.width = new_width + 'px';
+    }
+    if( top != 'auto' && bottom != 'auto' && height == 'auto' ) {
+      el.old_height = height;
+      var new_height = (pheight - el.offsetTop - parseInt( bottom ) );
+      el.style.height = new_height + 'px';
+    }
+    map.updateSize();
+    el.style.display = 'none';
+    setTimeout( function() {
+        el.style.display = '';
+        }, 200 );
+  }
+
+if( ie6 ) {
+  window.onresize = handleResize;
+}
+window.onload = init;
+// -->
+</script>