Fix statistics script to work with 0.6 database schema.

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index cf1634fa55699cccdae1084536256c3f7c5fc4bd..80c75d91c3644d4c72fb04c8ea8758687217fa5a 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -8,24 +8,22 @@ class WayController < ApplicationController
   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create

-    if request.put?
-      way = Way.from_xml(request.raw_post, true)
-
-      if way
-        if !way.preconditions_ok?
-          render :text => "", :status => :precondition_failed
-        else
-          way.version = 0
-          way.user_id = @user.id
-          way.save_with_history!
+    begin
+      if request.put?
+        way = Way.from_xml(request.raw_post, true)

 
 

+        if way
+          way.create_with_history @user

           render :text => way.id.to_s, :content_type => "text/plain"
           render :text => way.id.to_s, :content_type => "text/plain"

+        else
+          render :nothing => true, :status => :bad_request

         end
       else
         end
       else

-        render :nothing => true, :status => :bad_request
+        render :nothing => true, :status => :method_not_allowed

       end
       end

-    else
-      render :nothing => true, :status => :method_not_allowed
+    rescue OSM::APIError => ex
+      logger.warn request.raw_post
+      render ex.render_opts

     end
   end
 
     end
   end
 


@@ -59,6 +57,7 @@ class WayController < ApplicationController
         render :nothing => true, :status => :bad_request
       end
     rescue OSM::APIError => ex
         render :nothing => true, :status => :bad_request
       end
     rescue OSM::APIError => ex

+      logger.warn request.raw_post

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


@@ -69,10 +68,14 @@ class WayController < ApplicationController
   def delete
     begin
       way = Way.find(params[:id])
   def delete
     begin
       way = Way.find(params[:id])

-      way.delete_with_history(@user)
+      new_way = Way.from_xml(request.raw_post)

 
 

-      # if we get here, all is fine, otherwise something will catch below.  
-      render :nothing => true
+      if new_way and new_way.id == way.id
+        way.delete_with_history!(new_way, @user)
+        render :text => way.version.to_s, :content_type => "text/plain"
+      else
+        render :nothing => true, :status => :bad_request
+      end

     rescue OSM::APIError => ex
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound
     rescue OSM::APIError => ex
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound


@@ -86,7 +89,7 @@ class WayController < ApplicationController
 
       if way.visible
         nd_ids = way.nds + [-1]
 
       if way.visible
         nd_ids = way.nds + [-1]

-        nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{nd_ids.join(',')})")
+        nodes = Node.find(:all, :conditions => ["visible = ? AND id IN (#{nd_ids.join(',')})", true])

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


@@ -124,13 +127,19 @@ class WayController < ApplicationController
     end
   end
 
     end
   end
 

+  ##
+  # returns all the ways which are currently using the node given in the 
+  # :id parameter. note that this used to return deleted ways as well, but
+  # this seemed not to be the expected behaviour, so it was removed.

   def ways_for_node
   def ways_for_node

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

 
     doc = OSM::API.new.get_xml_doc
 
     Way.find(wayids).each do |way|
 
     doc = OSM::API.new.get_xml_doc
 
     Way.find(wayids).each do |way|

-      doc.root << way.to_xml_node
+      doc.root << way.to_xml_node if way.visible

     end
 
     render :text => doc.to_s, :content_type => "text/xml"
     end
 
     render :text => doc.to_s, :content_type => "text/xml"