</noscript>
<div id="map">
+ <div id="permalink">
+ <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a><br/>
+ <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+ <a href="#" id="createnoteanchor">Report a problem</a>
+ </div>
</div>
<iframe id="linkloader" style="display: none">
</iframe>
-<div id="permalink">
- <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
- <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
- <a href="#" id="reportbuganchor">Report a problem</a>
-</div>
-
<div id="attribution">
<table width="100%">
<tr>
- <td align="left"><%= t'site.index.license.license_url' %></td>
- <td align="right"><%= t'site.index.license.project_url' %></td>
+ <td class="attribution_license"><%= t'site.index.license.license_url' %></td>
+ <td class="attribution_project"><%= t'site.index.license.project_url' %></td>
</tr>
<tr>
- <td colspan="2" align="center"><%=
+ <td colspan="2" class="attribution_notice"><%=
t'site.index.license.notice',
:license_name => t('site.index.license.license_name'),
:project_name => t('site.index.license.project_name')
end
# Decide on a lat lon to initialise the map with. Various ways of doing this
-if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+if params['bbox']
+ bbox = true
+ minlon, minlat, maxlon, maxlat = h(params['bbox']).split(",")
+ layers = h(params['layers'])
+ box = true if params['box']=="yes"
+ object_zoom = false
+elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
bbox = true
minlon = h(params['minlon'])
minlat = h(params['minlat'])
lat = @user.home_lat
zoom = '10'
else
- session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
+ unless STATUS == :database_readonly or STATUS == :database_offline
+ session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
+ end
if session[:location]
bbox = true
<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
-<%= javascript_include_tag 'openstreetbugs.js' %>
+<%= javascript_include_tag 'notes.js' %>
<%= javascript_include_tag 'map.js' %>
-<script type="text/javascript" defer="defer">
- <!--
- var brokenContentSize = $("content").offsetWidth == 0;
+<%= render :partial => 'resize' %>
+
+<script type="text/javascript">
var marker;
var map;
map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
map.addLayer(map.dataLayer);
- map.osbLayer = new OpenLayers.Layer.OpenStreetBugs("Notes", {
- serverURL: "/api/0.6/",
- iconOpen: new OpenLayers.Icon("<%= image_path "open_note_marker.png" %>", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
- iconClosed: new OpenLayers.Icon("<%= image_path "closed_noe_marker.png" %>", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
- readonly: false,
+ map.noteLayer = new OpenLayers.Layer.Notes("Notes", {
setCookie: false,
permalinkURL: "http://www.openstreetmap.org/",
- theme: "<%= stylesheet_path "openstreetbugs" %>",
- visibility: false
+ visibility: <%= params[:notes] == "yes" %>
});
- map.addLayer(map.osbLayer);
+ map.addLayer(map.noteLayer);
- map.osbControl = new OpenLayers.Control.OpenStreetBugs(map.osbLayer);
- map.addControl(map.osbControl);
+ map.noteControl = new OpenLayers.Control.Notes(map.noteLayer);
+ map.addControl(map.noteControl);
- $("reportbuganchor").observe("click", addBug);
+ $("createnoteanchor").observe("click", addNote);
- map.events.register("zoomend", map, allowBugReports);
+ map.events.register("zoomend", map, allowNoteReports);
<% end %>
<% unless object_zoom %>
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) });
+ Event.observe(window, "load", function() { addBoxToMap(bbox) });
<% end %>
<% else %>
var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
url += "/full";
<% end %>
- // IE requires Vector layers be initialised on page load, and not under deferred script conditions
- Event.observe(window, 'load', function() { addObjectToMap(url, <%= object_zoom %>) });
+ Event.observe(window, "load", function() { addObjectToMap(url, <%= object_zoom %>) });
<% end %>
map.events.register("moveend", map, updateLocation);
document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
}
- 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 resizeMap() {
- var centre = map.getCenter();
- var zoom = map.getZoom();
- var sidebar_width = $("sidebar").offsetWidth;
-
- if (sidebar_width > 0) {
- sidebar_width = sidebar_width + 5
- }
-
- $("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() {
- if (brokenContentSize) {
- resizeContent();
- }
-
- resizeMap();
- }
-
function remoteEditHandler(event) {
var extent = getMapExtent();
var loaded = false;
<% end %>
}
- function addBug() {
- map.osbControl.activate();
- map.osbControl.addTemporaryMarker(map.getCenter());
+ function addNote() {
+ map.noteControl.activate();
+ map.noteControl.addTemporaryMarker(map.getCenter());
}
- function allowBugReports() {
+ function allowNoteReports() {
if (map.getZoom() > 11) {
- $("reportbuganchor").style.visibility = "visible";
+ $("createnoteanchor").style.visibility = "visible";
} else {
- $("reportbuganchor").style.visibility = "hidden";
+ $("createnoteanchor").style.visibility = "hidden";
}
}
- mapInit();
+ document.observe("dom:loaded", mapInit);
+ document.observe("dom:loaded", installEditHandler);
+ document.observe("dom:loaded", handleResize);
+
+ Event.observe(window, "resize", function() {
+ var centre = map.getCenter();
+ var zoom = map.getZoom();
- Event.observe(window, "load", installEditHandler);
- Event.observe(window, "load", handleResize);
- Event.observe(window, "resize", handleResize);
+ handleResize();
+
+ map.setCenter(centre, zoom);
+ });
<% if params['action'] == 'export' %>
<%= remote_function :url => { :controller => 'export', :action => 'start' } %>
<% end %>
-// -->
</script>
projects / rails.git / blobdiff