Fix indentation.

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 7b7dbe81cad4a2d491102ac1d4cc90a890368594..4b52ad3f04829f575e7ecf37c132507ca4f0ba28 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -13,7 +13,7 @@ class WayController < ApplicationController
 
       if way
         if !way.preconditions_ok?
 
       if way
         if !way.preconditions_ok?

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

         else
           way.user_id = @user.id
           way.save_with_history!
         else
           way.user_id = @user.id
           way.save_with_history!


@@ -32,10 +32,12 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
 
     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
       if way.visible
         render :text => way.to_xml.to_s, :content_type => "text/xml"
       else

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

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found


@@ -45,56 +47,43 @@ class WayController < ApplicationController
   def update
     begin
       way = Way.find(params[:id])
   def update
     begin
       way = Way.find(params[:id])

+      new_way = Way.from_xml(request.raw_post)

 
 

-      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.nds = new_way.nds
-            way.visible = true
-            way.save_with_history!
-
-            render :nothing => true
-          end
+      if new_way and new_way.id == way.id
+        if !new_way.preconditions_ok?
+          render :text => "", :status => :precondition_failed

         else
         else

-          render :nothing => true, :status => :bad_request
+          way.user_id = @user.id
+          way.tags = new_way.tags
+          way.nds = new_way.nds
+          way.visible = true
+          way.save_with_history!
+
+          render :nothing => true

         end
       else
         end
       else

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

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 

+  # This is the API call to delete a way

   def delete
     begin
       way = Way.find(params[:id])
   def delete
     begin
       way = Way.find(params[:id])

-
-      if way.visible
-        if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='way' and member_id=?", params[:id]])
-          render :nothing => true, :status => :precondition_failed
-        else
-          way.user_id = @user.id
-          way.tags = []
-          way.nds = []
-          way.visible = false
-         way.save_with_history!
-
-         render :nothing => true
-        end
-      else
-        render :nothing => true, :status => :gone
-      end
+      way.delete_with_relations_and_history(@user)
+
+      # if we get here, all is fine, otherwise something will catch below.  
+      render :nothing => true
+      return
+    rescue OSM::APIAlreadyDeletedError
+      render :text => "", :status => :gone
+    rescue OSM::APIPreconditionFailedError
+      render :text => "", :status => :precondition_failed

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

-    rescue => ex
-      puts ex

     end
   end
 
     end
   end
 


@@ -115,7 +104,7 @@ class WayController < ApplicationController
 
         render :text => doc.to_s, :content_type => "text/xml"
       else
 
         render :text => doc.to_s, :content_type => "text/xml"
       else

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

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found


@@ -143,18 +132,14 @@ class WayController < ApplicationController
   end
 
   def ways_for_node
   end
 
   def ways_for_node

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

     end
     end

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

   end
 end
   end
 end