class Way < ActiveRecord::Base
require 'xml/libxml'
+
+ include ConsistencyValidations
- belongs_to :user
+ set_table_name 'current_ways'
- has_many :nodes, :through => :way_nodes, :order => 'sequence_id'
- has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
- has_many :way_tags, :foreign_key => 'id'
+ validates_presence_of :changeset_id, :timestamp
+ validates_inclusion_of :visible, :in => [ true, false ]
+
+ belongs_to :changeset
has_many :old_ways, :foreign_key => 'id', :order => 'version'
- set_table_name 'current_ways'
+ has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
+ has_many :nodes, :through => :way_nodes, :order => 'sequence_id'
+
+ has_many :way_tags, :foreign_key => 'id'
+
+ 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
doc = p.parse
doc.find('//osm/way').each do |pt|
- way = Way.from_xml_node pt, create
+ return Way.from_xml_node(pt, create)
end
rescue
- way = nil
+ return nil
end
-
- return way
end
def self.from_xml_node(pt, create=false)
if !create and pt['id'] != '0'
way.id = pt['id'].to_i
end
+
+ way.version = pt['version']
+ way.changeset_id = pt['changeset']
if create
way.timestamp = Time.now
way.visible = true
else
if pt['timestamp']
- way.timestamp = Time.parse(pt['timestamp'])
+ way.timestamp = Time.parse(pt['timestamp'])
end
+ # if visible isn't present then it defaults to true
+ way.visible = (pt['visible'] or true)
end
pt.find('tag').each do |tag|
el1['visible'] = self.visible.to_s
el1['timestamp'] = self.timestamp.xmlschema
el1['version'] = self.version.to_s
+ el1['changeset'] = self.changeset_id.to_s
user_display_name_cache = {} if user_display_name_cache.nil?
- if user_display_name_cache and user_display_name_cache.key?(self.user_id)
+ if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
# use the cache if available
- elsif self.user.data_public?
- user_display_name_cache[self.user_id] = self.user.display_name
+ elsif self.changeset.user.data_public?
+ user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
else
- user_display_name_cache[self.user_id] = nil
+ user_display_name_cache[self.changeset.user_id] = nil
end
- el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
+ el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
# make sure nodes are output in sequence_id order
ordered_nodes = []
def add_tag_keyval(k, v)
@tags = Hash.new unless @tags
+
+ # duplicate tags are now forbidden, so we can't allow values
+ # in the hash to be overwritten.
+ raise OSM::APIDuplicateTagsError.new if @tags.include? k
+
@tags[k] = v
end
end
def update_from(new_way, user)
+ check_consistency(self, new_way, user)
if !new_way.preconditions_ok?
raise OSM::APIPreconditionFailedError.new
- else
- self.user_id = user.id
- self.tags = new_way.tags
- self.nds = new_way.nds
- self.visible = true
- save_with_history!
end
+ self.changeset_id = new_way.changeset_id
+ self.tags = new_way.tags
+ self.nds = new_way.nds
+ self.visible = true
+ save_with_history!
+ end
+
+ def create_with_history(user)
+ check_create_consistency(self, user)
+ if !self.preconditions_ok?
+ raise OSM::APIPreconditionFailedError.new
+ end
+ self.version = 0
+ self.visible = true
+ save_with_history!
end
def preconditions_ok?
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!(new_way, user)
+ check_consistency(self, new_way, user)
if self.visible
- # FIXME
- # this should actually delete the relations,
- # not just throw a PreconditionFailed if it's a member of a relation!!
-
- # FIXME: this should probably renamed to delete_with_history
if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
- :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
+ :conditions => [ "visible = 1 AND member_type='way' and member_id=? ", self.id])
raise OSM::APIPreconditionFailedError
- # end FIXME
else
- self.user_id = user.id
+ self.changeset_id = new_way.changeset_id
self.tags = []
self.nds = []
self.visible = false
end
# delete a way and it's nodes that aren't part of other ways, with history
- def delete_with_relations_and_nodes_and_history(user)
-
- node_ids = self.nodes.collect {|node| node.id }
- node_ids_not_to_delete = []
- way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")
-
- node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
-
- node_ids_to_delete = node_ids - node_ids_not_to_delete
+ # FIXME: merge the potlatch code to delete the relations
+ def delete_with_relations_and_nodes_and_history(user)
# delete the nodes not used by other ways
- node_ids_to_delete.each do |node_id|
+ self.unshared_node_ids.each do |node_id|
n = Node.find(node_id)
n.user_id = user.id
n.visible = false
n.save_with_history!
end
+ # FIXME needs more information passed in so that the changeset can be updated
self.user_id = user.id
- self.delete_with_relations_and_history(user)
+ self.delete_with_history(user)
+ end
+
+ # Find nodes that belong to this way only
+ def unshared_node_ids
+ node_ids = self.nodes.collect { |node| node.id }
+
+ unless node_ids.empty?
+ way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")
+ node_ids = node_ids - way_nodes.collect { |way_node| way_node.node_id }
+ end
+
+ return node_ids
+ end
+ # Temporary method to match interface to nodes
+ def tags_as_hash
+ return self.tags
end
end
projects / rails.git / blobdiff