X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..ae4487921350e141efed42fdf7cd3fd70d72bc97:/app/models/changeset.rb?ds=sidebyside diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 11a098137..2ec26ecee 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -1,3 +1,30 @@ +# == Schema Information +# +# Table name: changesets +# +# id :integer not null, primary key +# user_id :integer not null +# created_at :datetime not null +# min_lat :integer +# max_lat :integer +# min_lon :integer +# max_lon :integer +# closed_at :datetime not null +# num_changes :integer default(0), not null +# +# Indexes +# +# changesets_bbox_idx (min_lat,max_lat,min_lon,max_lon) +# changesets_closed_at_idx (closed_at) +# changesets_created_at_idx (created_at) +# changesets_user_id_created_at_idx (user_id,created_at) +# changesets_user_id_id_idx (user_id,id) +# +# Foreign Keys +# +# changesets_user_id_fkey (user_id => users.id) +# + class Changeset < ActiveRecord::Base require "xml/libxml" @@ -15,13 +42,16 @@ class Changeset < ActiveRecord::Base has_many :comments, -> { where(:visible => true).order(:created_at) }, :class_name => "ChangesetComment" has_and_belongs_to_many :subscribers, :class_name => "User", :join_table => "changesets_subscribers", :association_foreign_key => "subscriber_id" - validates_presence_of :id, :on => :update - validates_presence_of :user_id, :created_at, :closed_at, :num_changes - validates_uniqueness_of :id - validates_numericality_of :id, :on => :update, :integer_only => true - validates_numericality_of :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, :integer_only => true - validates_numericality_of :user_id, :integer_only => true - validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0 + validates :id, :uniqueness => true, :presence => { :on => :update }, + :numericality => { :on => :update, :integer_only => true } + validates :user_id, :presence => true, + :numericality => { :integer_only => true } + validates :num_changes, :presence => true, + :numericality => { :integer_only => true, + :greater_than_or_equal_to => 0 } + validates :created_at, :closed_at, :presence => true + validates :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, + :numericality => { :integer_only => true } before_save :update_closed_at @@ -29,7 +59,7 @@ class Changeset < ActiveRecord::Base EXPAND = 0.1 # maximum number of elements allowed in a changeset - MAX_ELEMENTS = 50000 + MAX_ELEMENTS = 10000 # maximum time a changeset is allowed to be open for. MAX_TIME_OPEN = 1.day @@ -60,7 +90,7 @@ class Changeset < ActiveRecord::Base doc.find("//osm/changeset").each do |pt| return Changeset.from_xml_node(pt, create) end - fail OSM::APIBadXMLError.new("changeset", xml, "XML doesn't contain an osm/changeset element.") + raise OSM::APIBadXMLError.new("changeset", xml, "XML doesn't contain an osm/changeset element.") rescue LibXML::XML::Error, ArgumentError => ex raise OSM::APIBadXMLError.new("changeset", xml, ex.message) end @@ -77,8 +107,8 @@ class Changeset < ActiveRecord::Base end pt.find("tag").each do |tag| - fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag["k"].nil? - fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag["v"].nil? + raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag["k"].nil? + raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag["v"].nil? cs.add_tag_keyval(tag["k"], tag["v"]) end @@ -117,10 +147,6 @@ class Changeset < ActiveRecord::Base self.num_changes += elements end - def tags_as_hash - tags - end - def tags unless @tags @tags = {} @@ -134,11 +160,11 @@ class Changeset < ActiveRecord::Base attr_writer :tags def add_tag_keyval(k, v) - @tags = {} unless @tags + @tags ||= {} # duplicate tags are now forbidden, so we can't allow values # in the hash to be overwritten. - fail OSM::APIDuplicateTagsError.new("changeset", id, k) if @tags.include? k + raise OSM::APIDuplicateTagsError.new("changeset", id, k) if @tags.include? k @tags[k] = v end @@ -147,10 +173,10 @@ class Changeset < ActiveRecord::Base # do the changeset update and the changeset tags update in the # same transaction to ensure consistency. Changeset.transaction do - self.save! + save! tags = self.tags - ChangesetTag.delete_all(:changeset_id => id) + ChangesetTag.where(:changeset_id => id).delete_all tags.each do |k, v| tag = ChangesetTag.new @@ -167,12 +193,12 @@ class Changeset < ActiveRecord::Base # that would make it more than 24h long, in which case clip to # 24h, as this has been decided is a reasonable time limit. def update_closed_at - if self.is_open? - if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT) - self.closed_at = created_at + MAX_TIME_OPEN - else - self.closed_at = Time.now.getutc + IDLE_TIMEOUT - end + if is_open? + self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT) + created_at + MAX_TIME_OPEN + else + Time.now.getutc + IDLE_TIMEOUT + end end end @@ -212,7 +238,7 @@ class Changeset < ActiveRecord::Base bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete? - el1["comments_count"] = comments.count.to_s + el1["comments_count"] = comments.length.to_s if include_discussion el2 = XML::Node.new("discussion") @@ -242,10 +268,10 @@ class Changeset < ActiveRecord::Base # bounding box, only the tags of the changeset. def update_from(other, user) # ensure that only the user who opened the changeset may modify it. - fail OSM::APIUserChangesetMismatchError.new unless user.id == user_id + raise OSM::APIUserChangesetMismatchError unless user.id == user_id # can't change a closed changeset - fail OSM::APIChangesetAlreadyClosedError.new(self) unless is_open? + raise OSM::APIChangesetAlreadyClosedError, self unless is_open? # copy the other's tags self.tags = other.tags