Added min_lat > max_lat test.

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 658cf06f379e72d63e98045131884047ddc0fe1e..db4dd52a6799f68960b32a001bf1d0b7b50626c7 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -1,6 +1,8 @@
 class Relation < ActiveRecord::Base
   require 'xml/libxml'
   
 class Relation < ActiveRecord::Base
   require 'xml/libxml'
   

+  include ConsistencyValidations
+  

   set_table_name 'current_relations'
 
   belongs_to :changeset
   set_table_name 'current_relations'
 
   belongs_to :changeset


@@ -75,7 +77,7 @@ class Relation < ActiveRecord::Base
     
     if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
       # use the cache if available
     
     if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
       # use the cache if available

-    elsif self.user.data_public?
+    elsif self.changeset.user.data_public?

       user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
     else
       user_display_name_cache[self.changeset.user_id] = nil
       user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
     else
       user_display_name_cache[self.changeset.user_id] = nil


@@ -180,6 +182,11 @@ class Relation < ActiveRecord::Base
 
   def add_tag_keyval(k, v)
     @tags = Hash.new unless @tags
 
   def add_tag_keyval(k, v)
     @tags = Hash.new unless @tags

+
+    # duplicate tags are now forbidden, so we can't allow values
+    # in the hash to be overwritten.
+    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+

     @tags[k] = v
   end
 
     @tags[k] = v
   end
 


@@ -217,13 +224,13 @@ class Relation < ActiveRecord::Base
     end
   end
 
     end
   end
 

-  def delete_with_history(user)
+  def delete_with_history!(new_relation, user)

     if self.visible
     if self.visible

-      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", self.id ])
+      check_consistency(self, new_relation, user)
+      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=? ", self.id ])

         raise OSM::APIPreconditionFailedError.new
       else
         raise OSM::APIPreconditionFailedError.new
       else

-        #self.user_id = user.id
-        # FIXME we need to deal with changeset here, which is probably already dealt with
+        self.changeset_id = new_relation.changeset_id

         self.tags = []
         self.members = []
         self.visible = false
         self.tags = []
         self.members = []
         self.visible = false


@@ -235,23 +242,25 @@ class Relation < ActiveRecord::Base
   end
 
   def update_from(new_relation, user)
   end
 
   def update_from(new_relation, user)

+    check_consistency(self, new_relation, user)

     if !new_relation.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
     if !new_relation.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new

-    elsif new_relation.version != version
-      raise OSM::APIVersionMismatchError.new(new_relation.version, version)
-    elsif new_relation.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new_relation.changeset.open?
-      raise OSM::APIChangesetAlreadyClosedError.new
-    else
-      # FIXME need to deal with changeset etc
-      #self.user_id = user.id
-      self.changeset = new_relation.changeset
-      self.tags = new_relation.tags
-      self.members = new_relation.members
-      self.visible = true
-      save_with_history!

     end
     end

+    self.changeset_id = new_relation.changeset_id
+    self.tags = new_relation.tags
+    self.members = new_relation.members
+    self.visible = true
+    save_with_history!
+  end
+  
+  def create_with_history(user)
+    check_create_consistency(self, user)
+    if !self.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    end
+    self.version = 0
+    self.visible = true
+    save_with_history!

   end
 
   def preconditions_ok?
   end
 
   def preconditions_ok?