very minor ui niggles

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 1d8444221482a3fbbc96c9722e24122a21727863..fa31d848ba2f3ab39806270f5e63a1360c366cb5 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -8,34 +8,51 @@
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 

-<div id="map"></div> 
+<div id="map">
+<div id="datalink"><%= link_to_remote 'See Data', {:url => {:controller => 'browse', :action => 'start'}}, {:href => url_for( {:controller => 'browse', :action => 'index'}), :id => 'browseanchor', :title => 'browse data'} %></div>
+<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 %>
 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>

-<% mlon = params['mlon'] %> 
-<% mlat = params['mlat'] %>
+<% mlon = h(params['mlon']) %> 
+<% mlat = h(params['mlat']) %>

 <% end %>
 
 <% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
 <% bbox = true %>
 <% 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'] %>
+<% minlon = h(params['minlon']) %>
+<% minlat = h(params['minlat']) %>
+<% maxlon = h(params['maxlon']) %>
+<% maxlat = h(params['maxlat']) %>

 <% end %>
 
 <% if params['lon'] and params['lat'] %>
 <% end %>
 
 <% if params['lon'] and params['lat'] %>

-<% lon =  params['lon'] %>
-<% lat =  params['lat'] %>
-<% zoom =  params['zoom'] || '5' %>
-<% layers = params['layers'] %>
+<% lon =  h(params['lon']) %>
+<% lat =  h(params['lat']) %>
+<% zoom =  h(params['zoom'] || '5') %>
+<% layers = h(params['layers']) %>

 <% elsif params['mlon'] and params['mlat'] %>
 <% elsif params['mlon'] and params['mlat'] %>

-<% lon = params['mlon'] %> 
-<% lat = params['mlat'] %>
-<% zoom =  params['zoom'] || '12' %>
-<% layers = params['layers'] %>
+<% lon = h(params['mlon']) %> 
+<% lat = h(params['mlat']) %>
+<% zoom =  h(params['zoom'] || '12') %>
+<% layers = h(params['layers']) %>

 <% elsif cookies.key?("location") %>
 <% elsif cookies.key?("location") %>

-<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
+<% 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 %>
 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>


@@ -51,39 +68,38 @@
 <% else %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% else %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>

-<% zoom =  params['zoom'] || '5' %>
-<% layers = params['layers'] %>
+<% zoom =  h(params['zoom'] || '5') %>
+<% layers = h(params['layers']) %>

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

     <% else %>
     <% else %>

-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    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 zoom = <%= zoom %>;
 
     <% if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 

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

     <% end %>
 
     <% if layers %>
     <% end %>
 
     <% if layers %>


@@ -91,23 +107,26 @@
     <% end %>
 
     <% if marker %>
     <% 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();
   }
 
   function getPosition() {
     updateLocation();
 
     handleResize();
   }
 
   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);


@@ -116,7 +135,7 @@
   }
 
   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();
 


@@ -157,8 +176,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>