X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b2a8df0bd73f1031dcf4684e084897a28b117345..e3f91c688e750854d515f1070fdb9e6ddc8f74fc:/app/models/relation.rb?ds=sidebyside

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 275cafec2..2495830ee 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -122,25 +122,13 @@ class Relation < ActiveRecord::Base
     doc
   end
 
-  def to_xml_node(visible_members = nil, changeset_cache = {}, user_display_name_cache = {})
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el = XML::Node.new "relation"
     el["id"] = id.to_s
 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
     relation_members.each do |member|
-      p = 0
-
-      if visible_members
-        # if there is a list of visible members then use that to weed out deleted segments
-        p = 1 if visible_members[member.member_type][member.member_id]
-      else
-        # otherwise, manually go to the db to check things
-        p = 1 if member.member.visible?
-      end
-
-      next unless p
-
       member_el = XML::Node.new "member"
       member_el["type"] = member.member_type.downcase
       member_el["ref"] = member.member_id.to_s
@@ -194,9 +182,7 @@ class Relation < ActiveRecord::Base
   end
 
   def delete_with_history!(new_relation, user)
-    unless visible
-      raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id)
-    end
+    raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) unless visible
 
     # need to start the transaction here, so that the database can
     # provide repeatable reads for the used-by checks. this means it
@@ -220,9 +206,7 @@ class Relation < ActiveRecord::Base
     Relation.transaction do
       lock!
       check_consistency(self, new_relation, user)
-      unless new_relation.preconditions_ok?(members)
-        raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid."
-      end
+      raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." unless new_relation.preconditions_ok?(members)
       self.changeset_id = new_relation.changeset_id
       self.changeset = new_relation.changeset
       self.tags = new_relation.tags
@@ -234,9 +218,7 @@ class Relation < ActiveRecord::Base
 
   def create_with_history(user)
     check_create_consistency(self, user)
-    unless preconditions_ok?
-      raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid."
-    end
+    raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok?
     self.version = 0
     self.visible = true
     save_with_history!
@@ -271,9 +253,7 @@ class Relation < ActiveRecord::Base
       element = model.lock("for share").find_by(:id => m[1])
 
       # and check that it is OK to use.
-      unless element && element.visible? && element.preconditions_ok?
-        raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}"
-      end
+      raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" unless element && element.visible? && element.preconditions_ok?
       hash[m[1]] = true
     end