#
# Public domain. Set your tab width to 4 to read this document. :)
# editions Systeme D / Richard Fairhurst 2004-2007
-
+
+ # to trap errors (getway_old,putway,putpoi,deleteway only):
+ # return(-1,"message") <-- just puts up a dialogue
+ # return(-2,"message") <-- also asks the user to e-mail me
# to log:
- # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
+ # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
# ====================================================================
# Main AMF handler
# (cf http://www.ruby-forum.com/topic/122163)
req.read(2) # Skip version indicator and client ID
results={} # Results of each body
+ renumberednodes={} # Shared across repeated putways
# -------------
# Parse request
when 'getway'; results[index]=putdata(index,getway(args))
when 'getway_old'; results[index]=putdata(index,getway_old(args))
when 'getway_history'; results[index]=putdata(index,getway_history(args))
- when 'putway'; results[index]=putdata(index,putway(args))
+ when 'putway'; r=putway(args,renumberednodes)
+ renumberednodes=r[3]
+ results[index]=putdata(index,r)
when 'deleteway'; results[index]=putdata(index,deleteway(args))
when 'putpoi'; results[index]=putdata(index,putpoi(args))
when 'getpoi'; results[index]=putdata(index,getpoi(args))
derelict canal: waterway=derelict_canal,name=(type name here)
unnavigable river: waterway=river,boat=no,name=(type name here)
unnavigable drain: waterway=drain,boat=no,name=(type name here)
+stream: waterway=stream,boat=no,name=(type name here)
way/railway
railway: railway=rail
pub: tourism=,amenity=pub,name=(type name here),religion=,denomination=
POI/natural
-peak: point=peak
+peak: natural=peak
EOF
StringIO.open(txt) do |file|
end
}
end
- return [presets,presetmenus,presetnames]
+ [presets,presetmenus,presetnames]
end
# ----- whichways(left,bottom,right,top)
points = pointlist.collect {|a| [a['id'],long2coord(a['lng'].to_f,baselong,masterscale),lat2coord(a['lat'].to_f,basey,masterscale),tag2array(a['tags'])] } # get a list of node ids and their tags
- return [ways,points]
+ [ways,points]
end
# ----- whichways_deleted(left,bottom,right,top)
def getway_old(args)
RAILS_DEFAULT_LOGGER.info(" Message: getway_old (server is #{SERVER_URL})")
- return if SERVER_URL=='www.openstreetmap.org'
+ if SERVER_URL=="www.openstreetmap.org" then return -1,"Revert is not currently enabled on the OpenStreetMap server." end
objname,wayid,version,baselong,basey,masterscale=args
wayid = wayid.to_i
attrlist.each {|a| attributes[a['k'].gsub(':','|')]=a['v'] }
attributes['history']="Retrieved from v"+version.to_s
- [objname,points,attributes,xmin,xmax,ymin,ymax,version]
+ [0,objname,points,attributes,xmin,xmax,ymin,ymax,version]
end
# ----- getway_history (way)
FROM ways,users
WHERE ways.id=#{wayid}
AND ways.user_id=users.id
+ AND ways.visible=1
ORDER BY version DESC
EOF
histlist=ActiveRecord::Base.connection.select_all(sql)
# returns current way ID, new way ID, hash of renumbered nodes,
# xmin,xmax,ymin,ymax
- # ** needs to be updated so that nodes with visible=0 (i.e. undeleted)
- # no longer cause a problem
- # best way to do this would be to know which version it was recovered from;
- # then replace readwayquery with historic query. Line 506 would also need
- # to check if visible had changed, and update if so
- # (a side-effect is that merging/splitting ways will need to be forbidden
- # for undeleted ways, I think)
-
- def putway(args)
+ def putway(args,renumberednodes)
RAILS_DEFAULT_LOGGER.info(" putway started")
usertoken,originalway,points,attributes,oldversion,baselong,basey,masterscale=args
uid=getuserid(usertoken)
- return if !uid
+ if !uid then return -1,"You are not logged in, so the way could not be saved." end
+
RAILS_DEFAULT_LOGGER.info(" putway authenticated happily")
- db_uqn='unin'+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars
- db_now='@now'+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars
+ db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars
+ db_now='@now'+(rand*100).to_i.to_s+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars
ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
originalway=originalway.to_i
oldversion=oldversion.to_i
RAILS_DEFAULT_LOGGER.info(" Message: putway, id=#{originalway}")
+ # -- Temporary check for null IDs
+
+ 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
+ end
+
# -- 3. read original way into memory
xc={}; yc={}; tagc={}; vc={}
xmin=ymin= 999999
xmax=ymax=-999999
insertsql=''
- renumberednodes={}
nodelist=[]
points.each_index do |i|
if (insertsql !='') then ActiveRecord::Base.connection.insert("INSERT INTO way_tags (id,k,v,version) VALUES #{insertsql}" ) end
if (currentsql!='') then ActiveRecord::Base.connection.insert("INSERT INTO current_way_tags (id,k,v) VALUES #{currentsql}") end
- [originalway,way,renumberednodes,xmin,xmax,ymin,ymax]
+ [0,originalway,way,renumberednodes,xmin,xmax,ymin,ymax]
end
# ----- putpoi (user token, id, x,y,tag array,visible,baselong,basey,masterscale)
def putpoi(args)
usertoken,id,x,y,tags,visible,baselong,basey,masterscale=args
uid=getuserid(usertoken)
- return if !uid
- db_now='@now'+uid.to_s+id.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars
+ if !uid then return -1,"You are not logged in, so the point could not be saved." end
+
+ db_now='@now'+(rand*100).to_i.to_s+uid.to_s+id.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars
ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
id=id.to_i
if visible==0 then
# if deleting, check node hasn't become part of a way
inway=ActiveRecord::Base.connection.select_one("SELECT cw.id FROM current_ways cw,current_way_nodes cwn WHERE cw.id=cwn.id AND cw.visible=1 AND cwn.node_id=#{id} LIMIT 1")
- unless inway.nil? then return [id,id] end # should really return an error
+ unless inway.nil? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end
deleteitemrelations(id,'node',uid,db_now)
end
newid=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes (latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})");
ActiveRecord::Base.connection.update("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{newid},#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})");
end
- [id,newid]
+ [0,id,newid]
end
# ----- getpoi (id,baselong,basey,masterscale)
# returns way ID only
def deleteway(args)
- usertoken,way,preserve=args
+ usertoken,way=args
RAILS_DEFAULT_LOGGER.info(" Message: deleteway, id=#{way}")
+ uid=getuserid(usertoken)
+ if !uid then return -1,"You are not logged in, so the way could not be deleted." end
- uid=getuserid(usertoken); if !uid then return end
way=way.to_i
-
- db_uqn='unin'+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars
- db_now='@now'+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars
+ db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars
+ db_now='@now'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars
ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
# - delete any otherwise unused nodes
createuniquenodes(way,db_uqn,[])
- unless (preserve.empty?) then
- ActiveRecord::Base.connection.execute("DELETE FROM #{db_uqn} WHERE node_id IN ("+preserve.join(',')+")")
- end
+# unless (preserve.empty?) then
+# ActiveRecord::Base.connection.execute("DELETE FROM #{db_uqn} WHERE node_id IN ("+preserve.join(',')+")")
+# end
sql=<<-EOF
INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tile)
ActiveRecord::Base.connection.execute("DELETE FROM current_way_nodes WHERE id=#{way}")
ActiveRecord::Base.connection.execute("DELETE FROM current_way_tags WHERE id=#{way}")
deleteitemrelations(way,'way',uid,db_now)
- way
+ [0,way]
end
EOF
rows=ActiveRecord::Base.connection.select_all(sql)
- # if historic (full revert), get the old version of each node,
- # and use this (though with a new id) if it differs from the current one
+ # if historic (full revert), get the old version of each node
+ # - if it's in another way now, generate a new id
+ # - if it's not in another way, use the old ID
if historic then
rows.each_index do |i|
sql=<<-EOF
- SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,tags
- FROM nodes
- WHERE id=#{rows[i]['id']}
- AND timestamp<="#{waytime}"
- ORDER BY timestamp DESC
+ SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,tags,cwn.id AS currentway
+ FROM nodes n
+ LEFT JOIN current_way_nodes cwn
+ ON cwn.node_id=n.id
+ WHERE n.id=#{rows[i]['id']}
+ AND n.timestamp<="#{waytime}"
+ AND cwn.id!=#{id}
+ ORDER BY n.timestamp DESC
LIMIT 1
EOF
row=ActiveRecord::Base.connection.select_one(sql)
unless row.nil? then
nx=row['longitude'].to_f
ny=row['latitude'].to_f
- if (nx!=rows[i]['longitude'].to_f or ny!=rows[i]['latitude'].to_f or row['tags']!=rows[i]['tags']) then
- rows[i]['id']=-1
- # This generates a new node id if x/y/tags differ from current node.
- # Strictly speaking, it need only do this for uniquenodes, but we're
- # not generating uniquenodes for historic ways (yet!).
- end
+ if (row['currentway'] && (nx!=rows[i]['longitude'].to_f or ny!=rows[i]['latitude'].to_f or row['tags']!=rows[i]['tags'])) then rows[i]['id']=-1 end
rows[i]['longitude']=nx
rows[i]['latitude' ]=ny
rows[i]['tags' ]=row['tags']
def sqlescape(a)
- a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr,92.chr+92.chr)
+ a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr) {92.chr+92.chr}
end
def tag2array(a)
tags={}
- a.gsub(';;;','#%').split(';').each do |b|
- b.gsub!('#%',';;;')
- b.gsub!('===','#%')
- k,v=b.split('=')
- if k.nil? then k='' end
- if v.nil? then v='' end
- tags[k.gsub('#%','=').gsub(':','|')]=v.gsub('#%','=')
+ Tags.split(a) do |k, v|
+ tags[k.gsub(':','|')]=v
end
tags
end
def array2tag(a)
- str=''
+ tags = []
a.each do |k,v|
if v=='' then next end
if v[0,6]=='(type ' then next end
- if str!='' then str+=';' end
- str+=k.gsub(';',';;;').gsub('=','===').gsub('|',':')+'='+v.gsub(';',';;;').gsub('=','===')
+ tags << [k.gsub('|',':'), v]
end
- str
+ return Tags.join(tags)
end
def getuserid(token)
projects / rails.git / blobdiff