Update to iD v2.18.2

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

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index b7d990c3d3570321d21614afc1ef94293d39055b..28e4a026bc47a820a5eb40faa7aa1c221e6364f6 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -11,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
 


@@ -22,10 +24,14 @@ module Api
     end
 
     def show
     end
 
     def show

-      relation = Relation.find(params[:id])
-      response.last_modified = relation.timestamp
-      if relation.visible
-        render :xml => relation.to_xml.to_s
+      @relation = Relation.find(params[:id])
+      response.last_modified = @relation.timestamp
+      if @relation.visible
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -88,35 +94,38 @@ module Api
         node_ids += way_node_ids.flatten
         nodes = Node.where(:id => node_ids.uniq).includes(:node_tags)
 
         node_ids += way_node_ids.flatten
         nodes = Node.where(:id => node_ids.uniq).includes(:node_tags)
 

-        # create XML.
-        doc = OSM::API.new.get_xml_doc

         visible_nodes = {}
         visible_nodes = {}

-        changeset_cache = {}
-        user_display_name_cache = {}

 
 

+        @nodes = []

         nodes.each do |node|
           next unless node.visible? # should be unnecessary if data is consistent.
 
         nodes.each do |node|
           next unless node.visible? # should be unnecessary if data is consistent.
 

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

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

+        @ways = []

         ways.each do |way|
           next unless way.visible? # should be unnecessary if data is consistent.
 
         ways.each do |way|
           next unless way.visible? # should be unnecessary if data is consistent.
 

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

         end
 
         end
 

+        @relations = []

         relations.each do |rel|
           next unless rel.visible? # should be unnecessary if data is consistent.
 
         relations.each do |rel|
           next unless rel.visible? # should be unnecessary if data is consistent.
 

-          doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)
+          @relations << rel

         end
 
         end
 

-        # finally add self and output
-        doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache)
-        render :xml => doc.to_s
+        # finally add self
+        @relations << relation

 
 

+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -129,13 +138,13 @@ module Api
 
       raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
 
 
       raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
 

-      doc = OSM::API.new.get_xml_doc
+      @relations = Relation.find(ids)

 
 

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

       end
       end

-
-      render :xml => doc.to_s

     end
 
     def relations_for_way
     end
 
     def relations_for_way


@@ -155,13 +164,17 @@ module Api
     def relations_for_object(objtype)
       relationids = RelationMember.where(:member_type => objtype, :member_id => params[:id]).collect(&:relation_id).uniq
 
     def relations_for_object(objtype)
       relationids = RelationMember.where(:member_type => objtype, :member_id => params[:id]).collect(&:relation_id).uniq
 

-      doc = OSM::API.new.get_xml_doc
+      @relations = []

 
       Relation.find(relationids).each do |relation|
 
       Relation.find(relationids).each do |relation|

-        doc.root << relation.to_xml_node if relation.visible
+        @relations << relation if relation.visible

       end
 
       end
 

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

     end
   end
 end
     end
   end
 end