Correct merge issues in the last merge from master

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 94a10d4242778335bf1043a2c26d71a9b86f37d4..f2cda21bca0da9e77938daca4a7e6f33d349c167 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,106 +1,82 @@
 class WayController < ApplicationController
   require 'xml/libxml'
 
 class WayController < ApplicationController
   require 'xml/libxml'
 

-  session :off

   before_filter :authorize, :only => [:create, :update, :delete]
   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]
+  before_filter :require_allow_write_api, :only => [:create, :update, :delete]
+  before_filter :require_public_data, :only => [:create, :update, :delete]
+  before_filter :check_api_writable, :only => [:create, :update, :delete]
+  before_filter :check_api_readable, :except => [:create, :update, :delete]

   after_filter :compress_output
   after_filter :compress_output

+  around_filter :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 :text => "", :status => :precondition_failed
-        else
-          way.version = 0
-          way.user_id = @user.id
-          way.save_with_history!
-
-          render :text => way.id.to_s, :content_type => "text/plain"
-        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 :nothing => true, :status => :bad_request

     end
   end
 
   def read
     end
   end
 
   def read

-    begin
-      way = Way.find(params[:id])
-
-      response.headers['Last-Modified'] = way.timestamp.rfc822
-
-      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
+    way = Way.find(params[:id])
+    
+    response.headers['Last-Modified'] = way.timestamp.rfc822
+    
+    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])
-      new_way = Way.from_xml(request.raw_post)
-
-      if new_way and new_way.id == way.id
-        way.update_from(new_way, @user)
-        render :text => way.version.to_s, :content_type => "text/plain"
-      else
-        render :nothing => true, :status => :bad_request
-      end
-    rescue OSM::APIPreconditionFailedError
-      render :text => "", :status => :precondition_failed
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
+    way = Way.find(params[:id])
+    new_way = Way.from_xml(request.raw_post)
+    
+    if new_way and new_way.id == way.id
+      way.update_from(new_way, @user)
+      render :text => way.version.to_s, :content_type => "text/plain"
+    else
+      render :nothing => true, :status => :bad_request

     end
   end
 
   # This is the API call to delete a way
   def delete
     end
   end
 
   # 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
+    way = Way.find(params[:id])
+    new_way = Way.from_xml(request.raw_post)
+    
+    if new_way and new_way.id == way.id
+      way.delete_with_history!(new_way, @user)
+      render :text => way.version.to_s, :content_type => "text/plain"
+    else
+      render :nothing => true, :status => :bad_request

     end
   end
 
   def full
     end
   end
 
   def full

-    begin
-      way = Way.find(params[:id])
+    way = Way.find(params[:id], :include => {:nodes => :node_tags})
+    
+    if way.visible
+      changeset_cache = {}
+      user_display_name_cache = {}

 
 

-      if way.visible
-        nd_ids = way.nds + [-1]
-        nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{nd_ids.join(',')})")
-
-        # Render
-        doc = OSM::API.new.get_xml_doc
-        nodes.each do |node|
-          doc.root << node.to_xml_node()
+      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)

         end
         end

-        doc.root << way.to_xml_node()
-
-        render :text => doc.to_s, :content_type => "text/xml"
-      else
-        render :text => "", :status => :gone

       end
       end

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

     end
   end
 
     end
   end
 


@@ -124,13 +100,19 @@ class WayController < ApplicationController
     end
   end
 
     end
   end
 

+  ##
+  # 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
   def ways_for_node

-    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id[0] }.uniq
+    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 = OSM::API.new.get_xml_doc
 
     Way.find(wayids).each do |way|

-      doc.root << way.to_xml_node
+      doc.root << way.to_xml_node if way.visible

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