X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/094855be22a06ceeef5366bdf103b303deb38a12..38b9f8f7927f09b32a94df87d1264f568f620480:/app/models/changeset.rb?ds=inline diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 803cbb52f..ab6e05ccf 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -1,9 +1,9 @@ class Changeset < ActiveRecord::Base require 'xml/libxml' - belongs_to :user + belongs_to :user, :counter_cache => true - has_many :changeset_tags, :foreign_key => 'id' + has_many :changeset_tags has_many :nodes has_many :ways @@ -11,6 +11,9 @@ class Changeset < ActiveRecord::Base has_many :old_nodes has_many :old_ways has_many :old_relations + + 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 @@ -19,7 +22,8 @@ class Changeset < ActiveRecord::Base 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_associated :user + + before_save :update_closed_at # over-expansion factor to use when updating the bounding box EXPAND = 0.1 @@ -53,7 +57,7 @@ class Changeset < ActiveRecord::Base def self.from_xml(xml, create=false) begin - p = XML::Parser.string(xml) + p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR) doc = p.parse doc.find('//osm/changeset').each do |pt| @@ -89,21 +93,11 @@ class Changeset < ActiveRecord::Base # returns the bounding box of the changeset. it is possible that some # or all of the values will be nil, indicating that they are undefined. def bbox - @bbox ||= [ min_lon, min_lat, max_lon, max_lat ] + @bbox ||= BoundingBox.new(min_lon, min_lat, max_lon, max_lat) end def has_valid_bbox? - not bbox.include? nil - end - - ## - # returns area of the changset bbox as a rough comparitive quantity for use of changset displays - def area - if has_valid_bbox? - (max_lon - min_lon) * (max_lat - min_lat) - else - 0 - end + bbox.complete? end ## @@ -111,21 +105,12 @@ class Changeset < ActiveRecord::Base # expand a little bit more in the direction of the expansion, so that # further expansions may be unnecessary. this is an optimisation # suggested on the wiki page by kleptog. - def update_bbox!(array) - # ensure that bbox is cached and has no nils in it. if there are any - # nils, just use the bounding box update to write over them. - @bbox = bbox.zip(array).collect { |a, b| a.nil? ? b : a } - - # FIXME - this looks nasty and violates DRY... is there any prettier - # way to do this? - @bbox[0] = [-180 * GeoRecord::SCALE, array[0] + EXPAND * (@bbox[0] - @bbox[2])].max if array[0] < @bbox[0] - @bbox[1] = [ -90 * GeoRecord::SCALE, array[1] + EXPAND * (@bbox[1] - @bbox[3])].max if array[1] < @bbox[1] - @bbox[2] = [ 180 * GeoRecord::SCALE, array[2] + EXPAND * (@bbox[2] - @bbox[0])].min if array[2] > @bbox[2] - @bbox[3] = [ 90 * GeoRecord::SCALE, array[3] + EXPAND * (@bbox[3] - @bbox[1])].min if array[3] > @bbox[3] - + def update_bbox!(bbox_update) + bbox.expand!(bbox_update, EXPAND) + # update active record. rails 2.1's dirty handling should take care of # whether this object needs saving or not. - self.min_lon, self.min_lat, self.max_lon, self.max_lat = @bbox + self.min_lon, self.min_lat, self.max_lon, self.max_lat = @bbox.to_a if bbox.complete? end ## @@ -171,13 +156,13 @@ class Changeset < ActiveRecord::Base self.save! tags = self.tags - ChangesetTag.delete_all(['id = ?', self.id]) + ChangesetTag.delete_all(:changeset_id => self.id) tags.each do |k,v| tag = ChangesetTag.new + tag.changeset_id = self.id tag.k = k tag.v = v - tag.id = self.id tag.save! end end @@ -187,7 +172,7 @@ class Changeset < ActiveRecord::Base # set the auto-close time to be one hour in the future unless # 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 before_save + 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 @@ -197,13 +182,13 @@ class Changeset < ActiveRecord::Base end end - def to_xml + def to_xml(include_discussion = false) doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node() + doc.root << to_xml_node(nil, include_discussion) return doc end - def to_xml_node(user_display_name_cache = nil) + def to_xml_node(user_display_name_cache = nil, include_discussion = false) el1 = XML::Node.new 'changeset' el1['id'] = self.id.to_s @@ -231,10 +216,26 @@ class Changeset < ActiveRecord::Base el1['closed_at'] = self.closed_at.xmlschema unless is_open? el1['open'] = is_open?.to_s - el1['min_lon'] = (bbox[0].to_f / GeoRecord::SCALE).to_s unless bbox[0].nil? - el1['min_lat'] = (bbox[1].to_f / GeoRecord::SCALE).to_s unless bbox[1].nil? - el1['max_lon'] = (bbox[2].to_f / GeoRecord::SCALE).to_s unless bbox[2].nil? - el1['max_lat'] = (bbox[3].to_f / GeoRecord::SCALE).to_s unless bbox[3].nil? + if bbox.complete? + bbox.to_unscaled.add_bounds_to(el1, '_') + end + + el1['comments_count'] = self.comments.count.to_s + + if include_discussion + el2 = XML::Node.new('discussion') + self.comments.includes(:author).each do |comment| + el3 = XML::Node.new('comment') + el3['date'] = comment.created_at.xmlschema + el3['uid'] = comment.author.id.to_s if comment.author.data_public? + el3['user'] = comment.author.display_name.to_s if comment.author.data_public? + el4 = XML::Node.new('text') + el4.content = comment.body.to_s + el3 << el4 + el2 << el3 + end + el1 << el2 + end # NOTE: changesets don't include the XML of the changes within them, # they are just structures for tagging. to get the osmChange of a