X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/603af36a83421a961afddc1604eabfea97f625ba..06a3213acdaab8d321ecbc4f1af47b9907bb5649:/app/controllers/relation_controller.rb?ds=sidebyside

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 8019fb56a..d00e9e077 100644
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -15,12 +15,9 @@ class RelationController < ApplicationController
           render :nothing => true, :status => :precondition_failed
         else
           relation.user_id = @user.id
+          relation.save_with_history!
 
-          if relation.save_with_history
-            render :text => relation.id.to_s, :content_type => "text/plain"
-          else
-            render :text => "save error", :status => :internal_server_error
-          end
+	  render :text => relation.id.to_s, :content_type => "text/plain"
         end
       else
         render :nothing => true, :status => :bad_request
@@ -61,12 +58,9 @@ class RelationController < ApplicationController
             relation.tags = new_relation.tags
             relation.members = new_relation.members
             relation.visible = true
+            relation.save_with_history!
 
-            if relation.save_with_history
-              render :nothing => true
-            else
-              render :nothing => true, :status => :internal_server_error
-            end
+            render :nothing => true
           end
         else
           render :nothing => true, :status => :bad_request
@@ -94,12 +88,9 @@ class RelationController < ApplicationController
           relation.tags = []
           relation.members = []
           relation.visible = false
+          relation.save_with_history!
 
-          if relation.save_with_history
-            render :nothing => true
-          else
-            render :nothing => true, :status => :internal_server_error
-          end
+          render :nothing => true
         end
       else
         render :nothing => true, :status => :gone
@@ -111,36 +102,73 @@ class RelationController < ApplicationController
     end
   end
 
+  # -----------------------------------------------------------------
+  # full
+  # 
+  # input parameters: id
+  #
+  # returns XML representation of one relation object plus all its
+  # members, plus all nodes part of member ways
+  # -----------------------------------------------------------------
   def full
     begin
       relation = Relation.find(params[:id])
 
       if relation.visible
-        # In future, we might want to do all the data fetch in one step
-        seg_ids = relation.segs + [-1]
-        segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"
 
-        node_ids = segments.collect {|segment| segment.node_a }
-        node_ids += segments.collect {|segment| segment.node_b }
-        node_ids += [-1]
-        nodes = Node.find(node_ids, :conditions => "visible = TRUE")
-
-        # Render
+        # first collect nodes, ways, and relations referenced by this relation.
+        
+        ways = Way.find_by_sql("select w.* from current_ways w,current_relation_members rm where "+
+            "rm.member_type='way' and rm.member_id=w.id and rm.id=#{relation.id}");
+        nodes = Node.find_by_sql("select n.* from current_nodes n,current_relation_members rm where "+
+            "rm.member_type='node' and rm.member_id=n.id and rm.id=#{relation.id}");
+        # note query is built to exclude self just in case.
+        relations = Relation.find_by_sql("select r.* from current_relations r,current_relation_members rm where "+
+            "rm.member_type='relation' and rm.member_id=r.id and rm.id=#{relation.id} and r.id<>rm.id");
+
+        # now additionally collect nodes referenced by ways. Note how we recursively 
+        # evaluate ways but NOT relations.
+
+        node_ids = nodes.collect {|node| node.id }
+        way_node_ids = ways.collect { |way|
+           way.way_nodes.collect { |way_node| way_node.node_id }
+        }
+        way_node_ids.flatten!
+        way_node_ids.uniq
+        way_node_ids -= node_ids
+        nodes += Node.find(way_node_ids)
+    
+        # create XML.
         doc = OSM::API.new.get_xml_doc
+        user_display_name_cache = {}
+
         nodes.each do |node|
-          doc.root << node.to_xml_node()
+          if node.visible? # should be unnecessary if data is consistent.
+            doc.root << node.to_xml_node(user_display_name_cache)
+          end
         end
-        segments.each do |segment|
-          doc.root << segment.to_xml_node()
+        ways.each do |way|
+          if way.visible? # should be unnecessary if data is consistent.
+            doc.root << way.to_xml_node(user_display_name_cache)
+          end
         end
-        doc.root << relation.to_xml_node()
-
+        relations.each do |rel|
+          if rel.visible? # should be unnecessary if data is consistent.
+            doc.root << rel.to_xml_node(user_display_name_cache)
+          end
+        end
+        # finally add self and output
+        doc.root << relation.to_xml_node(user_display_name_cache)
         render :text => doc.to_s, :content_type => "text/xml"
+
       else
+
         render :nothing => true, :status => :gone
       end
+
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
+
     rescue
       render :nothing => true, :status => :internal_server_error
     end
@@ -162,6 +190,16 @@ class RelationController < ApplicationController
     end
   end
 
+  def relations_for_way
+    relations_for_object("way")
+  end
+  def relations_for_node
+    relations_for_object("node")
+  end
+  def relations_for_relation
+    relations_for_object("relation")
+  end
+
   def relations_for_object(objtype)
     relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq
 
@@ -174,7 +212,7 @@ class RelationController < ApplicationController
 
       render :text => doc.to_s, :content_type => "text/xml"
     else
-      render :nothing => true, :status => :bad_request
+      render :nothing => true, :status => :not_found
     end
   end
 end