Changing if not to unless to make code more readable.

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index ae5245016819636f9fd5fdf12335fbbc4a1bc1fb..70bf597345c27044a3282c105c02f0c796dfce43 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -15,7 +15,7 @@ class NodeController < ApplicationController
       node = Node.from_xml(request.raw_post, true)
 
       if node
-       node.version = 0
+        node.version = 0
         node.user_id = @user.id
         node.visible = true
         node.save_with_history!
@@ -43,6 +43,21 @@ class NodeController < ApplicationController
       render :nothing => true, :status => :not_found
     end
   end
+  
+  # Dump a specific version of the node based on the given params[:id] and params[:version]
+  def version
+    begin
+      node = Node.find(:first, :conditions => { :id => params[:id], :version => params[:version] } )
+      if node.visible
+        response.headers['Last-Modified'] = node.timestamp.rfc822
+        render :text => node.to_xml.to_s, :content_type => "text/xml"
+      else
+        render :nothing => true, :status => :gone
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
 
   # Update a node from given XML
   def update
@@ -51,61 +66,31 @@ class NodeController < ApplicationController
       new_node = Node.from_xml(request.raw_post)
 
       if new_node and new_node.id == node.id
-       update_internal node, new_node
-        render :nothing => true
+        node.update_from(new_node, @user)
+        render :text => node.version.to_s, :content_type => "text/plain"
       else
         render :nothing => true, :status => :bad_request
       end
+    rescue OSM::APIVersionMismatchError => ex
+      render :text => "Version mismatch: Provided " + ex.provided.to_s +
+       ", server had: " + ex.latest.to_s, :status => :bad_request
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 
-  def update_internal(node, new_node)
-    node = Node.find(new_node.id) if node.nil?
-
-    node.user_id = @user.id
-    node.latitude = new_node.latitude 
-    node.longitude = new_node.longitude
-    node.tags = new_node.tags
-    node.visible = true
-    node.save_with_history!
-
-    return true
-  end
-
   # Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way.
   # FIXME remove all the fricking SQL
   def delete
     begin
       node = Node.find(params[:id])
+      node.delete_with_history(@user)
 
-      res = delete_internal(node)
-      unless res
-       render :text => "", :status => :precondition_failed
-      else
-       render :text => "", :status => res
-      end
+      render :nothing => true
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    end
-  end
-
-  def delete_internal(node)
-    if node.visible
-      if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ])
-       return false
-      elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]])
-       return false
-      else
-       node.user_id = @user.id
-       node.visible = 0
-       node.save_with_history!
-
-       return :ok
-      end
-    else
-      return :gone
+    rescue OSM::APIError => ex
+      render ex.render_opts
     end
   end