X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/374d9ea486dcf6bb6ad2fe5bb4e5a180a8f556a3..668f8020ccbf544de89822415e342c1c60826dfe:/app/controllers/trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index fa062b728..25409cc13 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,24 +1,88 @@
 class TraceController < ApplicationController
   before_filter :authorize_web  
   layout 'site'
-
-  def list
-    @page = params[:page].to_i
+  
+  # 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 = 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 != ''
+      target_user = User.find(:first, :conditions => [ "display_name = ?", display_name])
+    end
 
     opt = Hash.new
-    opt[:conditions] = ['public = true']
-    opt[:order] = 'timestamp DESC'
-    opt[:limit] = 20
-
-    if @page > 0
-      opt[:offset => 20*@page]
+    opt[:include] = [:user, :tags] # load users and tags from db at same time as traces
+
+    # four main cases:
+    # 1 - all traces, logged in = all public traces + all user's (i.e + all mine)
+    # 2 - all traces, not logged in = all public traces
+    # 3 - user's traces, logged in as same user = all user's traces 
+    # 4 - user's traces, not logged in as that user = all user's public traces
+    if target_user.nil? # all traces
+      if @user
+        conditions = ["(public = 1 OR user_id = ?)", @user.id] #1
+      else
+        conditions  = ["public = 1"] #2
+      end
+    else
+      if @user and @user.id == target_user.id
+        conditions = ["user_id = ?", @user.id] #3 (check vs user id, so no join + can't pick up non-public traces by changing name)
+      else
+        conditions = ["public = 1 AND user_id = ?", target_user.id] #4
+      end
     end
-
+    conditions[0] += " AND users.display_name != ''" # users need to set display name before traces will be exposed
+    
+    opt[:order] = 'timestamp DESC'
     if params[:tag]
-      
+      @tag = params[:tag]
+      conditions[0] += " AND gpx_file_tags.tag = ?"
+      conditions << @tag;
+    end
+    
+    opt[:conditions] = conditions
+
+    # 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)
+    
+    # put together SET of tags across traces, for related links
+    tagset = Hash.new
+    if @traces
+      @traces.each do |trace|
+        trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here
+        trace.tags.each do |tag|
+          tagset[tag.tag] = tag.tag
+        end
+      end
+    end
+    
+    # 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?
+    else
+      redirect_to :controller => 'user', :action => 'login'
+    end
   end
 
   def view
@@ -40,10 +104,15 @@ class TraceController < ApplicationController
     @trace.inserted = false
     @trace.user_id = @user.id
     @trace.timestamp = Time.now
+    saved_filename = "/tmp/#{@trace.id}.gpx"
+    # *nix - specific `mv #{filename} /tmp/#{@trace.id}.gpx`
+    File.rename(filename, saved_filename)
+    @trace.tmpname = saved_filename
     if @trace.save
       logger.info("id is #{@trace.id}")
-      `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."
+    else
+      #TODO upload failure
     end
 
     redirect_to :action => 'mine'
@@ -66,11 +135,11 @@ class TraceController < ApplicationController
 
   def picture
     trace = Trace.find(params[:id])
-    send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/png', :disposition => 'inline') if trace.public
+    send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public
   end
 
   def icon
     trace = Trace.find(params[:id])
-    send_data(trace.icon_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public
+    send_data(trace.icon_picture, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline') if trace.public
   end
 end