X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/413baecf6b27056cb73e6bb4bedb33de6410c65e..34e3e51456774127d43408b7ab65c24f41373f62:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 074ae3ba1..c105fa089 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -1,23 +1,23 @@ class Way < ActiveRecord::Base require 'xml/libxml' - + include ConsistencyValidations include NotRedactable include ObjectMetadata self.table_name = "current_ways" - + belongs_to :changeset has_many :old_ways, -> { order(:version) } has_many :way_nodes, -> { order(:sequence_id) } - has_many :nodes, -> { order("sequence_id") }, :through => :way_nodes + has_many :nodes, :through => :way_nodes has_many :way_tags has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :changeset_id,:version, :timestamp @@ -28,7 +28,7 @@ class Way < ActiveRecord::Base validates_associated :changeset scope :visible, -> { where(:visible => true) } - scope :invisible, -> { where(:visible => false) } + scope :invisible, -> { where(:visible => false) } # Read in xml as text and return it's Way object representation def self.from_xml(xml, create=false) @@ -56,13 +56,13 @@ class Way < ActiveRecord::Base unless create raise OSM::APIBadXMLError.new("way", pt, "ID is required when updating") if pt['id'].nil? way.id = pt['id'].to_i - # .to_i will return 0 if there is no number that can be parsed. + # .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 == 0 end # We don't care about the timestamp nor the visibility as these are either - # set explicitly or implicit in the action. The visibility is set to true, + # set explicitly or implicit in the action. The visibility is set to true, # and manually set to false before the actual delete. way.visible = true @@ -85,7 +85,7 @@ class Way < ActiveRecord::Base # Find a way given it's ID, and in a single SQL call also grab its nodes # - + # You can't pull in all the tags too unless we put a sequence_id on the way_tags table and have a multipart key def self.find_eager(id) way = Way.find(id, :include => {:way_nodes => :node}) @@ -101,9 +101,10 @@ class Way < ActiveRecord::Base end def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {}) - el1 = XML::Node.new 'way' - el1['id'] = self.id.to_s - add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache) + el = XML::Node.new 'way' + el['id'] = self.id.to_s + + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) # make sure nodes are output in sequence_id order ordered_nodes = [] @@ -123,39 +124,23 @@ class Way < ActiveRecord::Base ordered_nodes.each do |nd_id| if nd_id and nd_id != '0' - e = XML::Node.new 'nd' - e['ref'] = nd_id - el1 << e + node_el = XML::Node.new 'nd' + node_el['ref'] = nd_id + el << node_el end end - self.way_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end - return el1 - end + add_tags_to_xml_node(el, self.way_tags) + + return el + end def nds - unless @nds - @nds = Array.new - self.way_nodes.each do |nd| - @nds += [nd.node_id] - end - end - @nds + @nds ||= self.way_nodes.collect { |n| n.node_id } end def tags - unless @tags - @tags = {} - self.way_tags.each do |tag| - @tags[tag.k] = tag.v - end - end - @tags + @tags ||= Hash[self.way_tags.collect { |t| [t.k, t.v] }] end def nds=(s) @@ -197,7 +182,7 @@ class Way < ActiveRecord::Base unless new_way.preconditions_ok?(self.nds) raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.") end - + self.changeset_id = new_way.changeset_id self.changeset = new_way.changeset self.tags = new_way.tags @@ -243,8 +228,8 @@ class Way < ActiveRecord::Base unless self.visible raise OSM::APIAlreadyDeletedError.new("way", new_way.id) end - - # need to start the transaction here, so that the database can + + # need to start the transaction here, so that the database can # provide repeatable reads for the used-by checks. this means it # shouldn't be possible to get race conditions. Way.transaction do @@ -270,8 +255,8 @@ class Way < ActiveRecord::Base ## # if any referenced nodes are placeholder IDs (i.e: are negative) then - # this calling this method will fix them using the map from placeholders - # to IDs +id_map+. + # this calling this method will fix them using the map from placeholders + # to IDs +id_map+. def fix_placeholders!(id_map, placeholder_id = nil) self.nds.map! do |node_id| if node_id < 0 @@ -285,12 +270,12 @@ class Way < ActiveRecord::Base end private - + def save_with_history! t = Time.now.getutc - # 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 + # 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 # later in the save. cs = self.changeset @@ -330,7 +315,7 @@ class Way < ActiveRecord::Base # new set of nodes. self.reload - # update and commit the bounding box, now that way nodes + # update and commit the bounding box, now that way nodes # have been updated and we're in a transaction. cs.update_bbox!(bbox) unless nodes.empty?