<% content_for :greeting do %>
-<% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% 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 %>
-<% 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>
+<%= 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>
+</table>
+</div>
<% 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 %>
-<% 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'] %>
-<% 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'] %>
-<% 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(",") %>
+<% 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 %>
<% else %>
<% lon = '-0.1' %>
<% lat = '51.5' %>
-<% zoom = params['zoom'] || '5' %>
-<% layers = params['layers'] %>
+<% zoom = h(params['zoom'] || '5') %>
<% end %>
+<% layers = h(params['layers']) %>
<% 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' %>
-<script type="text/javascript">
+<script type="text/javascript" defer="defer">
<!--
var brokenContentSize = $("content").offsetWidth == 0;
var marker;
var map;
- function init(){
+ function mapInit(){
map = createMap("map");
+ map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false });
+ map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+ map.addLayer(map.dataLayer);
+
<% 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 %>
- 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 %>
- map.setCenter(centre, zoom);
+ setMapCenter(centre, zoom);
<% end %>
- <% if marker %>
- marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+ <% if !layers.nil? and !layers.empty? %>
+ setMapLayers("<%= layers %>");
<% end %>
- <% if layers %>
- setMapLayers("<%= layers %>");
+ <% if marker %>
+ 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();
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 = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
+ var centre = new OpenLayers.LonLat(lon, lat);
- map.setCenter(centre, zoom);
+ setMapCenter(centre, zoom);
if (marker)
removeMarkerFromMap(marker);
}
function updateLocation() {
- var lonlat = mercatorToLonLat(map.getCenter());
+ var lonlat = getMapCenter();
var zoom = map.getZoom();
var layers = getMapLayers();
updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
- document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
+ document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;
}
function resizeContent() {
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);
resizeMap();
}
+
+ mapInit();
+ window.onload = handleResize;
window.onresize = handleResize;
- window.onload = init;
+
+ <% if params['action'] == 'export' %>
+ <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
+ <% end %>
// -->
</script>
projects / rails.git / blobdiff