adding the controller code to be able to get a specific version of a node, way or...

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index fd01008fa511778aaf1e503a32ee6898c4df782b..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
-        if !way.preconditions_ok?
+        unless way.preconditions_ok?
           render :text => "", :status => :precondition_failed
         else
-         way.version = 0
-          way.user_id = @user.id
+          way.version = 0
           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
+    rescue OSM::APIError => ex
+      render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
@@ -51,47 +52,28 @@ class WayController < ApplicationController
       new_way = Way.from_xml(request.raw_post)
 
       if new_way and new_way.id == way.id
-        unless update_internal(way, new_way)
-          render :text => "", :status => :precondition_failed
-        else
-          render :nothing => true
-        end
+        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::APIError => ex
+      render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 
-  def update_internal way, new_way
-    way = Way.find(new_way.id) if way.nil?
-
-    if !new_way.preconditions_ok?
-      return false
-    else
-      way.user_id = @user.id
-      way.tags = new_way.tags
-      way.nds = new_way.nds
-      way.visible = true
-      way.save_with_history!
-
-      return true
-    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)
+      way.delete_with_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 OSM::APIError => ex
+      render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end