X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d07277efba0c0069705bbefa68f2624a9c6c9ff0..0a18deef095c2142d6e152823e0673b8fe70997e:/app/controllers/trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index fbc2cefca..8804da78a 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,20 +1,30 @@
 class TraceController < ApplicationController
   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')
-    @traces_per_page = 4
-    page_index = params[:page] ? params[:page].to_i - 1 : 0 # nice 1-based page -> 0-based page index
-
+  def list (target_user = nil)
     # 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 != ''
+    if target_user.nil? and !display_name.blank?
+      @display_name = display_name
+      @title += " from #{@display_name}"
       target_user = User.find(:first, :conditions => [ "display_name = ?", display_name])
     end
 
+    # set title
+    if target_user.nil?
+      @title = "public GPS traces"
+    elsif target_user.id == @user.id
+      @title = "your GPS traces"
+    else
+      @title = "public GPS traces from #{target_user.display_name}"
+    end
+
+    @title += " tagged with #{params[:tag]}" if params[:tag]
+
     opt = Hash.new
     opt[:include] = [:user, :tags] # load users and tags from db at same time as traces
 
@@ -40,23 +50,15 @@ class TraceController < ApplicationController
     
     opt[:order] = 'timestamp DESC'
     if params[:tag]
+      @tag = params[:tag]
       conditions[0] += " AND gpx_file_tags.tag = ?"
-      conditions << params[:tag];
+      conditions << @tag;
     end
     
     opt[:conditions] = conditions
+    opt[:per_page] = 20
 
-    # count traces using all options except limit
-    @max_trace = Trace.count(opt)
-    @max_page = Integer((@max_trace + 1) / @traces_per_page) 
-    
-    # last step before fetch - add paging options
-    opt[:limit] = @traces_per_page
-    if page_index > 0
-      opt[:offset] = @traces_per_page * page_index
-    end
-
-    @traces = Trace.find(:all , opt)
+    @trace_pages, @traces = paginate(:traces, opt)
     
     # put together SET of tags across traces, for related links
     tagset = Hash.new
@@ -72,15 +74,13 @@ class TraceController < ApplicationController
     # final helper vars for view
     @display_name = display_name
     @all_tags = tagset.values
-    @paging_action = paging_action # the action that paging requests should route back to, e.g. 'list' or 'mine'
-    @page = page_index + 1 # nice 1-based external page numbers
   end
 
   def mine
     if @user
-      list(@user, 'mine') unless @user.nil?
+      list(@user) unless @user.nil?
     else
-      redirect_to :controller => 'user', :action => 'login'
+      redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
     end
   end
 
@@ -88,29 +88,45 @@ class TraceController < ApplicationController
     @trace = Trace.find(params[:id])
     unless @trace.public
       if @user
-        render :nothing, :status => 401 if @trace.user.id != @user.id
+        render :nothing, :status => :forbidden if @trace.user.id != @user.id
       end
     end
+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true, :status => :not_found
   end
 
   def create
-    filename = "/tmp/#{rand}"
+    name = params[:trace][:gpx_file].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
 
-    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') # let's remove the field from the hash, because there's no such field in the DB anyway.
-    @trace = Trace.new(@params['trace'])
-    @trace.inserted = false
-    @trace.user_id = @user.id
-    @trace.timestamp = Time.now
-    if @trace.save
+    do_create(name, params[:trace][:tagstring], params[:trace][:description], params[:trace][:public]) do |f|
+      f.write(params[:trace][:gpx_file].read)
+    end
+
+    if @trace.id
       logger.info("id is #{@trace.id}")
-      File.rename(filename, "/tmp/#{@trace.id}.gpx")
-      # *nix - specific `mv #{filename} /tmp/#{@trace.id}.gpx`
       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'
     end
+  end
 
-    redirect_to :action => 'mine'
+  def data
+    trace = Trace.find(params[:id])
+    if trace and (trace.public? or (@user and @user == trace.user))
+      send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment')
+    else
+      render :nothing, :status => :not_found
+    end
+  end
+
+  def make_public
+    trace = Trace.find(params[:id])
+    if @user and trace.user == @user and !trace.public
+      trace.public = true
+      trace.save
+      flash[:notice] = 'Track made public'
+      redirect_to :controller => 'trace', :action => 'view', :id => params[:id]
+    end
   end
 
   def georss
@@ -123,18 +139,91 @@ class TraceController < ApplicationController
       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'
-
-    render :text => rss.to_s
+    render :text => rss.to_s, :content_type => "application/rss+xml"
   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
+    begin
+      trace = Trace.find(params[:id])
+
+      if 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 => :forbidden
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    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
+    begin
+      trace = Trace.find(params[:id])
+
+      if 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 => :forbidden
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    end
+  end
+
+  def api_details
+    begin
+      trace = Trace.find(params[:id])
+
+      if trace.public? or trace.user == @user
+        render :text => trace.to_xml.to_s, :content_type => "text/xml"
+      else
+        render :nothing => true, :status => :forbidden
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    end
+  end
+
+  def api_data
+    render :action => 'data'
+  end
+
+  def api_create
+    do_create(params[:filename], params[:tags], params[:description], true) do |f|
+      f.write(request.raw_post)
+    end
+
+    if @trace.id
+      render :nothing => true
+    else
+      render :nothing => true, :status => :internal_server_error
+    end
   end
+
+private
+
+  def do_create(name, tags, description, public)
+    filename = "/tmp/#{rand}"
+
+    File.open(filename, "w") { |f| yield f }
+
+    @trace = Trace.new({:name => name, :tagstring => tags,
+                        :description => description, :public => public})
+    @trace.inserted = false
+    @trace.user = @user
+    @trace.timestamp = Time.now
+
+    if @trace.save
+      File.rename(filename, @trace.trace_name)
+    else
+      FileUtils.rm_f(filename)
+    end
+  end
+
 end