Fix the data config, so that the development database is not the same as the test...

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index d3a1b039f557b2afc129f050106b5282db23b897..17f166ddc85d7c50abd4a7d5ce7424546d259007 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -12,11 +12,10 @@ class WayController < ApplicationController
       way = Way.from_xml(request.raw_post, true)
 
       if way
       way = Way.from_xml(request.raw_post, true)
 
       if way

-        if !way.preconditions_ok?
+        unless way.preconditions_ok?

           render :text => "", :status => :precondition_failed
         else
           way.version = 0
           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"
           way.save_with_history!
 
           render :text => way.id.to_s, :content_type => "text/plain"


@@ -40,6 +39,8 @@ class WayController < ApplicationController
       else
         render :text => "", :status => :gone
       end
       else
         render :text => "", :status => :gone
       end

+    rescue OSM::APIError => ex
+      render ex.render_opts

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


@@ -49,11 +50,6 @@ 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.version != way.version
-        render :text => "Version mismatch: Provided " + new_way.version.to_s + ", server had: " + way.version.to_s, :status => :bad_request
-        return
-      end  
-        

 
       if new_way and new_way.id == way.id
         way.update_from(new_way, @user)
 
       if new_way and new_way.id == way.id
         way.update_from(new_way, @user)


@@ -61,8 +57,8 @@ class WayController < ApplicationController
       else
         render :nothing => true, :status => :bad_request
       end
       else
         render :nothing => true, :status => :bad_request
       end

-    rescue OSM::APIPreconditionFailedError
-      render :text => "", :status => :precondition_failed
+    rescue OSM::APIError => ex
+      render ex.render_opts

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


@@ -72,14 +68,12 @@ class WayController < ApplicationController
   def delete
     begin
       way = Way.find(params[:id])
   def delete
     begin
       way = Way.find(params[:id])

-      way.delete_with_relations_and_history(@user)
+      way.delete_with_history(@user)

 
       # if we get here, all is fine, otherwise something will catch below.  
       render :nothing => true
 
       # 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 OSM::APIError => ex
+      render ex.render_opts

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