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

Some improvements for the XML parsing, as there are somethings that we don't need, like timestamp and visibility, thus hopefully bringing a speedup in the xml parsing. Some more AMF controller fixes, plenty more to go though.

Browse source
This commit is contained in:
Shaun McDonald 2008-12-09 18:44:11 +00:00
parent 67157f69f3
commit b7335940e2
4 changed files with 62 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/node.rb
View file

@ -83,6 +83,7 @@ class Node < ActiveRecord::Base
raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
node.lat = pt['lat'].to_f
node.lon = pt['lon'].to_f
raise OSM::APIBadXMLError.new("node", pt, "changeset id missing") if pt['changeset'].nil?
node.changeset_id = pt['changeset'].to_i
raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
@ -99,15 +100,10 @@ class Node < ActiveRecord::Base
# visible if it says it is, or as the default if the attribute
# is missing.
node.visible = pt['visible'].nil? or pt['visible'] == 'true'
# Don't need to set the visibility, when it is set explicitly in the create/update/delete
#node.visible = pt['visible'].nil? or pt['visible'] == 'true'
if create
node.timestamp = Time.now
else
if pt['timestamp']
node.timestamp = Time.parse(pt['timestamp'])
end
end
# We don't care about the time, as it is explicitly set on create/update/delete
tags = []

2
app/models/relation.rb
View file

@ -49,6 +49,8 @@ class Relation < ActiveRecord::Base
raise OSM::APIBadXMLError.new("relation", pt, "You are missing the required changeset in the relation") if pt['changeset'].nil?
relation.changeset_id = pt['changeset']
# The follow block does not need to be executed because they are dealt with
# in create_with_history, update_from and delete_with_history
if create
relation.timestamp = Time.now
relation.visible = true

8
app/models/way.rb
View file

@ -47,8 +47,10 @@ class Way < ActiveRecord::Base
end
way.version = pt['version']
raise OSM::APIBadXMLError.new("node", pt, "Changeset is required") if pt['changeset'].nil?
way.changeset_id = pt['changeset']
# This next section isn't required for the create, update, or delete of ways
if create
way.timestamp = Time.now
way.visible = true
@ -244,7 +246,7 @@ class Way < ActiveRecord::Base
check_consistency(self, new_way, user)
if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
:conditions => [ "visible = ? AND member_type='way' and member_id=? ", true, self.id])
raise OSM::APIPreconditionFailedError
raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
else
self.changeset_id = new_way.changeset_id
self.tags = []
@ -259,12 +261,15 @@ class Way < ActiveRecord::Base
# FIXME: merge the potlatch code to delete the relations
# and refactor to use delete_with_history!
# This really needs the ids and versions of the nodes/relations to be passed in too
# so that we can do the version checking before the delete
def delete_with_relations_and_nodes_and_history(changeset_id)
# delete the nodes not used by other ways
self.unshared_node_ids.each do |node_id|
n = Node.find(node_id)
n.changeset_id = changeset_id
n.visible = false
# FIXME next line is bad
n.save_with_history!
end
@ -272,6 +277,7 @@ class Way < ActiveRecord::Base
self.tags = []
self.nds = []
self.visible = false
# FIXME next line is bad
self.save_with_history!
end