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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 34f1ab5e7..e48073e10 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,138 +1,115 @@
 class WayController < ApplicationController
-  require 'xml/libxml'
+  require "xml/libxml"
 
-  before_filter :authorize
-  after_filter :compress_output
+  skip_before_action :verify_authenticity_token
+  before_action :authorize, :only => [:create, :update, :delete]
+  before_action :require_allow_write_api, :only => [:create, :update, :delete]
+  before_action :require_public_data, :only => [:create, :update, :delete]
+  before_action :check_api_writable, :only => [:create, :update, :delete]
+  before_action :check_api_readable, :except => [:create, :update, :delete]
+  around_action :api_call_handle_error, :api_call_timeout
 
   def create
-    response.headers["Content-Type"] = 'text/xml'
-    if request.put?
-      way = Way.from_xml(request.raw_post, true)
+    assert_method :put
 
-      if way
-        way.user_id = @user.id
+    way = Way.from_xml(request.raw_post, true)
 
-        unless way.preconditions_ok? # are the segments (and their nodes) visible?
-          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
-          return
-        end
+    # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
+    way.create_with_history current_user
+    render :plain => way.id.to_s
+  end
 
-        if way.save_with_history
-          render :text => way.id.to_s
-        else
-          render :nothing => true, :status => 500
-        end
-        return
-      else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
-      end
-    end
+  def read
+    way = Way.find(params[:id])
 
-    render :nothing => true, :status => 500 # something went very wrong
-  end
+    response.last_modified = way.timestamp
 
-  def full
-    unless Way.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
+    if way.visible
+      render :xml => way.to_xml.to_s
+    else
+      head :gone
     end
+  end
 
+  def update
     way = Way.find(params[:id])
+    new_way = Way.from_xml(request.raw_post)
 
-    unless way.visible
-      render :nothing => true, :status => 410
-      return
+    unless new_way && new_way.id == way.id
+      raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})"
     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(',')})"
+    way.update_from(new_way, current_user)
+    render :plain => way.version.to_s
+  end
 
-    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(',')})")
+  # This is the API call to delete a way
+  def delete
+    way = Way.find(params[:id])
+    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()
+    if new_way && new_way.id == way.id
+      way.delete_with_history!(new_way, current_user)
+      render :plain => way.version.to_s
+    else
+      head :bad_request
     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
-    end
-
-    way = Way.find(params[:id])
+  def full
+    way = Way.includes(:nodes => :node_tags).find(params[:id])
 
-    case request.method
+    if way.visible
+      visible_nodes = {}
+      changeset_cache = {}
+      user_display_name_cache = {}
 
-    when :get
-      unless way.visible
-        render :nothing => true, :status => 410
-        return
-      end
-      render :text => way.to_xml.to_s
-
-    when :delete
-      if way.visible
-        way.visible = false
-        way.save_with_history
-        render :nothing => true
-      else
-        render :nothing => true, :status => 410
+      doc = OSM::API.new.get_xml_doc
+      way.nodes.uniq.each do |node|
+        if node.visible
+          doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+          visible_nodes[node.id] = node
+        end
       end
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
 
-    when :put
-      new_way = Way.from_xml(request.raw_post)
+      render :xml => doc.to_s
+    else
+      head :gone
+    end
+  end
 
-      if new_way
-        unless new_way.preconditions_ok? # are the segments (and their nodes) visible?
-          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
-          return
-        end
+  def ways
+    unless params["ways"]
+      raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]"
+    end
 
-        way.user_id = @user.id
-        way.tags = new_way.tags
-        way.segs = new_way.segs
-        way.timestamp = new_way.timestamp
-        way.visible = true
+    ids = params["ways"].split(",").collect(&:to_i)
 
-        if way.id == new_way.id and way.save_with_history
-          render :nothing => true
-        else
-          render :nothing => true, :status => 500
-        end
-      else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-      end
+    raise OSM::APIBadUserInput, "No ways were given to search for" if ids.empty?
+
+    doc = OSM::API.new.get_xml_doc
+
+    Way.find(ids).each do |way|
+      doc.root << way.to_xml_node
     end
+
+    render :xml => doc.to_s
   end
 
-  def ways
-    response.headers["Content-Type"] = 'text/xml'
-    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|
-        doc.root << way.to_xml_node
-      end
-      render :text => doc.to_s
-    else
-      render :nothing => true, :status => 400
+  ##
+  # returns all the ways which are currently using the node given in the
+  # :id parameter. note that this used to return deleted ways as well, but
+  # this seemed not to be the expected behaviour, so it was removed.
+  def ways_for_node
+    wayids = WayNode.where(: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 if way.visible
     end
-  end
 
+    render :xml => doc.to_s
+  end
 end