Prepare for Rails 2.1+, as we will no longer be able to use a symbol in the set_fixtu...

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 08270094d63e87c72677bfd49c9183d0cc08217d..25d535d79e1e396bca2d4e98049efaf7da5bc07b 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -8,27 +8,21 @@ class WayController < ApplicationController
   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create

-    if request.put?
-      way = Way.from_xml(request.raw_post, true)
-
-      if way
-        # FIXME move some of this to the model. The controller shouldn't need to
-        # know about the fact that the first version number is 0 on creation
-        # it will also allow use to run a variation on the check_consistency
-        # so that we don't get exceptions thrown when the changesets are not right
-        unless way.preconditions_ok?
-          render :text => "", :status => :precondition_failed
-        else
-          way.version = 0
-          way.save_with_history!
+    begin
+      if request.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"
           render :text => way.id.to_s, :content_type => "text/plain"

+        else
+          render :nothing => true, :status => :bad_request

         end
       else
         end
       else

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

       end
       end

-    else
-      render :nothing => true, :status => :method_not_allowed
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
     end
   end
 


@@ -73,11 +67,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


@@ -132,13 +125,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"