split_node_tags:

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index c1bbe5f72f13f220ca6d72df484cd70be60a2d20..a7f74e50c7e66e465581c3deb575a582df5670b2 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -15,6 +15,7 @@ class WayController < ApplicationController
         if !way.preconditions_ok?
           render :text => "", :status => :precondition_failed
         else
+         way.version = 0
           way.user_id = @user.id
           way.save_with_history!
 
@@ -69,29 +70,20 @@ class WayController < ApplicationController
     end
   end
 
+  # This is the API call to delete a way
   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 => ex
-      puts ex
     end
   end
 
@@ -140,7 +132,7 @@ class WayController < ApplicationController
   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