cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed up delete methods on nodes, ways and relations to return the new version number and added some more tests.

Browse source
This commit is contained in:
Matt Amos 2008-10-14 14:27:12 +00:00
parent 2c16177174
commit b56f57ec43
10 changed files with 100 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/node.rb
View file

@ -133,7 +133,7 @@ class Node < ActiveRecord::Base
end
# Should probably be renamed delete_from to come in line with update
def delete_with_history(new_node, user)
def delete_with_history!(new_node, user)
if self.visible
check_consistency(self, new_node, user)
if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", self.id ])

8
app/models/relation.rb
View file

@ -224,14 +224,12 @@ class Relation < ActiveRecord::Base
end
end
def delete_with_history(new_relation, user)
def delete_with_history!(new_relation, user)
if self.visible
check_consistency(self, new_relation, user)
if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", self.id ])
if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=? ", self.id ])
raise OSM::APIPreconditionFailedError.new
else
#self.user_id = user.id
# FIXME we need to deal with changeset here, which is probably already dealt with
self.changeset_id = new_relation.changeset_id
self.tags = []
self.members = []
@ -248,8 +246,6 @@ class Relation < ActiveRecord::Base
if !new_relation.preconditions_ok?
raise OSM::APIPreconditionFailedError.new
end
# FIXME need to deal with changeset etc
#self.user_id = user.id
self.changeset_id = new_relation.changeset_id
self.tags = new_relation.tags
self.members = new_relation.members

11
app/models/way.rb
View file

@ -245,19 +245,12 @@ class Way < ActiveRecord::Base
return true
end
def delete_with_history(new_way, 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!!
# WHY?? The editor should decide whether the node is in the relation or not!
# 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.changeset_id = new_way.changeset_id
self.tags = []