before_filter :authorize_web
before_filter :authorize, :only => [:api_details, :api_data, :api_create]
layout 'site'
-
+
# Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
# target_user - if set, specifies the user to fetch traces for. if not set will fetch all traces
# paging_action - the action that will be linked back to from view
def list (target_user = nil, paging_action = 'list')
+ @title = 'public GPS traces'
@traces_per_page = 20
page_index = params[:page] ? params[:page].to_i - 1 : 0 # nice 1-based page -> 0-based page index
# from display name, pick up user id if one user's traces only
display_name = params[:display_name]
if target_user.nil? and display_name and display_name != ''
+ @paging_action = 'view'
+ @display_name = display_name
+ @title += " from #{@display_name}"
target_user = User.find(:first, :conditions => [ "display_name = ?", display_name])
end
if @user
list(@user, 'mine') unless @user.nil?
else
- redirect_to :controller => 'user', :action => 'login'
+ redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
end
end
def create
filename = "/tmp/#{rand}"
- File.open(filename, "w") { |f| f.write(@params['trace']['gpx_file'].read) }
- @params['trace']['name'] = @params['trace']['gpx_file'].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
- @params['trace'].delete('gpx_file') # remove the field from the hash, because there's no such field in the DB
- @trace = Trace.new(@params['trace'])
+ File.open(filename, "w") { |f| f.write(params[:trace][:gpx_file].read) }
+ params[:trace][:name] = params[:trace][:gpx_file].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
+ params[:trace].delete('gpx_file') # remove the field from the hash, because there's no such field in the DB
+ @trace = Trace.new(params[:trace])
@trace.inserted = false
@trace.user = @user
@trace.timestamp = Time.now
if @trace.save
- saved_filename = "/tmp/#{@trace.id}.gpx"
+ saved_filename = "/home/osm/gpx/#{@trace.id}.gpx"
File.rename(filename, saved_filename)
logger.info("id is #{@trace.id}")
flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
redirect_to :action => 'mine'
- else
- # fixme throw an error here
- # render :action => 'mine'
end
end
def data
trace = Trace.find(params[:id])
- if trace.public? or (@user and @user == trace.user)
- send_data(File.open("/tmp/#{trace.id}.gpx",'r').read , :filename => "#{trace.id}.gpx", :type => 'text/plain', :disposition => 'inline')
+ if trace and (trace.public? or (@user and @user == trace.user))
+ send_file(trace.trace_name, :filename => "#{trace.id}.gpx", :type => trace.mime_type, :disposition => 'attachment')
+ else
+ render :nothing, :status => 404
end
end
rss.add(trace.latitude, trace.longitude, trace.name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), "<img src='#{url_for({:controller => 'trace', :action => 'icon', :id => trace.id, :user_login => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp)
end
- response.headers["Content-Type"] = 'application/xml+rss'
+ response.headers["Content-Type"] = 'application/rss+xml'
render :text => rss.to_s
end
def picture
trace = Trace.find(params[:id])
- send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user)
+ if trace and (trace.public? or (@user and @user == trace.user))
+ send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline')
+ else
+ render :nothing, :status => 404
+ end
end
def icon
trace = Trace.find(params[:id])
- send_data(trace.icon_picture, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user)
+ if trace and (trace.public? or (@user and @user == trace.user))
+ send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline')
+ else
+ render :nothing, :status => 404
+ end
end
def api_details
filename = "/tmp/#{rand}"
File.open(filename, "w") { |f| f.write(request.raw_post) }
- @params['trace'] = {}
- @params['trace']['name'] = params[:filename]
- @params['trace']['tagstring'] = params[:tags]
- @params['trace']['description'] = params[:description]
- @trace = Trace.new(@params['trace'])
+ params[:trace] = {}
+ params[:trace][:name] = params[:filename]
+ params[:trace][:tagstring] = params[:tags]
+ params[:trace][:description] = params[:description]
+ @trace = Trace.new(params[:trace])
@trace.inserted = false
@trace.user = @user
@trace.timestamp = Time.now
if @trace.save
- saved_filename = "/tmp/#{@trace.id}.gpx"
+ saved_filename = "/home/osm/gpx/#{@trace.id}.gpx"
File.rename(filename, saved_filename)
logger.info("id is #{@trace.id}")
flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
projects / rails.git / blobdiff