X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c11d961f624cb610c4b8184d24e522b2c093d1ea..960d13488a875245570ee498ee9a1ed7cac37bbe:/app/controllers/way_controller.rb?ds=sidebyside

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 34f1ab5e7..3b6491cf0 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,138 +1,144 @@
 class WayController < ApplicationController
   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
 
   def create
-    response.headers["Content-Type"] = 'text/xml'
     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 => HTTP_PRECONDITION_FAILED
-          return
-        end
-
-        if way.save_with_history
-          render :text => way.id.to_s
+        if !way.preconditions_ok?
+          render :text => "", :status => :precondition_failed
         else
-          render :nothing => true, :status => 500
+          way.user_id = @user.id
+          way.save_with_history!
+
+          render :text => way.id.to_s, :content_type => "text/plain"
         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
-    end
+  def read
+    begin
+      way = Way.find(params[:id])
 
-    way = Way.find(params[:id])
+      response.headers['Last-Modified'] = way.timestamp.rfc822
 
-    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 :text => "", :status => :gone
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
     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])
+      new_way = Way.from_xml(request.raw_post)
 
-    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 new_way and new_way.id == way.id
+        if !new_way.preconditions_ok?
+          render :text => "", :status => :precondition_failed
+        else
+          way.user_id = @user.id
+          way.tags = new_way.tags
+          way.nds = new_way.nds
+          way.visible = true
+          way.save_with_history!
 
-    # 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()
+          render :nothing => true
+        end
+      else
+        render :nothing => true, :status => :bad_request
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
     end
-    doc.root << way.to_xml_node()
-
-    render :text => doc.to_s
   end
 
-  def rest
-    response.headers["Content-Type"] = 'text/xml'
-    unless Way.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
+  # This is the API call to delete a way
+  def delete
+    begin
+      way = Way.find(params[:id])
+      way.delete_with_relations_and_history(@user)
+
+      # if we get here, all is fine, otherwise something will catch below.  
+      render :nothing => true
+    rescue OSM::APIAlreadyDeletedError
+      render :text => "", :status => :gone
+    rescue OSM::APIPreconditionFailedError
+      render :text => "", :status => :precondition_failed
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
     end
+  end
 
-    way = Way.find(params[:id])
-
-    case request.method
-
-    when :get
-      unless way.visible
-        render :nothing => true, :status => 410
-        return
-      end
-      render :text => way.to_xml.to_s
+  def full
+    begin
+      way = Way.find(params[:id])
 
-    when :delete
       if way.visible
-        way.visible = false
-        way.save_with_history
-        render :nothing => true
-      else
-        render :nothing => true, :status => 410
-      end
+        nd_ids = way.nds + [-1]
+        nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{nd_ids.join(',')})")
 
-    when :put
-      new_way = Way.from_xml(request.raw_post)
-
-      if new_way
-        unless new_way.preconditions_ok? # are the segments (and their nodes) visible?
-          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
-          return
+        # Render
+        doc = OSM::API.new.get_xml_doc
+        nodes.each do |node|
+          doc.root << node.to_xml_node()
         end
+        doc.root << way.to_xml_node()
 
-        way.user_id = @user.id
-        way.tags = new_way.tags
-        way.segs = new_way.segs
-        way.timestamp = new_way.timestamp
-        way.visible = true
-
-        if way.id == new_way.id and way.save_with_history
-          render :nothing => true
-        else
-          render :nothing => true, :status => 500
-        end
+        render :text => doc.to_s, :content_type => "text/xml"
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
+        render :text => "", :status => :gone
       end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
     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
-      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
+
+      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_node
+    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id[0] }.uniq
+
+    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"
+  end
 end