Correctly record which user deleted an object.

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index d297f0accc6bf09f98c03825b4d496185fd246a1..dca9241a698e490ba2d497bddbff54a5f880d237 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,26 +1,26 @@
-class WayController < ApplicationController\r
+class WayController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
   after_filter :compress_output
-  \r
+
   def create
+    response.headers["Content-Type"] = 'text/xml'
     if request.put?
       way = Way.from_xml(request.raw_post, true)
 
       if way
         way.user_id = @user.id
+
         unless way.preconditions_ok? # are the segments (and their nodes) visible?
-          render :nothing => true, :status => 412
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
           return
         end
 
         if way.save_with_history
           render :text => way.id.to_s
-          return
         else
           render :nothing => true, :status => 500
-          return
         end
         return
       else
@@ -32,7 +32,7 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def full\r
+  def full
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
@@ -68,12 +68,14 @@ class WayController < ApplicationController
   end
 
   def rest
+    response.headers["Content-Type"] = 'text/xml'
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
     end
 
     way = Way.find(params[:id])
+
     case request.method
 
     when :get
@@ -84,38 +86,37 @@ class WayController < ApplicationController
       render :text => way.to_xml.to_s
 
     when :delete
-      unless way.visible
+      if way.visible
+        way.user_id = @user.id
+        way.visible = false
+        way.save_with_history
+        render :nothing => true
+      else
         render :nothing => true, :status => 410
-        return
       end
 
-      way.visible = false
-      way.save_with_history
-      render :nothing => true
-      return
     when :put
-      way = Way.from_xml(request.raw_post)
+      new_way = Way.from_xml(request.raw_post)
 
-      if way
-        way_in_db = Way.find(way.id)
-        if way_in_db
-          way_in_db.user_id = @user.id
-          way_in_db.tags = way.tags
-          way_in_db.segs = way.segs
-          way_in_db.timestamp = way.timestamp
-          way_in_db.visible = true
-          if way_in_db.save_with_history
-            render :text => way.id
-          else
-            render :nothing => true, :status => 500
-          end
+      if new_way
+        unless new_way.preconditions_ok? # are the segments (and their nodes) visible?
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
           return
+        end
+
+        way.user_id = @user.id
+        way.tags = new_way.tags
+        way.segs = new_way.segs
+        way.timestamp = new_way.timestamp
+        way.visible = true
+
+        if way.id == new_way.id and way.save_with_history
+          render :nothing => true
         else
-          render :nothing => true, :status => 404 # way doesn't exist yet
+          render :nothing => true, :status => 500
         end
       else
         render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
       end
     end
   end
@@ -128,7 +129,22 @@ class WayController < ApplicationController
       doc = OSM::API.new.get_xml_doc
       waylist.each do |way|
         doc.root << way.to_xml_node
-      end 
+      end
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400
+    end
+  end
+
+  def ways_for_segment
+    response.headers["Content-Type"] = 'text/xml'
+    wayids = WaySegment.find(:all, :conditions => ['segment_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
+    if wayids.length > 0
+      waylist = Way.find(wayids)
+      doc = OSM::API.new.get_xml_doc
+      waylist.each do |way|
+        doc.root << way.to_xml_node
+      end
       render :text => doc.to_s
     else
       render :nothing => true, :status => 400