# Start new changeset
def startchangeset(usertoken, cstags, closeid, closecomment)
- user = getuserid(usertoken)
+ user = getuser(usertoken)
if !user then return -1,"You are not logged in, so Potlatch can't write any changes to the database." end
# close previous changeset and add comment
if closeid
cs = Changeset.find(closeid)
cs.set_closed_time_now
- if closecomment.empty?
+ if cs.user_id!=user.id
+ return -2,"You cannot close that changeset because you're not the person who opened it."
+ elsif closecomment.empty?
cs.save!
else
cs.tags['comment']=closecomment
# open a new changeset
cs = Changeset.new
cs.tags = cstags
- cs.user_id = uid
- # Don't like the next two lines. These need to be abstracted to the model more/better
+ cs.user_id = user.id
+ # smsm1 doesn't like the next two lines and thinks they need to be abstracted to the model more/better
cs.created_at = Time.now
- cs.closed_at = Time.new + Changeset::IDLE_TIMEOUT
+ cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT
cs.save_with_tags!
return [0,cs.id]
end
points = way.nodes.collect do |node|
nodetags=node.tags
nodetags.delete('created_by')
- [node.lon, node.lat, node.id, nodetags]
+ [node.lon, node.lat, node.id, nodetags, node.version]
end
tags = way.tags
version = way.version
# Returns array listing GPXs, each one comprising id, name and description.
def findgpx(searchterm, usertoken)
- uid = getuserid(usertoken)
+ user = getuser(usertoken)
if !uid then return -1,"You must be logged in to search for GPX traces." end
gpxs = []
if searchterm.to_i>0 then
- gpx = Trace.find(searchterm.to_i, :conditions => ["visible=? AND (public=? OR user_id=?)",true,true,uid] )
+ gpx = Trace.find(searchterm.to_i, :conditions => ["visible=? AND (public=? OR user_id=?)",true,true,user.id] )
if gpx then
gpxs.push([gpx.id, gpx.name, gpx.description])
end
else
- Trace.find(:all, :limit => 21, :conditions => ["visible=? AND (public=? OR user_id=?) AND MATCH(name) AGAINST (?)",true,true,uid,searchterm] ).each do |gpx|
+ Trace.find(:all, :limit => 21, :conditions => ["visible=? AND (public=? OR user_id=?) AND MATCH(name) AGAINST (?)",true,true,user.id,searchterm] ).each do |gpx|
gpxs.push([gpx.id, gpx.name, gpx.description])
end
end
# 2. new relation id.
def putrelation(renumberednodes, renumberedways, usertoken, changeset, version, relid, tags, members, visible) #:doc:
- user = getuserid(usertoken)
+ user = getuser(usertoken)
if !user then return -1,"You are not logged in, so the relation could not be saved." end
relid = relid.to_i
visible = (visible.to_i != 0)
+ new_relation = nil
+ relation = nil
Relation.transaction do
# create a new relation, or find the existing one
if relid > 0
return [0, relid, relation.id, relation.version]
end
rescue OSM::APIChangesetAlreadyClosedError => ex
- return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
+ return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}."]
rescue OSM::APIVersionMismatchError => ex
# Really need to check to see whether this is a server load issue, and the
# last version was in the same changeset, or belongs to the same user, then
# we can return something different
- return [-3, "You have taken too long to edit, please reload the area"]
+ return [-3, "You have taken too long to edit, please reload the area."]
rescue OSM::APIAlreadyDeletedError => ex
return [-1, "The object has already been deleted"]
rescue OSM::APIError => ex
# Save a way to the database, including all nodes. Any nodes in the previous
# version and no longer used are deleted.
#
+ # Parameters:
+ # 0. hash of renumbered nodes (added by amf_controller)
+ # 1. current user token (for authentication)
+ # 2. current changeset
+ # 3. new way version
+ # 4. way ID
+ # 5. list of nodes in way
+ # 6. hash of way tags
+ # 7. array of nodes to change (each one is [lon,lat,id,version,tags])
+ #
# Returns:
# 0. '0' (code for success),
# 1. original way id (unchanged),
# 2. new way id,
# 3. hash of renumbered nodes (old id=>new id),
- # 4. version
+ # 4. way version,
+ # 5. hash of node versions (node=>version)
- def putway(renumberednodes, usertoken, changeset, version, originalway, points, attributes) #:doc:
+ def putway(renumberednodes, usertoken, changeset, version, originalway, pointlist, attributes, nodes) #:doc:
- # -- Initialise and carry out checks
+ # -- Initialise
user = getuser(usertoken)
if !user then return -1,"You are not logged in, so the way could not be saved." end
+ if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end
originalway = originalway.to_i
+ pointlist.collect! {|a| a.to_i }
- points.each do |a|
- if a[2] == 0 or a[2].nil? then return -2,"Server error - node with id 0 found in way #{originalway}." end
- if a[1] == 90 then return -2,"Server error - node with lat -90 found in way #{originalway}." end
- end
-
- if points.length < 2 then return -2,"Server error - way is only #{points.length} points long." end
+ way=nil # this is returned, so scope it outside the transaction
+ nodeversions = {}
+ Way.transaction do
- # -- Get unique nodes
+ # -- Get unique nodes
- Way.transaction do
if originalway <= 0
uniques = []
else
way = Way.find(originalway)
uniques = way.unshared_node_ids
end
- new_way = Way.new
-
- # -- Compare nodes and save changes to any that have changed
-
- nodes = []
-
- points.each do |n|
- lon = n[0].to_f
- lat = n[1].to_f
- id = n[2].to_i
- version = n[3].to_i # FIXME which index does the version come in on????
- savenode = false
- # We always need a new node if we are saving it
- new_node = Node.new
- if renumberednodes[id]
- id = renumberednodes[id]
- end
+ #-- Update each changed node
+
+ nodes.each do |a|
+ lon = a[0].to_f
+ lat = a[1].to_f
+ id = a[2].to_i
+ version = a[3].to_i
+ if id == 0 then return -2,"Server error - node with id 0 found in way #{originalway}." end
+ if lat== 90 then return -2,"Server error - node with latitude -90 found in way #{originalway}." end
+ if renumberednodes[id] then id = renumberednodes[id] end
+
+ node = Node.new
+ node.changeset_id = changeset
+ node.lat = lat
+ node.lon = lon
+ node.tags = a[4]
+ node.tags.delete('created_by')
+ node.version = version
if id <= 0
- # Create new node
- savenode = true
+ # We're creating the node
+ node.create_with_history(user)
+ renumberednodes[id] = node.id
+ nodeversions[node.id] = node.version
else
- # Don't modify this node, make any changes you want to the new_node above
- node = Node.find(id)
- nodetags=node.tags
- nodetags.delete('created_by')
- if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or
- n[4] != nodetags or !node.visible?
- savenode = true
- end
- end
-
- if savenode
- new_node.changeset_id = changeset
- new_node.lat = lat
- new_node.lon = lon
- new_node.tags = n[4]
- new_node.version = version
- if id <= 0
- # We're creating the node
- new_node.create_with_history(user)
- else
- # We're updating the node (no delete here)
- node.update_from(new_node, user)
- end
-
- if id != node.id
- renumberednodes[id] = node.id
- id = node.id
- end
+ # We're updating an existing node
+ previous=Node.find(id)
+ previous.update_from(node, user)
+ nodeversions[previous.id] = previous.version
end
-
- uniques = uniques - [id]
- nodes.push(id)
end
- # -- Delete any unique nodes
-
- uniques.each do |n|
- #deleteitemrelations(n, 'node')
+ # -- Delete any unique nodes no longer used
+ uniques=uniques-pointlist
+ uniques.each do |n|
node = Node.find(n)
new_node = Node.new
new_node.changeset_id = changeset
# -- Save revised way
- if way.tags!=attributes or way.nds!=nodes or !way.visible?
- new_way = Way.new
- new_way.tags = attributes
- new_way.nds = nodes
- new_way.changeset_id = changeset
- new_way.version = version
+ pointlist.collect! {|a|
+ renumberednodes[a] ? renumberednodes[a]:a
+ } # renumber nodes
+ new_way = Way.new
+ new_way.tags = attributes
+ new_way.nds = pointlist
+ new_way.changeset_id = changeset
+ new_way.version = version
+ if originalway <= 0
+ new_way.create_with_history(user)
+ way=new_way # so we can get way.id and way.version
+ elsif way.tags!=attributes or way.nds!=pointlist or !way.visible?
way.update_from(new_way, user)
end
end # transaction
- [0, originalway, way.id, renumberednodes, way.version]
+ [0, originalway, way.id, renumberednodes, way.version, nodeversions]
rescue OSM::APIChangesetAlreadyClosedError => ex
- return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
+ return [-2, "Sorry, your changeset #{ex.changeset.id} has been closed (at #{ex.changeset.closed_at})."]
rescue OSM::APIVersionMismatchError => ex
# Really need to check to see whether this is a server load issue, and the
# last version was in the same changeset, or belongs to the same user, then
# we can return something different
- return [-3, "You have taken too long to edit, please reload the area"]
+ return [-3, "Sorry, someone else has changed this way since you started editing - please reload the area"]
rescue OSM::APITooManyWayNodesError => ex
- return [-1, "You have tried to upload a way with #{ex.provided}, however only #{ex.max} are allowed."]
+ return [-1, "You have tried to upload a really long way with #{ex.provided} points: only #{ex.max} are allowed."]
rescue OSM::APIAlreadyDeletedError => ex
- return [-1, "The object has already been deleted"]
+ return [-1, "The object has already been deleted."]
rescue OSM::APIError => ex
# Some error that we don't specifically catch
- return [-2, "Something really bad happened :-()"]
+ return [-2, "Something really bad happened :-(."]
end
# Save POI to the database.
id = id.to_i
visible = (visible.to_i == 1)
-
+ node = nil
+ new_node = nil
Node.transaction do
if id > 0 then
node = Node.find(id)
# We're deleting the node
node.delete_with_history!(new_node, user)
end
- end # transaction
+ end # transaction
if id <= 0
return [0, id, new_node.id, new_node.version]
else
return [0, id, node.id, node.version]
- end
+ end
rescue OSM::APIChangesetAlreadyClosedError => ex
return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
rescue OSM::APIVersionMismatchError => ex
def deleteway(usertoken, changeset_id, way_id, way_version, node_id_version) #:doc:
user = getuser(usertoken)
unless user then return -1,"You are not logged in, so the way could not be deleted." end
+
+ way_id = way_id.to_i
# Need a transaction so that if one item fails to delete, the whole delete fails.
Way.transaction do
- way_id = way_id.to_i
# FIXME: would be good not to make two history entries when removing
# two nodes from the same relation
delete_way = Way.new
delete_way.version = way_version
old_way.delete_with_history!(delete_way, user)
- end
+ end # transaction
[0, way_id]
rescue OSM::APIChangesetAlreadyClosedError => ex
return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
# Remove a node or way from all relations
# FIXME needs version, changeset, and user
+ # Fixme make sure this doesn't depend on anything and delete this, as potlatch
+ # itself should remove the relations first
def deleteitemrelations(objid, type, version) #:doc:
relations = RelationMember.find(:all,
:conditions => ['member_type = ? and member_id = ?', type, objid],
end
return user
end
-
- def getuserid(token)
- user = getuser(token)
- return user ? user.id : nil;
- end
-
- # Compare two floating-point numbers to within 0.0000001
-
- def fpcomp(a,b) #:doc:
- return ((a/0.0000001).round==(b/0.0000001).round)
- end
# Send AMF response
projects / rails.git / blobdiff