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

Support the same edit params for Potlatch 1 and 2

Browse source 
Trac ticket 4587
This commit is contained in:
John Firebaugh 2012-09-21 15:16:56 -07:00
parent 8523f53099
commit 20e5f756be
4 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/site_controller.rb
View file

@ -39,6 +39,21 @@ class SiteController < ApplicationController
if editor == "remote"
render :action => :index
return
end
if params[:node]
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[:gpx]
trace = Trace.find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
end
end

4
app/views/site/_potlatch.html.erb
View file

@ -42,8 +42,12 @@
// 700,600 for fixed size, 100%,100% for resizable
}
<% if @lat && @lon -%>
doSWF(<%= @lat %>,<%= @lon %>,16);
<% else -%>
var params = OSM.mapParams();
doSWF(params.lat, params.lon, params.zoom || 17);
<% end -%>
$(document).ready(function () {
$("body").on("click", "a.set_position", function () {

11
app/views/site/_potlatch2.html.erb
View file

@ -63,15 +63,8 @@
// 700,600 for fixed size, 100%,100% for resizable
}
<% if params[:node] -%>
<% bbox = Node.find(params[:node]).bbox.to_unscaled -%>
doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
<% elsif params[:way] -%>
<% bbox = Way.find(params[:way]).bbox.to_unscaled -%>
doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
<% elsif params[:gpx] -%>
<% trace = Trace.find(params[:gpx]) -%>
doSWF(<%= trace.latitude %>,<%= trace.longitude %>,16);
<% if @lat && @lon -%>
doSWF(<%= @lat %>,<%= @lon %>,16);
<% else -%>
var params = OSM.mapParams();
doSWF(params.lat, params.lon, params.zoom || 17);