Merge remote-tracking branch 'upstream/pull/2642'

[rails.git] / app / controllers / api / ways_controller.rb

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index 2de2d619becf6408927f18ded462a45478bd8c28..3b58f208b14e729a696a0f7e2e0ba0cd6ada631e 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -3,7 +3,6 @@ module Api
     require "xml/libxml"
 
     before_action :authorize, :only => [:create, :update, :delete]
     require "xml/libxml"
 
     before_action :authorize, :only => [:create, :update, :delete]

-    before_action :api_deny_access_handler

 
     authorize_resource
 
 
     authorize_resource
 


@@ -12,6 +11,8 @@ module Api
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 

+    before_action :set_request_formats, :except => [:create, :update, :delete]
+

     def create
       assert_method :put
 
     def create
       assert_method :put
 


@@ -23,12 +24,16 @@ module Api
     end
 
     def show
     end
 
     def show

-      way = Way.find(params[:id])
+      @way = Way.find(params[:id])

 
 

-      response.last_modified = way.timestamp
+      response.last_modified = @way.timestamp

 
 

-      if way.visible
-        render :xml => way.to_xml.to_s
+      if @way.visible
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -60,23 +65,25 @@ module Api
     end
 
     def full
     end
 
     def full

-      way = Way.includes(:nodes => :node_tags).find(params[:id])
+      @way = Way.includes(:nodes => :node_tags).find(params[:id])

 
 

-      if way.visible
+      if @way.visible

         visible_nodes = {}
         visible_nodes = {}

-        changeset_cache = {}
-        user_display_name_cache = {}

 
 

-        doc = OSM::API.new.get_xml_doc
-        way.nodes.uniq.each do |node|
+        @nodes = []
+
+        @way.nodes.uniq.each do |node|

           if node.visible
           if node.visible

-            doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+            @nodes << node

             visible_nodes[node.id] = node
           end
         end
             visible_nodes[node.id] = node
           end
         end

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

 
 

-        render :xml => doc.to_s
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -91,13 +98,13 @@ module Api
 
       raise OSM::APIBadUserInput, "No ways were given to search for" if ids.empty?
 
 
       raise OSM::APIBadUserInput, "No ways were given to search for" if ids.empty?
 

-      doc = OSM::API.new.get_xml_doc
+      @ways = Way.find(ids)

 
 

-      Way.find(ids).each do |way|
-        doc.root << way.to_xml_node
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json

       end
       end

-
-      render :xml => doc.to_s

     end
 
     ##
     end
 
     ##


@@ -107,13 +114,13 @@ module Api
     def ways_for_node
       wayids = WayNode.where(:node_id => params[:id]).collect { |ws| ws.id[0] }.uniq
 
     def ways_for_node
       wayids = WayNode.where(:node_id => params[:id]).collect { |ws| ws.id[0] }.uniq
 

-      doc = OSM::API.new.get_xml_doc
+      @ways = Way.where(:id => wayids, :visible => true)

 
 

-      Way.find(wayids).each do |way|
-        doc.root << way.to_xml_node if way.visible
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json

       end
       end

-
-      render :xml => doc.to_s

     end
   end
 end
     end
   end
 end