Improve consistency of trace upload forms and error handling.

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index d297f0accc6bf09f98c03825b4d496185fd246a1..d569991af109469c2eee4c39dde9dd189bbf5e1a 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,138 +1,163 @@
-class WayController < ApplicationController\r
+class WayController < ApplicationController

   require 'xml/libxml'
 
   require 'xml/libxml'
 

-  before_filter :authorize
+  session :off
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]

   after_filter :compress_output
   after_filter :compress_output

-  \r
+

   def create
     if request.put?
       way = Way.from_xml(request.raw_post, true)
 
       if way
   def create
     if request.put?
       way = Way.from_xml(request.raw_post, true)
 
       if way

-        way.user_id = @user.id
-        unless way.preconditions_ok? # are the segments (and their nodes) visible?
-          render :nothing => true, :status => 412
-          return
-        end
-
-        if way.save_with_history
-          render :text => way.id.to_s
-          return
+        if !way.preconditions_ok?
+          render :nothing => true, :status => :precondition_failed

         else
         else

-          render :nothing => true, :status => 500
-          return
+          way.user_id = @user.id
+          way.save_with_history!
+
+          render :text => way.id.to_s, :content_type => "text/plain"

         end
         end

-        return

       else
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :bad_request

       end
       end

+    else
+      render :nothing => true, :status => :method_not_allowed

     end
     end

-
-    render :nothing => true, :status => 500 # something went very wrong

   end
 
   end
 

-  def full\r
-    unless Way.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
-    end
-
-    way = Way.find(params[:id])
+  def read
+    begin
+      way = Way.find(params[:id])

 
 

-    unless way.visible
-      render :nothing => true, :status => 410
-      return
+      if way.visible
+        render :text => way.to_xml.to_s, :content_type => "text/xml"
+      else
+        render :nothing => true, :status => :gone
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     end

+  end

 
 

-    # In future, we might want to do all the data fetch in one step
-    seg_ids = way.segs + [-1]
-    segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"
+  def update
+    begin
+      way = Way.find(params[:id])

 
 

-    node_ids = segments.collect {|segment| segment.node_a }
-    node_ids += segments.collect {|segment| segment.node_b }
-    node_ids += [-1]
-    nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})")
+      if way.visible
+        new_way = Way.from_xml(request.raw_post)

 
 

-    # Render
-    doc = OSM::API.new.get_xml_doc
-    nodes.each do |node|
-      doc.root << node.to_xml_node()
-    end
-    segments.each do |segment|
-      doc.root << segment.to_xml_node()
-    end
-    doc.root << way.to_xml_node()
+        if new_way and new_way.id == way.id
+          if !new_way.preconditions_ok?
+            render :nothing => true, :status => :precondition_failed
+          else
+            way.user_id = @user.id
+            way.tags = new_way.tags
+            way.segs = new_way.segs
+            way.visible = true
+            way.save_with_history!

 
 

-    render :text => doc.to_s
+            render :nothing => true
+          end
+        else
+          render :nothing => true, :status => :bad_request
+        end
+      else
+        render :nothing => true, :status => :gone
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end

   end
 
   end
 

-  def rest
-    unless Way.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
-    end
+  def delete
+    begin
+      way = Way.find(params[:id])

 
 

-    way = Way.find(params[:id])
-    case request.method
+      if way.visible
+        way.user_id = @user.id
+        way.tags = []
+        way.segs = []
+        way.visible = false
+        way.save_with_history!

 
 

-    when :get
-      unless way.visible
-        render :nothing => true, :status => 410
-        return
+        render :nothing => true
+      else
+        render :nothing => true, :status => :gone

       end
       end

-      render :text => way.to_xml.to_s
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end

 
 

-    when :delete
-      unless way.visible
-        render :nothing => true, :status => 410
-        return
-      end
+  def full
+    begin
+      way = Way.find(params[:id])

 
 

-      way.visible = false
-      way.save_with_history
-      render :nothing => true
-      return
-    when :put
-      way = Way.from_xml(request.raw_post)
+      if way.visible
+        # In future, we might want to do all the data fetch in one step
+        seg_ids = way.segs + [-1]
+        segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"

 
 

-      if way
-        way_in_db = Way.find(way.id)
-        if way_in_db
-          way_in_db.user_id = @user.id
-          way_in_db.tags = way.tags
-          way_in_db.segs = way.segs
-          way_in_db.timestamp = way.timestamp
-          way_in_db.visible = true
-          if way_in_db.save_with_history
-            render :text => way.id
-          else
-            render :nothing => true, :status => 500
-          end
-          return
-        else
-          render :nothing => true, :status => 404 # way doesn't exist yet
+        node_ids = segments.collect {|segment| segment.node_a }
+        node_ids += segments.collect {|segment| segment.node_b }
+        node_ids += [-1]
+        nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})")
+
+        # Render
+        doc = OSM::API.new.get_xml_doc
+        nodes.each do |node|
+          doc.root << node.to_xml_node()
+        end
+        segments.each do |segment|
+          doc.root << segment.to_xml_node()

         end
         end

+        doc.root << way.to_xml_node()
+
+        render :text => doc.to_s, :content_type => "text/xml"

       else
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :gone

       end
       end

+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
   end
 
   def ways
     end
   end
 
   def ways

-    response.headers["Content-Type"] = 'text/xml'
-    ids = params['ways'].split(',').collect {|w| w.to_i }
+    begin
+      ids = params['ways'].split(',').collect { |w| w.to_i }
+    rescue
+      ids = []
+    end
+

     if ids.length > 0
     if ids.length > 0

-      waylist = Way.find(ids)

       doc = OSM::API.new.get_xml_doc
       doc = OSM::API.new.get_xml_doc

-      waylist.each do |way|
+
+      Way.find(ids).each do |way|

         doc.root << way.to_xml_node
         doc.root << way.to_xml_node

-      end 
-      render :text => doc.to_s
+      end
+
+      render :text => doc.to_s, :content_type => "text/xml"

     else
     else

-      render :nothing => true, :status => 400
+      render :nothing => true, :status => :bad_request

     end
   end
 
     end
   end
 

+  def ways_for_segment
+    wayids = WaySegment.find(:all, :conditions => ['segment_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
+
+    if wayids.length > 0
+      doc = OSM::API.new.get_xml_doc
+
+      Way.find(wayids).each do |way|
+        doc.root << way.to_xml_node
+      end
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
+    end
+  end

 end
 end