Avoid linking to redirects on the osmfoundation website

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 61ae45c99d24b65512ce480c55b70ad7dc9a81da..f09647320004f99dc1734964a3e265ffb97b272e 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -39,8 +39,6 @@ class Relation < ApplicationRecord
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }

-  validates :changeset_id, :presence => true,
-                           :numericality => { :only_integer => true }

   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]
   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]


@@ -168,7 +166,7 @@ class Relation < ApplicationRecord
     # shouldn't be possible to get race conditions.
     Relation.transaction do
       lock!
     # shouldn't be possible to get race conditions.
     Relation.transaction do
       lock!

-      check_consistency(self, new_relation, user)
+      check_update_element_consistency(self, new_relation, user)

       # This will check to see if this relation is used by another relation
       rel = RelationMember.joins(:relation).find_by("visible = ? AND member_type = 'Relation' and member_id = ? ", true, id)
       raise OSM::APIPreconditionFailedError, "The relation #{new_relation.id} is used in relation #{rel.relation.id}." unless rel.nil?
       # This will check to see if this relation is used by another relation
       rel = RelationMember.joins(:relation).find_by("visible = ? AND member_type = 'Relation' and member_id = ? ", true, id)
       raise OSM::APIPreconditionFailedError, "The relation #{new_relation.id} is used in relation #{rel.relation.id}." unless rel.nil?


@@ -184,7 +182,7 @@ class Relation < ApplicationRecord
   def update_from(new_relation, user)
     Relation.transaction do
       lock!
   def update_from(new_relation, user)
     Relation.transaction do
       lock!

-      check_consistency(self, new_relation, user)
+      check_update_element_consistency(self, new_relation, user)

       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
       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


@@ -197,7 +195,7 @@ class Relation < ApplicationRecord
   end
 
   def create_with_history(user)
   end
 
   def create_with_history(user)

-    check_create_consistency(self, user)
+    check_create_element_consistency(self, user)

     raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok?
 
     self.version = 0
     raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok?
 
     self.version = 0


@@ -265,7 +263,7 @@ class Relation < ApplicationRecord
   private
 
   def save_with_history!
   private
 
   def save_with_history!

-    t = Time.now.getutc
+    t = Time.now.utc

 
     self.version += 1
     self.timestamp = t
 
     self.version += 1
     self.timestamp = t