cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidy up some of the map bugs code

Browse source
This commit is contained in:
Tom Hughes 2011-05-07 12:49:38 +01:00
parent e7cd90f4b4
commit fb4d003ebe
11 changed files with 149 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/views/browse/_map.html.erb
View file

@ -38,13 +38,15 @@
$("area_larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
$("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
<% else if map.instance_of? MapBug %>
$("loading").innerHTML = "";
var centre = new OpenLayers.LonLat(<%= map.lon %>, <%= map.lat %>);
var zoom = 16;
setMapCenter(centre, zoom);
marker = addMarkerToMap(centre);
$("area_larger_map").href = '/?mlon=<%= map.lon %>&mlat=<%=map.lat %>';
<% elsif map.instance_of? MapBug %>
var centre = new OpenLayers.LonLat(<%= map.lon %>, <%= map.lat %>);
setMapCenter(centre, 16);
addMarkerToMap(centre);
$("loading").innerHTML = "";
$("area_larger_map").href = '/?mlon=<%= map.lon %>&mlat=<%=map.lat %>';
$("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
<% else %>
var obj_type = "<%= map.class.name.downcase %>";
@ -77,7 +79,7 @@
$("small_map").style.display = "none";
}
});
<% end end %>
<% end %>
}
window.onload = init;

46
app/views/site/index.html.erb
View file

@ -25,7 +25,7 @@
<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="javascript:void();" id="ReportBug" class="reportProblem">Report a problem</a>
<a href="#" id="reportbuganchor">Report a problem</a>
</div>
<div id="attribution">
@ -142,34 +142,23 @@ end
map.addLayer(map.dataLayer);
map.osbLayer = new OpenLayers.Layer.OpenStreetBugs("OpenStreetBugs", {
serverURL : "/api/0.6/",
iconOpen : new OpenLayers.Icon("/images/open_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
iconClosed : new OpenLayers.Icon("/images/closed_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
readonly : false,
setCookie : false,
cookieLifetime : 1000,
cookiePath : "/my/map/",
permalinkURL : "http://www.openstreetmap.org/",
theme : "/stylesheets/openstreetbugs.css",
visibility : false
serverURL: "/api/0.6/",
iconOpen: new OpenLayers.Icon("<%= image_path "open_bug_marker.png" %>", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
iconClosed: new OpenLayers.Icon("<%= image_path "closed_bug_marker.png" %>", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
readonly: false,
setCookie: false,
permalinkURL: "http://www.openstreetmap.org/",
theme: "<%= stylesheet_path "openstreetbugs" %>",
visibility: false
});
map.addLayer(map.osbLayer);
map.osbControl = new OpenLayers.Control.OpenStreetBugs(map.osbLayer);
map.addControl(map.osbControl);
var lBug = document.getElementById('ReportBug');
/* lBug.addEventListener('click',function (e) {
map.osbControl.activate(); document.getElementById("OpenLayers.Map_18_OpenLayers_Container").style.cursor = "crosshair" },false); */
lBug.addEventListener('click',function (e) {
map.osbControl.activate(); map.osbControl.addTemporaryMarker(map.getCenter());},false);
map.events.register("zoomend",map,function () { var zoom = map.getZoom(); var lBug = document.getElementById('ReportBug')
if (zoom > 11) { lBug.style.visibility = 'visible';} else {lBug.style.visibility = "hidden";}});
$("reportbuganchor").observe("click", addBug);
map.events.register("zoomend", map, allowBugReports);
<% end %>
<% unless object_zoom %>
@ -333,6 +322,19 @@ end
<% end %>
}
function addBug() {
map.osbControl.activate();
map.osbControl.addTemporaryMarker(map.getCenter());
}
function allowBugReports() {
if (map.getZoom() > 11) {
$("reportbuganchor").style.visibility = "visible";
} else {
$("reportbuganchor").style.visibility = "hidden";
}
}
mapInit();
Event.observe(window, "load", installEditHandler);