Yet more tests...

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 42219d9b0fce74a0f1be6ed05a4b070d0eecf94d..dd9b65fd87de89316119f6e0592a212342020bad 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,172 +1,120 @@
 class WayController < ApplicationController
 class WayController < ApplicationController

-  require 'xml/libxml'
+  require "xml/libxml"

 
 

-  before_filter :authorize, :only => [:create, :update, :destroy]
-  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
 
   def create

-    if request.put?
-      way = Way.from_xml(request.raw_post, true)
-
-      if way
-        if !way.preconditions_ok?
-          render :nothing => true, :status => :precondition_failed
-        else
-          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
-      else
-        render :nothing => true, :status => :bad_request
-      end
+    assert_method :put
+
+    way = Way.from_xml(request.raw_post, true)
+
+    if way
+      way.create_with_history @user
+      render :text => way.id.to_s, :content_type => "text/plain"

     else
     else

-      render :nothing => true, :status => :method_not_allowed
+      render :text => "", :status => :bad_request

     end
   end
 
   def read
     end
   end
 
   def read

-    begin
-      way = Way.find(params[:id])
+    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
+    response.last_modified = way.timestamp
+
+    if way.visible
+      render :text => way.to_xml.to_s, :content_type => "text/xml"
+    else
+      render :text => "", :status => :gone

     end
   end
 
   def update
     end
   end
 
   def update

-    begin
-      way = Way.find(params[:id])
-
-      if way.visible
-        new_way = Way.from_xml(request.raw_post)
-
-        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.timestamp = new_way.timestamp
-            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
+    way = Way.find(params[:id])
+    new_way = Way.from_xml(request.raw_post)
+
+    if new_way && new_way.id == way.id
+      way.update_from(new_way, @user)
+      render :text => way.version.to_s, :content_type => "text/plain"
+    else
+      render :text => "", :status => :bad_request

     end
   end
 
     end
   end
 

+  # This is the API call to delete a way

   def delete
   def delete

-    begin
-      way = Way.find(params[:id])
-
-      if way.visible
-        way.user_id = @user.id
-        way.visible = false
+    way = Way.find(params[:id])
+    new_way = Way.from_xml(request.raw_post)

 
 

-        if way.save_with_history
-          render :nothing => true
-        else
-          render :nothing => true, :status => :internal_server_error
-        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
+    if new_way && new_way.id == way.id
+      way.delete_with_history!(new_way, @user)
+      render :text => way.version.to_s, :content_type => "text/plain"
+    else
+      render :text => "", :status => :bad_request

     end
   end
 
   def full
     end
   end
 
   def full

-    begin
-      way = Way.find(params[:id])
-
-      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(',')})"
-
-        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()
+    way = Way.includes(:nodes => :node_tags).find(params[:id])

 
 

-        render :text => doc.to_s, :content_type => "text/xml"
-      else
-        render :nothing => true, :status => :gone
+    if way.visible
+      visible_nodes = {}
+      changeset_cache = {}
+      user_display_name_cache = {}
+
+      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
       end

-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :text => "", :status => :gone

     end
   end
 
   def ways
     end
   end
 
   def ways

-    ids = params['ways'].split(',').collect { |w| w.to_i }
+    unless params["ways"]
+      fail OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]")
+    end

 
 

-    if ids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    ids = params["ways"].split(",").collect(&:to_i)

 
 

-      Way.find(ids).each do |way|
-        doc.root << way.to_xml_node
-      end
+    if ids.length == 0
+      fail OSM::APIBadUserInput.new("No ways were given to search for")
+    end

 
 

-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :bad_request
+    doc = OSM::API.new.get_xml_doc
+
+    Way.find(ids).each do |way|
+      doc.root << way.to_xml_node

     end
     end

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

   end
 
   end
 

-  def ways_for_segment
-    wayids = WaySegment.find(:all, :conditions => ['segment_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
+  ##
+  # 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

 
 

-    if wayids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    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
+    Way.find(wayids).each do |way|
+      doc.root << way.to_xml_node if way.visible

     end
     end

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

   end
 end
   end
 end