Patching better 412 error messages from mis-commit on old api06 branch.

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index e7cf0f7f1cf2c140f76331636fe5355af0553eff..ab83d4ec3cbb1a2ea334e0e8b9936450a60972f3 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -3,8 +3,9 @@ class WayController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
 
   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]
+  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
 
   def create
   after_filter :compress_output
 
   def create


@@ -22,6 +23,7 @@ class WayController < ApplicationController
         render :nothing => true, :status => :method_not_allowed
       end
     rescue OSM::APIError => ex
         render :nothing => true, :status => :method_not_allowed
       end
     rescue OSM::APIError => ex

+      logger.warn request.raw_post

       render ex.render_opts
     end
   end
       render ex.render_opts
     end
   end


@@ -56,6 +58,7 @@ class WayController < ApplicationController
         render :nothing => true, :status => :bad_request
       end
     rescue OSM::APIError => ex
         render :nothing => true, :status => :bad_request
       end
     rescue OSM::APIError => ex

+      logger.warn request.raw_post

       render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found


@@ -67,11 +70,10 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
     begin
       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(@user)

 
 

-        # if we get here, all is fine, otherwise something will catch below.  
-        render :nothing => true
+      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
       else
         render :nothing => true, :status => :bad_request
       end


@@ -88,7 +90,7 @@ class WayController < ApplicationController
 
       if way.visible
         nd_ids = way.nds + [-1]
 
       if way.visible
         nd_ids = way.nds + [-1]

-        nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{nd_ids.join(',')})")
+        nodes = Node.find(:all, :conditions => ["visible = ? AND id IN (#{nd_ids.join(',')})", true])

 
         # Render
         doc = OSM::API.new.get_xml_doc
 
         # Render
         doc = OSM::API.new.get_xml_doc


@@ -126,13 +128,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"