X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f6695c9079f4eeeecaa796c879868f797f97cd55..7377cb63939f8743ca31e67ea3965c2b15d20057:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 98c4902f9..e5b73ceaa 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -1,3 +1,22 @@ +# == Schema Information +# +# Table name: current_ways +# +# id :integer not null, primary key +# changeset_id :integer not null +# timestamp :datetime not null +# visible :boolean not null +# version :integer not null +# +# Indexes +# +# current_ways_timestamp_idx (timestamp) +# +# Foreign Keys +# +# current_ways_changeset_id_fkey (changeset_id => changesets.id) +# + class Way < ActiveRecord::Base require "xml/libxml" @@ -58,7 +77,7 @@ class Way < ActiveRecord::Base way.id = pt["id"].to_i # .to_i will return 0 if there is no number that can be parsed. # We want to make sure that there is no id with zero anyway - raise OSM::APIBadUserInput.new("ID of way cannot be zero when updating.") if way.id.zero? + raise OSM::APIBadUserInput, "ID of way cannot be zero when updating." if way.id.zero? end # We don't care about the timestamp nor the visibility as these are either @@ -101,14 +120,10 @@ class Way < ActiveRecord::Base way_nodes.each do |nd| if visible_nodes # if there is a list of visible nodes then use that to weed out deleted nodes - if visible_nodes[nd.node_id] - ordered_nodes[nd.sequence_id] = nd.node_id.to_s - end + ordered_nodes[nd.sequence_id] = nd.node_id.to_s if visible_nodes[nd.node_id] else # otherwise, manually go to the db to check things - if nd.node && nd.node.visible? - ordered_nodes[nd.sequence_id] = nd.node_id.to_s - end + ordered_nodes[nd.sequence_id] = nd.node_id.to_s if nd.node && nd.node.visible? end end @@ -138,12 +153,12 @@ class Way < ActiveRecord::Base attr_writer :tags def add_nd_num(n) - @nds = [] unless @nds + @nds ||= [] @nds << n.to_i end 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. @@ -165,9 +180,7 @@ class Way < ActiveRecord::Base Way.transaction do lock! check_consistency(self, new_way, user) - unless new_way.preconditions_ok?(nds) - raise OSM::APIPreconditionFailedError.new("Cannot update way #{id}: data is invalid.") - end + raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." unless new_way.preconditions_ok?(nds) self.changeset_id = new_way.changeset_id self.changeset = new_way.changeset @@ -180,9 +193,7 @@ class Way < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - unless preconditions_ok? - raise OSM::APIPreconditionFailedError.new("Cannot create way: data is invalid.") - end + raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." unless preconditions_ok? self.version = 0 self.visible = true save_with_history! @@ -190,9 +201,7 @@ class Way < ActiveRecord::Base def preconditions_ok?(old_nodes = []) return false if nds.empty? - if nds.length > MAX_NUMBER_OF_WAY_NODES - raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) - end + raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) if nds.length > MAX_NUMBER_OF_WAY_NODES # check only the new nodes, for efficiency - old nodes having been checked last time and can't # be deleted when they're in-use. @@ -205,7 +214,7 @@ class Way < ActiveRecord::Base if db_nds.length < new_nds.length missing = new_nds - db_nds.collect(&:id) - raise OSM::APIPreconditionFailedError.new("Way #{id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible.") + raise OSM::APIPreconditionFailedError, "Way #{id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible." end end @@ -222,7 +231,7 @@ class Way < ActiveRecord::Base lock! check_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.new("Way #{id} is still used by relations #{rels.collect(&:id).join(',')}.") unless rels.empty? + raise OSM::APIPreconditionFailedError, "Way #{id} is still used by relations #{rels.collect(&:id).join(',')}." unless rels.empty? self.changeset_id = new_way.changeset_id self.changeset = new_way.changeset @@ -242,7 +251,7 @@ class Way < ActiveRecord::Base nds.map! do |node_id| if node_id < 0 new_id = id_map[:node][node_id] - raise OSM::APIBadUserInput.new("Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}") if new_id.nil? + raise OSM::APIBadUserInput, "Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}" if new_id.nil? new_id else node_id @@ -255,6 +264,9 @@ class Way < ActiveRecord::Base def save_with_history! t = Time.now.getutc + self.version += 1 + self.timestamp = t + # update the bounding box, note that this has to be done both before # and after the save, so that nodes from both versions are included in the # bbox. we use a copy of the changeset so that it isn't reloaded @@ -263,12 +275,12 @@ class Way < ActiveRecord::Base cs.update_bbox!(bbox) unless nodes.empty? Way.transaction do - self.version += 1 - self.timestamp = t - save! + # clone the object before saving it so that the original is + # still marked as dirty if we retry the transaction + clone.save! tags = self.tags - WayTag.delete_all(:way_id => id) + WayTag.where(:way_id => id).delete_all tags.each do |k, v| tag = WayTag.new tag.way_id = id @@ -278,7 +290,7 @@ class Way < ActiveRecord::Base end nds = self.nds - WayNode.delete_all(:way_id => id) + WayNode.where(:way_id => id).delete_all sequence = 1 nds.each do |n| nd = WayNode.new