Rename create element consistency check

diff --git a/app/models/concerns/consistency_validations.rb b/app/models/concerns/consistency_validations.rb
index 97b6743ebc80752b1a5f9e9ef0f7b8f2592dc7fc..a99896b3ce4fde833f8103539273a934503ba7cc 100644 (file)
--- a/app/models/concerns/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -22,7 +22,7 @@ module ConsistencyValidations
   end
 
   # This is similar to above, just some validations don't apply
   end
 
   # This is similar to above, just some validations don't apply

-  def check_create_consistency(new, user)
+  def check_create_element_consistency(new, user)

     check_changeset_consistency(new.changeset, user)
   end
 
     check_changeset_consistency(new.changeset, user)
   end
 

diff --git a/app/models/node.rb b/app/models/node.rb
index ad4318487b722839771e0a94b9cfc62561a966bd..385bc732a6051a32e88ddbbfd050568cc22e16c9 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -189,7 +189,7 @@ class Node < ApplicationRecord
   end
 
   def create_with_history(user)
   end
 
   def create_with_history(user)

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

     self.version = 0
     self.visible = true
 
     self.version = 0
     self.visible = true
 

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 0a4a660a6fa536c52a025a4b337c521e85ab59be..c87f70dad48fbb3ff6b4ba92188d1d82640ba680 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -195,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

diff --git a/app/models/way.rb b/app/models/way.rb
index b11c225ddb1cfd0a6fb604174d4e39354eab0276..2a989f9f3b6d6068647d41c7c2fa47aa5a01a52b 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -155,7 +155,7 @@ class Way < 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 way: data is invalid." unless preconditions_ok?
 
     self.version = 0
     raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." unless preconditions_ok?
 
     self.version = 0