X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/343e01bb86da6b346e035796121aba033bb26c29..4ac48d2cb5cd2197d8f2702bdc7b17072b2fdc85:/app/controllers/way_controller.rb?ds=sidebyside

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index acc8a5d0c..b1adf25a2 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,138 +1,174 @@
-class WayController < ApplicationController
+class WayController < ApplicationController
   require 'xml/libxml'
 
-  before_filter :authorize
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_availability, :only => [:create, :update, :delete]
   after_filter :compress_output
-
+
   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
-          render :nothing => true, :status => 500
-          return
+          way.user_id = @user.id
+
+          if way.save_with_history
+            render :text => way.id.to_s, :content_type => "text/plain"
+          else
+            render :nothing => true, :status => :internal_server_error
+          end
         end
-        return
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :bad_request
       end
+    else
+      render :nothing => true, :status => :method_not_allowed
     end
-
-    render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def full
-    unless Way.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
+  def read
+    begin
+      way = Way.find(params[:id])
+
+      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
+    rescue
+      render :nothing => true, :status => :internal_server_error
     end
+  end
 
-    way = Way.find(params[:id])
+  def update
+    begin
+      way = Way.find(params[:id])
 
-    unless way.visible
-        render :nothing => true, :status => 410
-        return
-    end
+      if way.visible
+        new_way = Way.from_xml(request.raw_post)
 
-	# 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(',')})"
-
-	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
-	doc.root << way.to_xml_node()
-
-    render :text => doc.to_s
+        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
+
+            if way.save_with_history
+              render :nothing => true
+            else
+              render :nothing => true, :status => :internal_server_error
+            end
+          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
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    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
 
-    when :get
-      unless way.visible
-        render :nothing => true, :status => 410
-        return
+        if way.save_with_history
+          render :nothing => true
+        else
+          render :nothing => true, :status => :internal_server_error
+        end
+      else
+        render :nothing => true, :status => :gone
       end
-      render :text => way.to_xml.to_s
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    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
+        doc.root << way.to_xml_node()
+
+        render :text => doc.to_s, :content_type => "text/xml"
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :gone
       end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
     end
   end
 
   def ways
-    response.headers["Content-Type"] = 'text/xml'
-    ids = params['ways'].split(',').collect {|w| w.to_i }
+    ids = params['ways'].split(',').collect { |w| w.to_i }
+
     if ids.length > 0
-      waylist = Way.find(ids)
       doc = OSM::API.new.get_xml_doc
-      waylist.each do |way|
+
+      Way.find(ids).each do |way|
         doc.root << way.to_xml_node
-      end 
-      render :text => doc.to_s
+      end
+
+      render :text => doc.to_s, :content_type => "text/xml"
     else
-      render :nothing => true, :status => 400
+      render :nothing => true, :status => :bad_request
     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