Optimise finding of relations, partially reversing change #8443 but in

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 413c65d1cd55f9f812670a09d302bc9c0a61e59f..3b6491cf0b3ceda5ed90ee7e1da5e49579c6af21 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -32,6 +32,8 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
 
     begin
       way = Way.find(params[:id])
 

+      response.headers['Last-Modified'] = way.timestamp.rfc822
+

       if way.visible
         render :text => way.to_xml.to_s, :content_type => "text/xml"
       else
       if way.visible
         render :text => way.to_xml.to_s, :content_type => "text/xml"
       else


@@ -67,29 +69,20 @@ class WayController < ApplicationController
     end
   end
 
     end
   end
 

+  # This is the API call to delete a way

   def delete
     begin
       way = Way.find(params[:id])
   def delete
     begin
       way = Way.find(params[:id])

-
-      if way.visible
-        if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='way' and member_id=?", params[:id]])
-          render :text => "", :status => :precondition_failed
-        else
-          way.user_id = @user.id
-          way.tags = []
-          way.nds = []
-          way.visible = false
-         way.save_with_history!
-
-         render :nothing => true
-        end
-      else
-        render :text => "", :status => :gone
-      end
+      way.delete_with_relations_and_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 ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue => ex
-      puts ex

     end
   end
 
     end
   end
 


@@ -138,7 +131,7 @@ class WayController < ApplicationController
   end
 
   def ways_for_node
   end
 
   def ways_for_node

-    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
+    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id[0] }.uniq

 
     doc = OSM::API.new.get_xml_doc
 
 
     doc = OSM::API.new.get_xml_doc