Update to iD v1.7.2

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 1f301e9fb168d805569d3d873ebb0c9a26d30a13..e7a968a09449408b3d61d79a9bf9bfd3bdff6aa0 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,32 +1,29 @@
 class WayController < ApplicationController
 class WayController < ApplicationController

-  require 'xml/libxml'
+  require "xml/libxml"

 
 

-  before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :require_allow_write_api, :only => [:create, :update, :delete]
-  before_filter :require_public_data, :only => [:create, :update, :delete]
-  before_filter :check_api_writable, :only => [:create, :update, :delete]
-  before_filter :check_api_readable, :except => [:create, :update, :delete]
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
+  skip_before_action :verify_authenticity_token
+  before_action :authorize, :only => [:create, :update, :delete]
+  before_action :require_allow_write_api, :only => [:create, :update, :delete]
+  before_action :require_public_data, :only => [:create, :update, :delete]
+  before_action :check_api_writable, :only => [:create, :update, :delete]
+  before_action :check_api_readable, :except => [:create, :update, :delete]
+  around_action :api_call_handle_error, :api_call_timeout

 
   def create
     assert_method :put
 
     way = Way.from_xml(request.raw_post, true)
 
   def create
     assert_method :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"
-    else
-      render :nothing => true, :status => :bad_request
-    end
+
+    # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
+    way.create_with_history @user
+    render :text => way.id.to_s, :content_type => "text/plain"

   end
 
   def read
     way = Way.find(params[:id])
   end
 
   def read
     way = Way.find(params[:id])

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

     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


@@ -37,43 +34,45 @@ class WayController < ApplicationController
   def update
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
   def update
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)

-    
-    if new_way and new_way.id == way.id
-      way.update_from(new_way, @user)
-      render :text => way.version.to_s, :content_type => "text/plain"
-    else
-      render :nothing => true, :status => :bad_request
+
+    unless new_way && new_way.id == way.id
+      fail OSM::APIBadUserInput.new("The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})")

     end
     end

+
+    way.update_from(new_way, @user)
+    render :text => way.version.to_s, :content_type => "text/plain"

   end
 
   # This is the API call to delete a way
   def delete
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
   end
 
   # This is the API call to delete a way
   def delete
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)

-    
-    if new_way and new_way.id == way.id
+
+    if new_way && new_way.id == way.id

       way.delete_with_history!(new_way, @user)
       render :text => way.version.to_s, :content_type => "text/plain"
     else
       way.delete_with_history!(new_way, @user)
       render :text => way.version.to_s, :content_type => "text/plain"
     else

-      render :nothing => true, :status => :bad_request
+      render :text => "", :status => :bad_request

     end
   end
 
   def full
     end
   end
 
   def full

-    way = Way.find(params[:id], :include => {:nodes => :node_tags})
-    
+    way = Way.includes(:nodes => :node_tags).find(params[:id])
+

     if way.visible
     if way.visible

+      visible_nodes = {}

       changeset_cache = {}
       user_display_name_cache = {}
 
       doc = OSM::API.new.get_xml_doc
       changeset_cache = {}
       user_display_name_cache = {}
 
       doc = OSM::API.new.get_xml_doc

-      way.nodes.each do |node|
+      way.nodes.uniq.each do |node|

         if node.visible
           doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
         if node.visible
           doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)

+          visible_nodes[node.id] = node

         end
       end
         end
       end

-      doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache)
-      
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+

       render :text => doc.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone
       render :text => doc.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone


@@ -81,33 +80,31 @@ class WayController < ApplicationController
   end
 
   def ways
   end
 
   def ways

-    begin
-      ids = params['ways'].split(',').collect { |w| w.to_i }
-    rescue
-      ids = []
+    unless params["ways"]
+      fail OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]")

     end
 
     end
 

-    if ids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    ids = params["ways"].split(",").collect(&:to_i)

 
 

-      Way.find(ids).each do |way|
-        doc.root << way.to_xml_node
-      end
+    if ids.length == 0
+      fail OSM::APIBadUserInput.new("No ways were given to search for")
+    end

 
 

-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :bad_request
+    doc = OSM::API.new.get_xml_doc
+
+    Way.find(ids).each do |way|
+      doc.root << way.to_xml_node

     end
     end

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

   end
 
   ##
   end
 
   ##

-  # returns all the ways which are currently using the node given in the 
+  # 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
   # :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

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

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