Added first attempt at bounding box support in changesets and tests for the same.

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index db4dd52a6799f68960b32a001bf1d0b7b50626c7..9836ef4f1e29d9d65053f2cbacb833e4a7cb2bb2 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -221,6 +221,9 @@ class Relation < ActiveRecord::Base
       old_relation = OldRelation.from_relation(self)
       old_relation.timestamp = t
       old_relation.save_with_dependencies!
+
+      # update the bbox of the changeset and save it too.
+      # FIXME: what is the bounding box of a relation?
     end
   end
 
@@ -320,4 +323,22 @@ class Relation < ActiveRecord::Base
   def tags_as_hash
     return self.tags
   end
+
+  ##
+  # if any members are referenced by placeholder IDs (i.e: negative) then
+  # this calling this method will fix them using the map from placeholders 
+  # to IDs +id_map+. 
+  def fix_placeholders!(id_map)
+    self.members.map! do |type, id, role|
+      old_id = id.to_i
+      if old_id < 0
+        new_id = id_map[type.to_sym][old_id]
+        raise "invalid placeholder" if new_id.nil?
+        [type, new_id, role]
+      else
+        [type, id, role]
+      end
+    end
+  end
+
 end