X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b2b6892a4553eeaa8d601737dee440eba0c6d6a6..4d1633585feddb414a967f0df83be5c63cc0ffad:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index fb5327b81..c182a924d 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,76 +1,143 @@
-<div id="geocoder">
-  <form action="/search.html">
-    <input type="text" name="query" value="" size="60">
-    <input type="submit" value="Search">
-  </form>
-</div>
+<%= render :partial => 'search' %>
+
+<% if params['mlon'] and params['mlat'] %>
+<% marker = true %>
+<% mlon = params['mlon'] %> 
+<% mlat = params['mlat'] %>
+<% end %>
+
+<% if params['lon'] and params['lat'] %>
+<% lon =  params['lon'] %>
+<% lat =  params['lat'] %>
+<% zoom =  params['zoom'] || '4' %>
+<% elsif params['mlon'] and params['mlat'] %>
+<% lon = params['mlon'] %> 
+<% lat = params['mlat'] %>
+<% zoom =  params['zoom'] || '12' %>
+<% elsif @user %> 
+<% lon =  @user.home_lon %>
+<% lat =  @user.home_lat %>
+<% zoom = '10' %>
+<% else %>
+<% lon =  '-0.1' %>
+<% lat =  '51.5' %>
+<% zoom =  params['zoom'] || '4' %>
+<% end %>
+
+<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag 'map.js' %>
+
+<% unless @user %>
+<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
+<% end %>
 
-<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 ie = navigator.appName.indexOf("Microsoft Internet Explorer") != -1;
+  var 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" });
+  function init(){
+    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    var zoom = <%= zoom %>;
 
-    // FIXME this should be landsat.openstreetmap.org
+    <% if params['scale'] and params['scale'].length > 0 then %>
+    zoom = scaleToZoom(<%= params['scale'].to_f() %>);
+    <% end %>
 
-    var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
-        "http://wms.jpl.nasa.gov/wms.cgi",
-        {layers: "modis,global_mosaic"});
+    var map = createMap("map", centre, zoom);
 
+    <% if marker %>
+    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    <% end %>
 
-    map.addLayers([jpl_wms, osm_wms]);
-    map.zoomToFullExtent();
-  }
+    map.events.register("moveend", map, updateLocation);
+    updateLocation();
 
-init();
-// -->
-</script>
+    <% unless @user %>
+    if ( window.location.hostname == "www.openstreetmap.org" ) { 
+      mappam.register( map, '10011756636067178496', '1');
+    } else if( window.location.hostname == "openstreetmap.org" ) {
+      mappam.register( map, '6738410720121976832', '1');
+    }
+    <% end %>
 
+    document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
+    if ( ie ) {
+      handleResize();
+    }
+  }        
 
-<!--
-<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>
+  function updateLocation() {
+    var lonlat = mercatorToLonLat(map.getCenter());
+    var zoom = map.getZoom();
 
-<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 %>
+    updatelinks(lonlat.lon, lonlat.lat, zoom);
+  }
 
-  <!--
-  <script type="text/javascript">
-    lat = 0;
-    lon = 0;
-    zoom = 0;
+  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;
+    var height;
+    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;
+          pheight = 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 );
+  }
 
-    init();
-  </script>
+  if ( ie ) {
+    window.onresize = handleResize;
+  }
 
-  -->
+  window.onload = init;
+// -->
+</script>