X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9d2f920feb9dce028b985e8d452538d3df7a1d9c..942e62117ff7f12d40618a94ea3f4e86f8cb25af:/app/models/changeset.rb diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 2ec26ecee..1aa1e1fd3 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -55,9 +55,6 @@ class Changeset < ActiveRecord::Base before_save :update_closed_at - # over-expansion factor to use when updating the bounding box - EXPAND = 0.1 - # maximum number of elements allowed in a changeset MAX_ELEMENTS = 10000 @@ -127,12 +124,9 @@ class Changeset < ActiveRecord::Base end ## - # expand the bounding box to include the given bounding box. also, - # 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. + # expand the bounding box to include the given bounding box. def update_bbox!(bbox_update) - bbox.expand!(bbox_update, EXPAND) + bbox.expand!(bbox_update) # update active record. rails 2.1's dirty handling should take care of # whether this object needs saving or not. @@ -141,8 +135,7 @@ class Changeset < ActiveRecord::Base ## # the number of elements is also passed in so that we can ensure that - # a single changeset doesn't contain too many elements. this, of course, - # destroys the optimisation described in the bbox method above. + # a single changeset doesn't contain too many elements. def add_changes!(elements) self.num_changes += elements end @@ -239,6 +232,7 @@ class Changeset < ActiveRecord::Base bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete? el1["comments_count"] = comments.length.to_s + el1["changes_count"] = num_changes.to_s if include_discussion el2 = XML::Node.new("discussion")