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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 2a468f893..b8fcf579e 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,156 +1,221 @@
-<%= render :partial => 'search' %>
-
-<% if params['mlon'] and params['mlat'] %>
-<% marker = true %>
-<% mlon = params['mlon'] %> 
-<% mlat = params['mlat'] %>
+<% 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 %>
-
-<% if params['lon'] and params['lat'] %>
-<% lon =  params['lon'] %>
-<% lat =  params['lat'] %>
-<% zoom =  params['zoom'] || '5' %>
-<% layers = params['layers'] %>
-<% elsif params['mlon'] and params['mlat'] %>
-<% lon = params['mlon'] %> 
-<% lat = params['mlat'] %>
-<% zoom =  params['zoom'] || '12' %>
-<% layers = params['layers'] %>
-<% elsif cookies.key?("location") %>
-<% lon,lat,zoom,layers = cookies["location"].value.first.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 =  '-0.1' %>
-<% lat =  '51.5' %>
-<% zoom =  params['zoom'] || '5' %>
-<% layers = params['layers'] %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<%= javascript_include_tag 'map.js' %>
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>
 
-<% unless @user %>
-<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
-<% end %>
+<noscript>
+  <div id="noscript">
+    <p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
+    <p>OpenStreetMap uses javascript for its slippy map.</p>
+    <p>You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.</p>
+  </div>
+</noscript>
+
+<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 its contributors.</td>
+    </tr>
+  </table>
+</div>
+
+<%
+if params['mlon'] and params['mlat'] 
+	marker = true
+	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'])
+	box = true if params['box']=="yes" 
+end
+
+# Decide on a lat lon to initialise the map with. Various ways of doing this
+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?("_osm_location")
+	lon,lat,zoom,layers = cookies["_osm_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
+	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') 
+	end
+	layers = h(params['layers']) 
+end
+%>
+
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'map.js' %>
 
 
-<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");
+
+    <% unless OSM_STATUS == :api_offline or OSM_STATUS == :database_offline %>
+    map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false });
+    map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+    map.addLayer(map.dataLayer);
+    <% end %>
+
+    <% if bbox %>
+    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
+
+    setMapExtent(bbox);
+    <%    if box %>
+    // IE requires Vector layers be initialised on page load, and not under deferred script conditions
+    Event.observe(window, 'load', function() {addBoxToMap(bbox)});
+    <%    end %>
+    <% else %>
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;
-    var layers = "<%= layers %>";
 
-    <% if params['scale'] and params['scale'].length > 0 then %>
+    <%    if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
+    <%    end %>
+
+    setMapCenter(centre, zoom);
     <% end %>
 
-    var map = createMap("map", centre, zoom);
+    <% if !layers.nil? and !layers.empty? %>
+    setMapLayers("<%= layers %>");
+    <% end %>
 
     <% if marker %>
-    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
     <% end %>
 
-    <% if layers %>
-    setMapLayers(layers);
-    <% 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 toggleData() {
+    if (map.dataLayer.visibility) {
+      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
+    } else {
+      closeSidebar();
     }
-  }        
+  }
+
+  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();
+    var extents = getMapExtent();
+
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top);
+      
+    document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;
+  }
 
-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
+  function resizeContent() {
+    var content = $("content");
+    var rightMargin = parseInt(getStyle(content, "right"));
+    var bottomMargin = parseInt(getStyle(content, "bottom"));
 
-    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
+    content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
+    content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
   }
+  
+  function resizeMap() {
+    var centre = map.getCenter();
+    var zoom = map.getZoom();
+    var sidebar_width = $("sidebar").offsetWidth;
 
-  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];
+    if (sidebar_width > 0) {
+      sidebar_width = sidebar_width + 5
     }
-    return style;
+
+    $("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);
   }
-  
+
   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 (brokenContentSize) {
+      resizeContent();
     }
-    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 ( ie ) {
-    window.onresize = handleResize;
+    resizeMap();
   }
+  
+  mapInit();
+
+  window.onload = handleResize;
+  window.onresize = handleResize;
 
-  window.onload = init;
+  <% if params['action'] == 'export' %>
+  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
+  <% end %>
 // -->
 </script>