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

Use point.trace instead of an additional gpx_file variable

Browse source 
Every point knows which trace it's associated with, so there's no
need to search for it separately
This commit is contained in:
Andy Allan 2020-11-11 17:51:52 +00:00
parent a65cb84288
commit a15a3744da
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/api/tracepoints_controller.rb
View file

@ -53,24 +53,22 @@ module Api
trkseg = nil trkseg = nil
anon_track = nil anon_track = nil
anon_trkseg = nil anon_trkseg = nil
gpx_file = nil
timestamps = false timestamps = false
points.each do |point| points.each do |point|
if gpx_id != point.gpx_id if gpx_id != point.gpx_id
gpx_id = point.gpx_id gpx_id = point.gpx_id
trackid = -1 trackid = -1
gpx_file = Trace.find(gpx_id)
if gpx_file.trackable? if point.trace.trackable?
track = XML::Node.new "trk" track = XML::Node.new "trk"
doc.root << track doc.root << track
timestamps = true timestamps = true
if gpx_file.identifiable? if point.trace.identifiable?
track << (XML::Node.new("name") << gpx_file.name) track << (XML::Node.new("name") << point.trace.name)
track << (XML::Node.new("desc") << gpx_file.description) track << (XML::Node.new("desc") << point.trace.description)
track << (XML::Node.new("url") << url_for(:controller => "/traces", :action => "show", :display_name => gpx_file.user.display_name, :id => gpx_file.id)) track << (XML::Node.new("url") << url_for(:controller => "/traces", :action => "show", :display_name => point.trace.user.display_name, :id => point.trace.id))
end end
else else
# use the anonymous track segment if the user hasn't allowed # use the anonymous track segment if the user hasn't allowed
@ -85,7 +83,7 @@ module Api
end end
if trackid != point.trackid if trackid != point.trackid
if gpx_file.trackable? if point.trace.trackable?
trkseg = XML::Node.new "trkseg" trkseg = XML::Node.new "trkseg"
track << trkseg track << trkseg
trackid = point.trackid trackid = point.trackid