Use params[] instead of @params[] to avoid deprecation warnings.

[rails.git] / app / controllers / trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 25409cc130c5ae9c519690cf5207335e99cec5d9..5b2f6bcc224cfc318d1ba40c5546ec689ccd98de 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,5 +1,6 @@
 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.).
@@ -97,25 +98,43 @@ class TraceController < ApplicationController
   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') # let's remove the field from the hash, because there's no such field in the DB anyway.
-    @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_id = @user.id
+    @trace.user = @user
     @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
+      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
-      #TODO upload failure
+      # fixme throw an error here
+       redirect_to :action => 'mine'
+       flash[:notice] = "You haven't entered a tag or a description for yoru traces."
     end
+  end
+
+  def data
+    trace = Trace.find(params[:id])
+    if trace.public? or (@user and @user == trace.user)
+      send_data(File.open("/home/osm/gpx/#{trace.id}.gpx",'r').read , :filename => "#{trace.id}.gpx", :type => 'text/plain', :disposition => 'inline')
+    end
+  end
 
-    redirect_to :action => 'mine'
+  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
@@ -135,11 +154,48 @@ class TraceController < ApplicationController
 
   def picture
     trace = Trace.find(params[:id])
-    send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public
+    send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user)
   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
+    send_data(trace.icon_picture, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user)
+  end
+
+  def api_details
+    trace = Trace.find(params[:id])
+    doc = OSM::API.new.get_xml_doc
+    doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
+    render :text => doc.to_s
+  end
+
+  def api_data
+    render :action => 'data'
+  end
+
+  def api_create
+    #FIXME merge this code with create as they're pretty similar?
+    
+    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])
+    @trace.inserted = false
+    @trace.user = @user
+    @trace.timestamp = Time.now
+
+    if @trace.save
+      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."
+      render :nothing => true
+    else
+      render :nothing => true, :status => 400 # er FIXME what fricking code to return?
+    end
+
   end
 end