X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f99c383318c4f9ea15639f0566f3e42db4e2c8b1..12228510c3d543493d8907731281871c8785c40e:/app/models/old_node.rb?ds=sidebyside diff --git a/app/models/old_node.rb b/app/models/old_node.rb index cc2327d08..620cc24d2 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -24,7 +24,7 @@ # nodes_redaction_id_fkey (redaction_id => redactions.id) # -class OldNode < ActiveRecord::Base +class OldNode < ApplicationRecord include GeoRecord include ConsistencyValidations include ObjectMetadata @@ -32,15 +32,15 @@ class OldNode < ActiveRecord::Base self.table_name = "nodes" self.primary_keys = "node_id", "version" - # note this needs to be included after the table name changes, or + # NOTE: this needs to be included after the table name changes, or # the queries generated by Redactable will use the wrong table name. include Redactable validates :changeset, :presence => true, :associated => true validates :latitude, :presence => true, - :numericality => { :integer_only => true } + :numericality => { :only_integer => true } validates :longitude, :presence => true, - :numericality => { :integer_only => true } + :numericality => { :only_integer => true } validates :timestamp, :presence => true validates :visible, :inclusion => [true, false] @@ -105,7 +105,7 @@ class OldNode < ActiveRecord::Base end def tags - @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }] + @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h end attr_writer :tags