Limit Osmarender zoom to 17 levels.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index bbd1a8a775887af67802e247c489a814ccf9d8eb..b8fcf579ee2c6071d78257eb204210052ad97456 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -4,112 +4,160 @@
 <% end %>
 <% end %>
 
 <% end %>
 <% end %>
 

-<% content_for :left_menu do %>
-<%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %>
-<% end %>
-
-<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
-
-<div id="map"></div> 
-
-<% if params['mlon'] and params['mlat'] %>
-<% marker = true %>
-<% mlon = params['mlon'] %> 
-<% mlat = params['mlat'] %>
-<% end %>
-
-<% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
-<% bbox = true %>
-<% minlon = params['minlon'] %>
-<% minlat = params['minlat'] %>
-<% maxlon = params['maxlon'] %>
-<% maxlat = params['maxlat'] %>
-<% 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 %>
-<% 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 =  params['zoom'] || '5' %>
-<% layers = params['layers'] %>
-<% end %>
-<% end %>
-
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>
+
+<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' %>
 
 
 <%= javascript_include_tag 'map.js' %>
 
 

-<script type="text/javascript">
+<script type="text/javascript" defer="defer">

   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
   var marker;
   var map;
 
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
   var marker;
   var map;
 

-  function init(){
+  function mapInit(){

     map = createMap("map");
 
     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 %>
     <% if bbox %>

-    var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
-    var max = lonLatToMercator(new OpenLayers.LonLat(<%= maxlon %>, <%= maxlat %>));
-    var bbox = new OpenLayers.Bounds(min.lon, min.lat, max.lon, max.lat);
+    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);

 
 

-    map.zoomToExtent(bbox);
+    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 %>
     <% else %>

-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);

     var zoom = <%= zoom %>;
 
     var zoom = <%= zoom %>;
 

-    <% if params['scale'] and params['scale'].length > 0 then %>
+    <%    if params['scale'] and params['scale'].length > 0 then %>

     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);

-    <% end %>
+    <%    end %>

 
 

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

     <% end %>
 
     <% end %>
 

-    <% if layers %>
+    <% if !layers.nil? and !layers.empty? %>

     setMapLayers("<%= layers %>");
     <% end %>
 
     <% if marker %>
     setMapLayers("<%= layers %>");
     <% end %>
 
     <% if marker %>

-    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));

     <% end %>
 
     <% end %>
 

+    map.events.register("zoomend", map, updateKey);
+

     map.events.register("moveend", map, updateLocation);
     map.events.register("moveend", map, updateLocation);

+    map.events.register("changelayer", map, updateLocation);

     updateLocation();
 
     handleResize();
   }
 
     updateLocation();
 
     handleResize();
   }
 

+  function toggleData() {
+    if (map.dataLayer.visibility) {
+      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
+    } else {
+      closeSidebar();
+    }
+  }
+

   function getPosition() {
   function getPosition() {

-    return mercatorToLonLat(map.getCenter());
+    return getMapCenter();

   }
 
   function setPosition(lat, lon, zoom) {
   }
 
   function setPosition(lat, lon, zoom) {

-    var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
+    var centre = new OpenLayers.LonLat(lon, lat);

 
 

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

 
     if (marker)
       removeMarkerFromMap(marker);
 
     if (marker)
       removeMarkerFromMap(marker);


@@ -118,13 +166,14 @@
   }
 
   function updateLocation() {
   }
 
   function updateLocation() {

-    var lonlat = mercatorToLonLat(map.getCenter());
+    var lonlat = getMapCenter();

     var zoom = map.getZoom();
     var layers = getMapLayers();
     var zoom = map.getZoom();
     var layers = getMapLayers();

+    var extents = getMapExtent();

 
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
-
-    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
+    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;

   }
 
   function resizeContent() {
   }
 
   function resizeContent() {


@@ -139,14 +188,14 @@
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();

-    var search_results_width = $("search_results").offsetWidth;
+    var sidebar_width = $("sidebar").offsetWidth;

 
 

-    if (search_results_width > 0) {
-      search_results_width = search_results_width + 5
+    if (sidebar_width > 0) {
+      sidebar_width = sidebar_width + 5

     }
 
     }
 

-    $("map").style.left = (search_results_width) + "px";
-    $("map").style.width = ($("content").offsetWidth - search_results_width) + "px";
+    $("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);
     $("map").style.height = ($("content").offsetHeight - 2) + "px";
 
     map.setCenter(centre, zoom);


@@ -159,8 +208,14 @@
 
     resizeMap();
   }
 
     resizeMap();
   }

+  
+  mapInit();

 
 

+  window.onload = handleResize;

   window.onresize = handleResize;
   window.onresize = handleResize;

-  window.onload = init;
+
+  <% if params['action'] == 'export' %>
+  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
+  <% end %>

 // -->
 </script>
 // -->
 </script>