X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/37e74fc5cbca3082a887f02ff320f5c72254df3c..945df7f195e23425396f7fb44549ba76f1ef4fd8:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 4d3b4e7e8..94b24debf 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,136 +1,188 @@
+<% content_for :greeting do %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<% end %>
+<% end %>
+
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
+<div id="map">
+<div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
+</div> 
+
+<div id="attribution">
+<table width="100%">
+<tr>
+<td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
+<td align="right">http://openstreetmap.org/</td>
+</tr>
+<tr>
+<td colspan="2" align="center">
+Licensed under the Creative Commons Attribution-Share Alike 2.0 license
+by the OpenStreetMap project and it's contributors.
+</td>
+</table>
+</div>
+
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>
-<% mlon = params['mlon'] %> 
-<% mlat = params['mlat'] %>
-<% lon =  params['mlon'] %>
-<% lat =  params['mlat']  %>
-<% zoom =  params['zoom'] || '12' %>
-<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
+<% mlon = h(params['mlon']) %> 
+<% mlat = h(params['mlat']) %>
+<% end %>
+
+<% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
+<% bbox = true %>
+<% minlon = h(params['minlon']) %>
+<% minlat = h(params['minlat']) %>
+<% maxlon = h(params['maxlon']) %>
+<% maxlat = h(params['maxlat']) %>
+<% end %>
+
+<% if params['lon'] and params['lat'] %>
+<% lon =  h(params['lon']) %>
+<% lat =  h(params['lat']) %>
+<% zoom =  h(params['zoom'] || '5') %>
+<% layers = h(params['layers']) %>
+<% elsif params['mlon'] and params['mlat'] %>
+<% lon = h(params['mlon']) %> 
+<% lat = h(params['mlat']) %>
+<% zoom =  h(params['zoom'] || '12') %>
+<% layers = h(params['layers']) %>
+<% elsif cookies.key?("location") %>
+<% lon,lat,zoom,layers = cookies["location"].split(",") %>
+<% elsif @user and !@user.home_lon.nil? and !@user.home_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'] || '4' %>
+<% else %>
+<% session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location] %>
+<% if session[:location] %>
+<% bbox = true %>
+<% minlon = session[:location][:minlon] %>
+<% minlat = session[:location][:minlat] %>
+<% maxlon = session[:location][:maxlon] %>
+<% maxlat = session[:location][:maxlat] %>
+<% else %>
+<% lon =  '-0.1' %>
+<% lat =  '51.5' %>
+<% zoom =  h(params['zoom'] || '5') %>
+<% layers = h(params['layers']) %>
+<% end %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
-<% unless @user %>
-<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
-<% end %>
-
 
-<script type="text/javascript">
+<script type="text/javascript" defer="defer">
   <!--
-  var ie = navigator.appName.indexOf("Microsoft Internet Explorer") != -1;
+  var brokenContentSize = $("content").offsetWidth == 0;
+  var marker;
   var map;
 
-  function init(){
-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+  function mapInit(){
+    map = createMap("map");
+
+    <% if bbox %>
+    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
+
+    setMapExtent(bbox);
+    <% else %>
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;
 
     <% if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
-    var map = createMap("map", centre, zoom);
+    setMapCenter(centre, zoom);
+    <% end %>
+
+    <% if layers %>
+    setMapLayers("<%= layers %>");
+    <% end %>
 
     <% if marker %>
-    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
     <% end %>
 
+    map.events.register("zoomend", map, updateKey);
+
     map.events.register("moveend", map, updateLocation);
+    map.events.register("changelayer", map, updateLocation);
     updateLocation();
 
-    <% 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 %>
+    handleResize();
+  }
 
-    document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
-    if ( ie ) {
-      handleResize();
-    }
-  }        
+  function getPosition() {
+    return getMapCenter();
+  }
+
+  function setPosition(lat, lon, zoom) {
+    var centre = new OpenLayers.LonLat(lon, lat);
+
+    setMapCenter(centre, zoom);
+
+    if (marker)
+      removeMarkerFromMap(marker);
+
+    marker = addMarkerToMap(centre, getArrowIcon());
+  }
 
   function updateLocation() {
-    var lonlat = mercatorToLonLat(map.getCenter());
+    var lonlat = getMapCenter();
     var zoom = map.getZoom();
+    var layers = getMapLayers();
+
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
 
-    updatelinks(lonlat.lon, lonlat.lat, zoom);
+    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
   }
 
-  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 resizeContent() {
+    var content = $("content");
+    var rightMargin = parseInt(getStyle(content, "right"));
+    var bottomMargin = parseInt(getStyle(content, "bottom"));
+
+    content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
+    content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
   }
   
-  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';
+  function resizeMap() {
+    var centre = map.getCenter();
+    var zoom = map.getZoom();
+    var sidebar_width = $("sidebar").offsetWidth;
+
+    if (sidebar_width > 0) {
+      sidebar_width = sidebar_width + 5
     }
-    map.updateSize();
-    el.style.display = 'none';
-    setTimeout( function() { el.style.display = ''; }, 200 );
+
+    $("map").style.left = (sidebar_width) + "px";
+    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";
+    $("map").style.height = ($("content").offsetHeight - 2) + "px";
+
+    map.setCenter(centre, zoom);
   }
 
-  if ( ie ) {
-    window.onresize = handleResize;
+  function handleResize() {
+    if (brokenContentSize) {
+      resizeContent();
+    }
+
+    resizeMap();
   }
+  
+  mapInit();
+
+  window.onload = handleResize;
+  window.onresize = handleResize;
 
-  window.onload = init;
+  <% if params['action'] == 'export' %>
+  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
+  <% end %>
 // -->
 </script>