X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e78061cdba5cfb3f299f57b7643d2b396ee235b..63aaf045ac868675155c76468c9286eaaa3acd83:/app/models/way.rb?ds=sidebyside diff --git a/app/models/way.rb b/app/models/way.rb index 7bb82b281..203d3b703 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -22,15 +22,14 @@ class Way < ApplicationRecord include ConsistencyValidations include NotRedactable - include ObjectMetadata self.table_name = "current_ways" belongs_to :changeset - has_many :old_ways, -> { order(:version) } + has_many :old_ways, -> { order(:version) }, :inverse_of => :current_way - has_many :way_nodes, -> { order(:sequence_id) } + has_many :way_nodes, -> { order(:sequence_id) }, :inverse_of => :way has_many :nodes, :through => :way_nodes has_many :way_tags @@ -42,8 +41,6 @@ class Way < ApplicationRecord :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] @@ -113,7 +110,7 @@ class Way < ApplicationRecord end def tags - @tags ||= way_tags.collect { |t| [t.k, t.v] }.to_h + @tags ||= way_tags.to_h { |t| [t.k, t.v] } end attr_writer :nds, :tags @@ -145,7 +142,7 @@ class Way < ApplicationRecord def update_from(new_way, user) Way.transaction do lock! - check_consistency(self, new_way, user) + check_update_element_consistency(self, new_way, user) raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." unless new_way.preconditions_ok?(nds) self.changeset_id = new_way.changeset_id @@ -158,7 +155,7 @@ class Way < ApplicationRecord 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 @@ -196,7 +193,7 @@ class Way < ApplicationRecord # shouldn't be possible to get race conditions. Way.transaction do lock! - check_consistency(self, new_way, user) + check_update_element_consistency(self, new_way, user) rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id) raise OSM::APIPreconditionFailedError, "Way #{id} is still used by relations #{rels.collect(&:id).join(',')}." unless rels.empty? @@ -230,7 +227,7 @@ class Way < ApplicationRecord private def save_with_history! - t = Time.now.getutc + t = Time.now.utc self.version += 1 self.timestamp = t