When invoking Potlatch on a node/way/relation object we should
normally have valid location information in the map parameters, so
use any zoom which is there if possible, otherwise fall back to an
object type specific default value.
Fixes #605.
bbox = Node.find(params[:node]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
bbox = Node.find(params[:node]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
elsif params[:way]
bbox = Way.find(params[:way]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
elsif params[:way]
bbox = Way.find(params[:way]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
elsif params[:note]
note = Note.find(params[:note])
@lat = note.lat
@lon = note.lon
elsif params[:note]
note = Note.find(params[:note])
@lat = note.lat
@lon = note.lon
elsif params[:gpx]
trace = Trace.visible_to(@user).find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
elsif params[:gpx]
trace = Trace.visible_to(@user).find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
// 700,600 for fixed size, 100%,100% for resizable
}
// 700,600 for fixed size, 100%,100% for resizable
}
+ var mapParams = OSM.mapParams();
- doSWF(<%= @lat %>,<%= @lon %>,16);
+ doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>);
- var params = OSM.mapParams();
- doSWF(params.lat, params.lon, params.zoom || 17);
+ doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
<% end -%>
$(document).ready(function () {
<% end -%>
$(document).ready(function () {
+ var mapParams = OSM.mapParams();
- doSWF(<%= @lat %>,<%= @lon %>,16);
+ doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>);
- var params = OSM.mapParams();
- doSWF(params.lat, params.lon, params.zoom || 17);
+ doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
<% end -%>
$("body").on("click", "a.set_position", function (e) {
<% end -%>
$("body").on("click", "a.set_position", function (e) {