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

Avoid errors when /edit is called on an invalid object

Browse source
This commit is contained in:
Tom Hughes 2019-12-16 21:23:09 +00:00
parent 60e1ddb6be
commit ac6a872a48
3 changed files with 117 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
app/controllers/site_controller.rb
View file

@ -77,26 +77,30 @@ class SiteController < ApplicationController
)
end
if params[:node]
bbox = Node.find(params[:node]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
@zoom = 18
elsif params[:way]
bbox = Way.find(params[:way]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
@zoom = 17
elsif params[:note]
note = Note.find(params[:note])
@lat = note.lat
@lon = note.lon
@zoom = 17
elsif params[:gpx] && current_user
trace = Trace.visible_to(current_user).find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
@zoom = 16
begin
if params[:node]
bbox = Node.visible.find(params[:node]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
@zoom = 18
elsif params[:way]
bbox = Way.visible.find(params[:way]).bbox.to_unscaled
@lat = bbox.centre_lat
@lon = bbox.centre_lon
@zoom = 17
elsif params[:note]
note = Note.visible.find(params[:note])
@lat = note.lat
@lon = note.lon
@zoom = 17
elsif params[:gpx] && current_user
trace = Trace.visible_to(current_user).find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
@zoom = 16
end
rescue ActiveRecord::RecordNotFound
# don't try and derive a location from a missing/deleted object
end
end