Use resourceful routes for granting/revoking user roles

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 8bfac993b5bd9fdd2d512a4007dfff1304cae2ec..1bec9a33cfa05968c040904182ab12b14e8e588f 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -32,7 +32,7 @@ class Node < ApplicationRecord
 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

-  has_many :old_nodes, -> { order(:version) }
+  has_many :old_nodes, -> { order(:version) }, :inverse_of => :current_node

 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes


@@ -49,8 +49,6 @@ class Node < 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 :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,
   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,


@@ -147,7 +145,7 @@ class Node < ApplicationRecord
     # shouldn't be possible to get race conditions.
     Node.transaction do
       lock!
     # shouldn't be possible to get race conditions.
     Node.transaction do
       lock!

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

       ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id)
       raise OSM::APIPreconditionFailedError, "Node #{id} is still used by ways #{ways.collect(&:id).join(',')}." unless ways.empty?
 
       ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id)
       raise OSM::APIPreconditionFailedError, "Node #{id} is still used by ways #{ways.collect(&:id).join(',')}." unless ways.empty?
 


@@ -168,7 +166,7 @@ class Node < ApplicationRecord
   def update_from(new_node, user)
     Node.transaction do
       lock!
   def update_from(new_node, user)
     Node.transaction do
       lock!

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

 
       # update changeset first
       self.changeset_id = new_node.changeset_id
 
       # update changeset first
       self.changeset_id = new_node.changeset_id


@@ -191,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
 


@@ -201,12 +199,8 @@ class Node < ApplicationRecord
     save_with_history!
   end
 
     save_with_history!
   end
 

-  def tags_as_hash
-    tags
-  end
-

   def tags
   def tags

-    @tags ||= node_tags.collect { |t| [t.k, t.v] }.to_h
+    @tags ||= node_tags.to_h { |t| [t.k, t.v] }

   end
 
   attr_writer :tags
   end
 
   attr_writer :tags


@@ -238,7 +232,7 @@ class Node < 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