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

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 9f8f4a38bdf48e200dae71ce99e14cbf9ded46c3..8e8c8446d1c66ef420a50ac10f028c53da4a17f1 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -13,10 +13,13 @@ class NodeController < ApplicationController
   def create
     if request.put?
       node = Node.from_xml(request.raw_post, true)
   def create
     if request.put?
       node = Node.from_xml(request.raw_post, true)

+      # FIXME remove debug
+      logger.debug request.raw_post
+      logger.debug node

 
       if node
 
       if node

-       node.version = 0
-        node.user_id = @user.id
+        node.version = 0
+        #node.changeset_id = node.changeset

         node.visible = true
         node.save_with_history!
 
         node.visible = true
         node.save_with_history!
 


@@ -33,7 +36,7 @@ class NodeController < ApplicationController
   def read
     begin
       node = Node.find(params[:id])
   def read
     begin
       node = Node.find(params[:id])

-      if node.visible
+      if node.visible?

         response.headers['Last-Modified'] = node.timestamp.rfc822
         render :text => node.to_xml.to_s, :content_type => "text/xml"
        else
         response.headers['Last-Modified'] = node.timestamp.rfc822
         render :text => node.to_xml.to_s, :content_type => "text/xml"
        else


@@ -43,6 +46,21 @@ class NodeController < ApplicationController
       render :nothing => true, :status => :not_found
     end
   end
       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
 
   # Update a node from given XML
   def update


@@ -51,17 +69,14 @@ class NodeController < ApplicationController
       new_node = Node.from_xml(request.raw_post)
 
       if new_node and new_node.id == node.id
       new_node = Node.from_xml(request.raw_post)
 
       if new_node and new_node.id == node.id

-        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!
-
-        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
       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
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end


@@ -72,24 +87,18 @@ class NodeController < ApplicationController
   def delete
     begin
       node = Node.find(params[:id])
   def delete
     begin
       node = Node.find(params[:id])

-
-      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 ])
-          render :text => "", :status => :precondition_failed
-        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]])
-          render :text => "", :status => :precondition_failed
-        else
-          node.user_id = @user.id
-          node.visible = 0
-          node.save_with_history!
-
-          render :nothing => true
-        end
-      else
-        render :text => "", :status => :gone
-      end
+      # FIXME we no longer care about the user, (or maybe we want to check
+      # that the user of the changeset is the same user as is making this
+      # little change?) we really care about the 
+      # changeset which must be open, and that the version that we have been
+      # given is the one that is currently stored in the database
+      node.delete_with_history(@user)
+
+      render :nothing => true

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

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

     end
   end
 
     end
   end