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

[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 5e3e5e11ab1d511dea0882b5c455fa59c520f25b..9af087d83a31fb06de92ce0a5718f9aa10225cd7 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -22,12 +22,13 @@ 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
+        render :formats => [:xml]

       else
         head :gone
       end
       else
         head :gone
       end


@@ -59,23 +60,22 @@ 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
+        render :formats => [:xml]

       else
         head :gone
       end
       else
         head :gone
       end


@@ -90,13 +90,10 @@ 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
-
-      Way.find(ids).each do |way|
-        doc.root << way.to_xml_node
-      end
+      @ways = Way.find(ids)

 
 

-      render :xml => doc.to_s
+      # Render the result
+      render :formats => [:xml]

     end
 
     ##
     end
 
     ##


@@ -106,13 +103,10 @@ 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
-
-      Way.find(wayids).each do |way|
-        doc.root << way.to_xml_node if way.visible
-      end
+      @ways = Way.where(:id => wayids, :visible => true)

 
 

-      render :xml => doc.to_s
+      # Render the result
+      render :formats => [:xml]

     end
   end
 end
     end
   end
 end