split_node_tags: Remove old unused files.

[rails.git] / app / models / relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 93e9379b68694901152881b1ba0c5e1d541d0e66..3a9c0d9d5ff4b881b895b9c2492167814ee7a690 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -108,8 +108,8 @@ class Relation < ActiveRecord::Base
   # relationships, i.e. deliver referenced objects like we do with ways... 
   # FIXME: rip out the fucking SQL
   def self.find_for_nodes_and_ways(node_ids, way_ids)
-    return [] if node_ids.empty? and node_ids.empty?
-    relations = Array.new
+    relations = []
+
     if node_ids.length > 0
       relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +
             "e.visible=1 and " +
@@ -120,6 +120,8 @@ class Relation < ActiveRecord::Base
             "e.visible=1 and " +
             "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})")
     end
+
+    relations # if you don't do this then it returns nil and not []
   end
 
 
@@ -165,13 +167,12 @@ class Relation < ActiveRecord::Base
   def save_with_history!
     Relation.transaction do
       t = Time.now
+      self.version += 1
       self.timestamp = t
       self.save!
 
       tags = self.tags
-
       RelationTag.delete_all(['id = ?', self.id])
-
       tags.each do |k,v|
         tag = RelationTag.new
         tag.k = k
@@ -181,9 +182,7 @@ class Relation < ActiveRecord::Base
       end
 
       members = self.members
-
       RelationMember.delete_all(['id = ?', self.id])
-
       members.each do |n|
         mem = RelationMember.new
         mem.id = self.id