X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/df11677afd55ef592330a05c43ed4baa81b60572..c9a171c74581e0eb80794e2c9ed92e1b8faffa42:/app/models/way.rb?ds=sidebyside diff --git a/app/models/way.rb b/app/models/way.rb index de69f7565..34afc6585 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -1,15 +1,19 @@ class Way < ActiveRecord::Base require 'xml/libxml' + set_table_name 'current_ways' + belongs_to :user - has_many :nodes, :through => :way_nodes, :order => 'sequence_id' + has_many :old_ways, :foreign_key => 'id', :order => 'version' + has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id' - has_many :way_tags, :foreign_key => 'id' + has_many :nodes, :through => :way_nodes, :order => 'sequence_id' - has_many :old_ways, :foreign_key => 'id', :order => 'version' + has_many :way_tags, :foreign_key => 'id' - set_table_name 'current_ways' + 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 def self.from_xml(xml, create=false) begin @@ -199,6 +203,8 @@ class Way < ActiveRecord::Base def update_from(new_way, user) if !new_way.preconditions_ok? raise OSM::APIPreconditionFailedError.new + elsif new_way.version != version + raise OSM::APIVersionMismatchError.new(new_way.version, version) else self.user_id = user.id self.tags = new_way.tags @@ -219,8 +225,7 @@ class Way < ActiveRecord::Base return true end - # Delete the way and it's relations, but don't really delete it - set its visibility to false and update the history etc to maintain wiki-like functionality. - def delete_with_relations_and_history(user) + def delete_with_history(user) if self.visible # FIXME # this should actually delete the relations, @@ -244,6 +249,8 @@ class Way < ActiveRecord::Base end # delete a way and it's nodes that aren't part of other ways, with history + + # FIXME: merge the potlatch code to delete the relations def delete_with_relations_and_nodes_and_history(user) node_ids = self.nodes.collect {|node| node.id } @@ -264,7 +271,12 @@ class Way < ActiveRecord::Base self.user_id = user.id - self.delete_with_relations_and_history(user) + self.delete_with_history(user) + + end + # Temporary method to match interface to nodes + def tags_as_hash + return self.tags end end