From: Tom Hughes Date: Wed, 9 Jul 2008 23:31:00 +0000 (+0000) Subject: Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010 X-Git-Tag: live~7735 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/50c0333ea6ae96ecbed574c2e2704e1005037d05?ds=sidebyside Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010 branch for now until it has been reviewed. --- diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 4ec4e660e..11ddc3f7c 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -1,33 +1,20 @@ -# amf_controller is a semi-standalone API for Flash clients, particularly -# Potlatch. All interaction between Potlatch (as a .SWF application) and the +# AMF Controller is a semi-standalone API for Flash clients, particularly Potlatch. +# All interaction between Potlatch (as a .SWF application) and the # OSM database takes place using this controller. Messages are # encoded in the Actionscript Message Format (AMF). # -# Helper functions are in /lib/potlatch. +# See Also Potlatch::Potlatch and Potlatch::AMF # -# Author:: editions Systeme D / Richard Fairhurst 2004-2008 -# Licence:: public domain. +# Public domain. +# editions Systeme D / Richard Fairhurst 2004-2008 # -# == General structure -# -# Apart from the talk method (which distributes the requests from the -# AMF message), each method generally takes arguments in the order they were -# sent by the Potlatch SWF. Do not assume typing has been preserved. Methods -# all return an array to the SWF. -# -# == Debugging -# -# Any method that returns a status code (0 for ok) can also send: -# return(-1,"message") <-- just puts up a dialogue -# return(-2,"message") <-- also asks the user to e-mail me -# -# To write to the Rails log, use RAILS_DEFAULT_LOGGER.info("message"). -# -# == To do +# All in/out parameters are floats unless explicitly stated. # -# - Check authentication -# - Check the right things are being written to the database! - +# 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]}") class AmfController < ApplicationController require 'stringio' @@ -36,214 +23,312 @@ class AmfController < ApplicationController session :off before_filter :check_write_availability - # Main AMF handler: processes the raw AMF string (using AMF library) and - # calls each action (private method) accordingly. - + # Main AMF handler. Tha talk method takes in AMF, figures out what to do and dispatched to the appropriate private method def talk - req=StringIO.new(request.raw_post+0.chr) # Get POST data as request - # (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 - renumberedways={} # Shared across repeated putways - - # Parse request - - headers=AMF.getint(req) # Read number of headers - - headers.times do # Read each header - name=AMF.getstring(req) # | - req.getc # | skip boolean - value=AMF.getvalue(req) # | - header["name"]=value # | - end - - bodies=AMF.getint(req) # Read number of bodies - bodies.times do # Read each body - message=AMF.getstring(req) # | get message name - index=AMF.getstring(req) # | get index in response sequence - bytes=AMF.getlong(req) # | get total size in bytes - args=AMF.getvalue(req) # | get response (probably an array) - - case message - when 'getpresets'; results[index]=AMF.putdata(index,getpresets()) - when 'whichways'; results[index]=AMF.putdata(index,whichways(*args)) - when 'whichways_deleted'; results[index]=AMF.putdata(index,whichways_deleted(*args)) - when 'getway'; results[index]=AMF.putdata(index,getway(args[0].to_i)) - when 'getrelation'; results[index]=AMF.putdata(index,getrelation(args[0].to_i)) - when 'getway_old'; results[index]=AMF.putdata(index,getway_old(args[0].to_i,args[1].to_i)) - when 'getway_history'; results[index]=AMF.putdata(index,getway_history(args[0].to_i)) - when 'putway'; r=putway(renumberednodes,*args) - renumberednodes=r[3] - if r[1] != r[2] - renumberedways[r[1]] = r[2] - end - results[index]=AMF.putdata(index,r) - when 'putrelation'; results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args)) - when 'deleteway'; results[index]=AMF.putdata(index,deleteway(args[0],args[1].to_i)) - when 'putpoi'; results[index]=AMF.putdata(index,putpoi(*args)) - when 'getpoi'; results[index]=AMF.putdata(index,getpoi(args[0].to_i)) - end - end - - # Write out response - - a,b=results.length.divmod(256) - render :content_type => "application/x-amf", :text => proc { |response, output| - output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr - results.each do |k,v| - output.write(v) - end - } + req=StringIO.new(request.raw_post+0.chr) # Get POST data as request + # (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 + renumberedways={} # Shared across repeated putways + + # ------------- + # Parse request + + headers=AMF.getint(req) # Read number of headers + + headers.times do # Read each header + name=AMF.getstring(req) # | + req.getc # | skip boolean + value=AMF.getvalue(req) # | + header["name"]=value # | + end + + bodies=AMF.getint(req) # Read number of bodies + bodies.times do # Read each body + message=AMF.getstring(req) # | get message name + index=AMF.getstring(req) # | get index in response sequence + bytes=AMF.getlong(req) # | get total size in bytes + args=AMF.getvalue(req) # | get response (probably an array) + + case message + when 'getpresets'; results[index]=AMF.putdata(index,getpresets) + when 'whichways'; results[index]=AMF.putdata(index,whichways(args)) + when 'whichways_deleted'; results[index]=AMF.putdata(index,whichways_deleted(args)) + when 'getway'; results[index]=AMF.putdata(index,getway(args)) + when 'getrelation'; results[index]=AMF.putdata(index,getrelation(args)) + when 'getway_old'; results[index]=AMF.putdata(index,getway_old(args)) + when 'getway_history'; results[index]=AMF.putdata(index,getway_history(args)) + when 'putway'; r=putway(args,renumberednodes) + renumberednodes=r[3] + if r[1] != r[2] + renumberedways[r[1]] = r[2] + end + results[index]=AMF.putdata(index,r) + when 'putrelation'; results[index]=AMF.putdata(index,putrelation(args, renumberednodes, renumberedways)) + when 'deleteway'; results[index]=AMF.putdata(index,deleteway(args)) + when 'putpoi'; results[index]=AMF.putdata(index,putpoi(args)) + when 'getpoi'; results[index]=AMF.putdata(index,getpoi(args)) + end + end + + # ------------------ + # Write out response + + RAILS_DEFAULT_LOGGER.info(" Response: start") + a,b=results.length.divmod(256) + render :content_type => "application/x-amf", :text => proc { |response, output| + output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr + results.each do |k,v| + output.write(v) + end + } + RAILS_DEFAULT_LOGGER.info(" Response: end") end private - # Return presets (default tags, localisation etc.): - # uses POTLATCH_PRESETS global, set up in OSM::Potlatch. - - def getpresets() #:doc: - return POTLATCH_PRESETS + # Return presets (default tags and crap) to potlatch. + # Uses POTLATCH_PRESETS global, set up in OSM::Potlatch + def getpresets #:doc: + return POTLATCH_PRESETS end - # Find all the ways, POI nodes (i.e. not part of ways), and relations - # in a given bounding box. Nodes are returned in full; ways and relations - # are IDs only. - - def whichways(xmin,ymin,xmax,ymax) #:doc: - xmin-=0.01; ymin-=0.01 - xmax+=0.01; ymax+=0.01 - - if POTLATCH_USE_SQL then - way_ids=sql_find_way_ids_in_area(xmin,ymin,xmax,ymax) - points=sql_find_pois_in_area(xmin,ymin,xmax,ymax) - relation_ids=sql_find_relations_in_area_and_ways(xmin,ymin,xmax,ymax,way_ids) - else - # find the way ids in an area - nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => "current_nodes.visible = 1", :include => :ways) - way_ids = nodes_in_area.collect { |node| node.way_ids }.flatten.uniq - - # find the node ids in an area that aren't part of ways - nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? } - points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags_as_hash] } - - # find the relations used by those nodes and ways - relations = nodes_in_area.collect { |node| node.containing_relations.visible }.flatten + - way_ids.collect { |id| Way.find(id).containing_relations.visible }.flatten - relation_ids = relations.collect { |relation| relation.id }.uniq - end - - [way_ids,points,relation_ids] + # ----- whichways + # Find all the way ids and nodes (including tags and projected lat/lng) which aren't part of those ways in an are + # + # The argument is an array containing the following, in order: + # 0. minimum longitude + # 1. minimum latitude + # 2. maximum longitude + # 3. maximum latitude + # 4. baselong, 5. basey, 6. masterscale as above + def whichways(args) #:doc: + xmin = args[0].to_f-0.01 + ymin = args[1].to_f-0.01 + xmax = args[2].to_f+0.01 + ymax = args[3].to_f+0.01 + baselong = args[4] + basey = args[5] + masterscale = args[6] + + RAILS_DEFAULT_LOGGER.info(" Message: whichways, bbox=#{xmin},#{ymin},#{xmax},#{ymax}") + + # find the way ids in an area + nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => "current_nodes.visible = 1", :include => :ways) + way_ids = nodes_in_area.collect { |node| node.way_ids }.flatten.uniq + + # find the node ids in an area that aren't part of ways + nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? } + points = nodes_not_used_in_area.collect { |n| [n.id, n.lon_potlatch(baselong,masterscale), n.lat_potlatch(basey,masterscale), n.tags_as_hash] } + + # find the relations used by those nodes and ways + relations = nodes_in_area.collect { |node| node.containing_relations.visible }.flatten + + way_ids.collect { |id| Way.find(id).containing_relations.visible }.flatten + relation_ids = relations.collect { |relation| relation.id }.uniq + + [way_ids,points,relation_ids] end - # Find deleted ways in current bounding box (similar to whichways, but ways - # with a deleted node only - not POIs or relations). + # ----- whichways_deleted + # return array of deleted ways in current bounding box + # in: as whichways + # does: finds all deleted ways with a deleted node in bounding box + # out: [0] array of way ids + def whichways_deleted(args) #:doc: + xmin = args[0].to_f-0.01 + ymin = args[1].to_f-0.01 + xmax = args[2].to_f+0.01 + ymax = args[3].to_f+0.01 + baselong = args[4] + basey = args[5] + masterscale = args[6] + + sql=<<-EOF + SELECT DISTINCT current_ways.id + FROM current_nodes,way_nodes,current_ways + WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")} + AND way_nodes.node_id=current_nodes.id + AND way_nodes.id=current_ways.id + AND current_nodes.visible=0 + AND current_ways.visible=0 + EOF + waylist = ActiveRecord::Base.connection.select_all(sql) + ways = waylist.collect {|a| a['id'].to_i } + [ways] + end - def whichways_deleted(xmin,ymin,xmax,ymax) #:doc: - xmin-=0.01; ymin-=0.01 - xmax+=0.01; ymax+=0.01 + # ----- getway + # Get a way with all of it's nodes and tags + # The input is an array with the following components, in order: + # 0. wayid - the ID of the way to get + # 1. baselong - origin of SWF map (longitude) + # 2. basey - origin of SWF map (latitude) + # 3. masterscale - SWF map scale + # + # The output is an array which contains all the nodes (with projected + # latitude and longitude) and tags for a way (and all the nodes tags). + # It also has the way's unprojected (WGS84) bbox. + # + # FIXME: The server really shouldn't be figuring out a ways bounding box and doing projection for potlatch + # FIXME: the argument splitting should be done in the 'talk' method, not here + def getway(args) #:doc: + wayid,baselong,basey,masterscale = args + wayid = wayid.to_i + + RAILS_DEFAULT_LOGGER.info(" Message: getway, id=#{wayid}") + + # Ideally we would do ":include => :nodes" here but if we do that + # then rails only seems to return the first copy of a node when a + # way includes a node more than once + way = Way.find(wayid) + + long_array = [] + lat_array = [] + points = [] + + way.nodes.each do |node| + projected_longitude = node.lon_potlatch(baselong,masterscale) # do projection for potlatch + projected_latitude = node.lat_potlatch(basey,masterscale) + id = node.id + tags_hash = node.tags_as_hash + + points << [projected_longitude, projected_latitude, id, nil, tags_hash] + long_array << projected_longitude + lat_array << projected_latitude + end + + [wayid,points,way.tags,long_array.min,long_array.max,lat_array.min,lat_array.max] + end - nodes_in_area = Node.find_by_area(ymin, xmin, ymax,xmax, :conditions => "current_nodes.visible=0 AND current_ways.visible=0", :include => :ways_via_history ) - way_ids = nodes_in_area.collect { |node| node.ways_via_history_ids }.flatten.uniq - [way_ids] + # ----- getway_old + # returns old version of way + # in: [0] way id, + # [1] way version to get (or -1 for "last deleted version") + # [2] baselong, [3] basey, [4] masterscale + # does: gets old version of way and all constituent nodes + # for undelete, always uses the most recent version of each node + # (even if it's moved) + # for revert, uses the historic version of each node, but if that node is + # still visible and has been changed since, generates a new node id + # out: [0] 0 (code for success), [1] SWF object name, + # [2] array of points (as getway _except_ [3] is node.visible?, 0 or 1), + # [4] xmin, [5] xmax, [6] ymin, [7] ymax (unprojected bbox), + # [8] way version + def getway_old(args) #:doc: + RAILS_DEFAULT_LOGGER.info(" Message: getway_old (server is #{SERVER_URL})") + # if SERVER_URL=="www.openstreetmap.org" then return -1,"Revert is not currently enabled on the OpenStreetMap server." end + + wayid,version,baselong,basey,masterscale=args + wayid = wayid.to_i + version = version.to_i + xmin = ymin = 999999 + xmax = ymax = -999999 + points=[] + if version<0 + historic=false + version=getlastversion(wayid,version) + else + historic=true + end + readwayquery_old(wayid,version,historic).each { |row| + points<<[long2coord(row['longitude'].to_f,baselong,masterscale),lat2coord(row['latitude'].to_f,basey,masterscale),row['id'].to_i,row['visible'].to_i,tag2array(row['tags'].to_s)] + xmin=[xmin,row['longitude'].to_f].min + xmax=[xmax,row['longitude'].to_f].max + ymin=[ymin,row['latitude' ].to_f].min + ymax=[ymax,row['latitude' ].to_f].max + } + + # get tags from this version + attributes={} + attrlist=ActiveRecord::Base.connection.select_all "SELECT k,v FROM way_tags WHERE id=#{wayid} AND version=#{version}" + attrlist.each {|a| attributes[a['k'].gsub(':','|')]=a['v'] } + attributes['history']="Retrieved from v"+version.to_s + + [0,wayid,points,attributes,xmin,xmax,ymin,ymax,version] end - # Get a way including nodes and tags. - # Returns 0 (success), a Potlatch-style array of points, and a hash of tags. - - def getway(wayid) #:doc: - if POTLATCH_USE_SQL then - points=sql_get_nodes_in_way(wayid) - tags=sql_get_tags_in_way(wayid) - else - # Ideally we would do ":include => :nodes" here but if we do that - # then rails only seems to return the first copy of a node when a - # way includes a node more than once - points = [] - way = Way.find(wayid) - way.nodes.each do |node| - points << [node.lon, node.lat, node.id, nil, node.tags_as_hash] - end - tags=way.tags - end - [wayid,points,tags] + # ----- getway_history + # find history of a way + # in: [0] way id + # does: finds history of a way + # out: [0] array of previous versions (where each is + # [0] version, [1] db timestamp (string), + # [2] visible 0 or 1, + # [3] username or 'anonymous' (string)) + def getway_history(args) #:doc: + wayid=args[0] + history=[] + sql=<<-EOF + SELECT version,timestamp,visible,display_name,data_public + 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) + histlist.each { |row| + if row['data_public'].to_i==1 then user=row['display_name'] else user='anonymous' end + history<<[row['version'],row['timestamp'],row['visible'],user] + } + [history] end - # Get an old version of a way, and all constituent nodes. + # ----- getrelation + # Get a relation with all of it's tags, and member IDs + # The input is an array with the following components, in order: + # 0. relid - the ID of the relation to get # - # For undelete (version=0), always uses the most recent version of each node, - # even if it's moved. For revert (version=1+), uses the node in existence - # at the time, generating a new id if it's still visible and has been moved/ - # retagged. - - def getway_old(id,version) #:doc: - if version<0 - old_way = OldWay.find(:first, :conditions => ['visible=1 AND id=?', id], :order => 'version DESC') - points = old_way.get_nodes_undelete - else - old_way = OldWay.find(:first, :conditions => ['id=? AND version=?', id, version]) - points = old_way.get_nodes_revert - end - old_way.tags['history']="Retrieved from v#{old_way.version}" - [0,id,points,old_way.tags,old_way.version] - end - - # Find history of a way. Returns an array of previous versions. - - def getway_history(wayid) #:doc: - history=[] - way=Way.find(wayid) - way.old_ways.each do |old_way| - if old_way.user.data_public then user=old_way.user.display_name else user='anonymous' end - history<<[old_way.version,old_way.timestamp.strftime("%d %b %Y, %H:%M"),old_way.visible ? 1 : 0,user] - end - [history] - end + # The output is an array which contains: + # [0] relation id, [1] hash of tags, [2] list of members + def getrelation(args) #:doc: + relid = args[0] + relid = relid.to_i - # Get a relation with all tags and members. - # Returns: - # 0. relation id, - # 1. hash of tags, - # 2. list of members. - - def getrelation(relid) #:doc: - rel = Relation.find(relid) - [relid,rel.tags,rel.members] - end + RAILS_DEFAULT_LOGGER.info(" Message: getrel, id=#{relid}") - # Save a relation. - # Returns - # 0. 0 (success), - # 1. original relation id (unchanged), - # 2. new relation id. + rel = Relation.find(relid) - def putrelation(renumberednodes, renumberedways, usertoken,relid,tags,members,visible) #:doc: - uid=getuserid(usertoken) - if !uid then return -1,"You are not logged in, so the point could not be saved." end + [relid,rel.tags,rel.members]#nodes,ways] + end - relid = relid.to_i + # ----- getrelation + # save relation to the database + # in: [0] user token (string), + # [1] original relation id (may be negative), + # [2] hash of tags, [3] list of members, + # [4] visible + # out: [0] 0 (success), [1] original relation id (unchanged), + # [2] new relation id + def putrelation(args, renumberednodes, renumberedways) #:doc: + usertoken,relid,tags,members,visible=args + uid=getuserid(usertoken) + if !uid then return -1,"You are not logged in, so the point could not be saved." end + + relid = relid.to_i visible = visible.to_i # create a new relation, or find the existing one - if relid <= 0 - rel = Relation.new - else - rel = Relation.find(relid) - end - - # check the members are all positive, and correctly type - typedmembers = [] - members.each do |m| - mid = m[1].to_i - if mid < 0 - mid = renumberednodes[mid] if m[0] == 'node' - mid = renumberedways[mid] if m[0] == 'way' - if mid < 0 - return -2, "Negative ID unresolved" - end - end - typedmembers << [m[0], mid, m[2]] - end + if relid <= 0 + rel = Relation.new + else + rel = Relation.find(relid) + end + + # check the members are all positive, and correctly type + typedmembers = [] + members.each do |m| + mid = m[1].to_i + if mid < 0 + mid = renumberednodes[mid] if m[0] == 'node' + mid = renumberedways[mid] if m[0] == 'way' + if mid < 0 + return -2, "Negative ID unresolved" + end + end + typedmembers << [m[0], mid, m[2]] + end # assign new contents rel.members = typedmembers @@ -251,297 +336,491 @@ class AmfController < ApplicationController rel.visible = visible rel.user_id = uid - # check it then save it - # BUG: the following is commented out because it always fails on my - # install. I think it's a Rails bug. + # check it then save it + # BUG: the following is commented out because it always fails on my + # install. I think it's a Rails bug. - #if !rel.preconditions_ok? - # return -2, "Relation preconditions failed" - #else - rel.save_with_history! - #end + #if !rel.preconditions_ok? + # return -2, "Relation preconditions failed" + #else + rel.save_with_history! + #end - [0,relid,rel.id] + [0,relid,rel.id] end - # Save a way to the database, including all nodes. Any nodes in the previous - # version and no longer used are deleted. - # - # Returns: - # 0. '0' (code for success), - # 1. original way id (unchanged), - # 2. new way id, - # 3. hash of renumbered nodes (old id=>new id) - - def putway(renumberednodes,usertoken,originalway,points,attributes) #:doc: - - # -- Initialise and carry out checks - - uid=getuserid(usertoken) - if !uid then return -1,"You are not logged in, so the way could not be saved." end - originalway=originalway.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 - - # -- Get unique nodes - - if originalway<0 - way=Way.new - uniques=[] - else - way=Way.find(originalway) - uniques=way.unique_nodes - end - - # -- 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 - savenode=false - if renumberednodes[id] - id=renumberednodes[id] - elsif id<0 - # Create new node - node=Node.new - savenode=true - else - node=Node.find(id) - if (!fpcomp(lat,node.lat) or !fpcomp(lon,node.lon) or \ - Tags.join(n[4])!=node.tags or node.visible==0) - savenode=true - end - end - if savenode - node.user_id=uid - node.lat=lat; node.lon=lon - node.tags=Tags.join(n[4]) - node.visible=true - node.save_with_history! - if id!=node.id - renumberednodes[id]=node.id - id=node.id - end - end - uniques=uniques-[id] - nodes.push(id) - end - - # -- Delete any unique nodes - - uniques.each do |n| - deleteitemrelations(n,'node') - node=Node.find(n) - node.user_id=uid - node.visible=false - node.save_with_history! - end - - # -- Save revised way - - way.tags=attributes - way.nds=nodes - way.user_id=uid - way.visible=true - way.save_with_history! - - [0,originalway,way.id,renumberednodes] + # ----- putway + # saves a way to the database + # in: [0] user token (string), + # [1] original way id (may be negative), + # [2] array of points (as getway/getway_old), + # [3] hash of way tags, + # [4] original way version (0 if not a reverted/undeleted way), + # [5] baselong, [6] basey, [7] masterscale + # does: saves way to the database + # all constituent nodes are created/updated as necessary + # (or deleted if they were in the old version and are otherwise unused) + # out: [0] 0 (code for success), [1] original way id (unchanged), + # [2] new way id, [3] hash of renumbered nodes (old id=>new id), + # [4] xmin, [5] xmax, [6] ymin, [7] ymax (unprojected bbox) + def putway(args,renumberednodes) #:doc: + RAILS_DEFAULT_LOGGER.info(" putway started") + usertoken,originalway,points,attributes,oldversion,baselong,basey,masterscale=args + uid=getuserid(usertoken) + 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'+(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}") + + # -- Check for null IDs, short ways or lats=90 + + 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 coord2lat(a[1],masterscale,basey)==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 + + # -- 3. read original way into memory + + xc={}; yc={}; tagc={}; vc={} + if originalway>0 + way=originalway + if oldversion==0 then r=readwayquery(way,false) + else r=readwayquery_old(way,oldversion,true) end + r.each { |row| + id=row['id'].to_i + if (id>0) then + xc[id]=row['longitude'].to_f + yc[id]=row['latitude' ].to_f + tagc[id]=row['tags'] + vc[id]=row['visible'].to_i + end + } + ActiveRecord::Base.connection.update("UPDATE current_ways SET timestamp=#{db_now},user_id=#{uid},visible=1 WHERE id=#{way}") + else + way=ActiveRecord::Base.connection.insert("INSERT INTO current_ways (user_id,timestamp,visible) VALUES (#{uid},#{db_now},1)") + end + + # -- 4. get version by inserting new row into ways + + version=ActiveRecord::Base.connection.insert("INSERT INTO ways (id,user_id,timestamp,visible) VALUES (#{way},#{uid},#{db_now},1)") + + # -- 5. compare nodes and update xmin,xmax,ymin,ymax + + xmin=ymin= 999999 + xmax=ymax=-999999 + insertsql='' + nodelist=[] + + points.each_index do |i| + xs=coord2long(points[i][0],masterscale,baselong) + ys=coord2lat(points[i][1],masterscale,basey) + xmin=[xs,xmin].min; xmax=[xs,xmax].max + ymin=[ys,ymin].min; ymax=[ys,ymax].max + node=points[i][2].to_i + tagstr=array2tag(points[i][4]) + tagsql="'"+sqlescape(tagstr)+"'" + lat=(ys * 10000000).round + long=(xs * 10000000).round + tile=QuadTile.tile_for_point(ys, xs) + + # compare node + if node<0 + # new node - create + if renumberednodes[node.to_s].nil? + newnode=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes ( latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES ( #{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})") + ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{newnode},#{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})") + points[i][2]=newnode + nodelist.push(newnode) + renumberednodes[node.to_s]=newnode.to_s + else + points[i][2]=renumberednodes[node.to_s].to_i + end + + elsif xc.has_key?(node) + nodelist.push(node) + # old node from original way - update + if ((xs/0.0000001).round!=(xc[node]/0.0000001).round or (ys/0.0000001).round!=(yc[node]/0.0000001).round or tagstr!=tagc[node] or vc[node]==0) + ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{node},#{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})") + ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{lat},longitude=#{long},timestamp=#{db_now},user_id=#{uid},tags=#{tagsql},visible=1,tile=#{tile} WHERE id=#{node}") + end + else + # old node, created in another way and now added to this way + end + end + + # -- 6a. delete any nodes not in modified way + + createuniquenodes(way,db_uqn,nodelist) # nodes which appear in this way but no other + + sql=<<-EOF + INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tile) + SELECT DISTINCT cn.id,cn.latitude,cn.longitude,#{db_now},#{uid},0,cn.tile + FROM current_nodes AS cn,#{db_uqn} + WHERE cn.id=node_id + EOF + ActiveRecord::Base.connection.insert(sql) + + sql=<<-EOF + UPDATE current_nodes AS cn, #{db_uqn} + SET cn.timestamp=#{db_now},cn.visible=0,cn.user_id=#{uid} + WHERE cn.id=node_id + EOF + ActiveRecord::Base.connection.update(sql) + + deleteuniquenoderelations(db_uqn,uid,db_now) + ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}") + + # 6b. insert new version of route into way_nodes + + insertsql ='' + currentsql='' + sequence =1 + points.each do |p| + if insertsql !='' then insertsql +=',' end + if currentsql!='' then currentsql+=',' end + insertsql +="(#{way},#{p[2]},#{sequence},#{version})" + currentsql+="(#{way},#{p[2]},#{sequence})" + sequence +=1 + end + + ActiveRecord::Base.connection.execute("DELETE FROM current_way_nodes WHERE id=#{way}"); + ActiveRecord::Base.connection.insert( "INSERT INTO way_nodes (id,node_id,sequence_id,version) VALUES #{insertsql}"); + ActiveRecord::Base.connection.insert( "INSERT INTO current_way_nodes (id,node_id,sequence_id ) VALUES #{currentsql}"); + + # -- 7. insert new way tags + + insertsql ='' + currentsql='' + attributes.each do |k,v| + if v=='' or v.nil? then next end + if v[0,6]=='(type ' then next end + if insertsql !='' then insertsql +=',' end + if currentsql!='' then currentsql+=',' end + insertsql +="(#{way},'"+sqlescape(k.gsub('|',':'))+"','"+sqlescape(v)+"',#{version})" + currentsql+="(#{way},'"+sqlescape(k.gsub('|',':'))+"','"+sqlescape(v)+"')" + end + + ActiveRecord::Base.connection.execute("DELETE FROM current_way_tags WHERE id=#{way}") + 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 + + [0,originalway,way,renumberednodes,xmin,xmax,ymin,ymax] end - # Save POI to the database. - # Refuses save if the node has since become part of a way. - # Returns: - # 0. 0 (success), - # 1. original node id (unchanged), - # 2. new node id. - - def putpoi(usertoken,id,lon,lat,tags,visible) #:doc: - uid=getuserid(usertoken) - if !uid then return -1,"You are not logged in, so the point could not be saved." end - - id=id.to_i - visible=(visible.to_i==1) - - if (id>0) then - node=Node.find(id) - if !visible then - unless node.ways.empty? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end - deleteitemrelations(id,'node') - end - else - node=Node.new - end - - node.user_id = uid - node.latitude = (lat*10000000).round - node.longitude = (lon*10000000).round - node.tags = Tags.join(tags) - node.visible=visible - node.save_with_history! - newid=node.id - [0,id,newid] + # ----- putpoi + # save POI to the database + # in: [0] user token (string), + # [1] original node id (may be negative), + # [2] projected longitude, [3] projected latitude, + # [4] hash of tags, [5] visible (0 to delete, 1 otherwise), + # [6] baselong, [7] basey, [8] masterscale + # does: saves POI node to the database + # refuses save if the node has since become part of a way + # out: [0] 0 (success), [1] original node id (unchanged), + # [2] new node id + def putpoi(args) #:doc: + usertoken,id,x,y,tags,visible,baselong,basey,masterscale=args + uid=getuserid(usertoken) + 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 + visible=visible.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 -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 + + x=coord2long(x.to_f,masterscale,baselong) + y=coord2lat(y.to_f,masterscale,basey) + tagsql="'"+sqlescape(array2tag(tags))+"'" + lat=(y * 10000000).round + long=(x * 10000000).round + tile=QuadTile.tile_for_point(y, x) + + if (id>0) then + ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{id},#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})"); + ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{lat},longitude=#{long},timestamp=#{db_now},user_id=#{uid},visible=#{visible},tags=#{tagsql},tile=#{tile} WHERE id=#{id}"); + newid=id + else + 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 + [0,id,newid] end - # Read POI from database - # (only called on revert: POIs are usually read by whichways). - # - # Returns array of id, long, lat, hash of tags. - - def getpoi(id) #:doc: - n = Node.find(id) - if n - return [n.id, n.lon, n.lat, n.tags_as_hash] - else - return [nil,nil,nil,''] - end + # ----- getpoi + # read POI from database + # (only called on revert: POIs are usually read by whichways) + # in: [0] node id, [1] baselong, [2] basey, [3] masterscale + # does: reads POI + # out: [0] id (unchanged), [1] projected long, [2] projected lat, + # [3] hash of tags + def getpoi(args) #:doc: + id,baselong,basey,masterscale = args + + n = Node.find(id.to_i) + if n + return [n.id, n.lon_potlatch(baselong,masterscale), n.lat_potlatch(basey,masterscale), n.tags_as_hash] + else + return [nil,nil,nil,''] + end + end + + # ----- deleteway + # delete way and constituent nodes from database + # in: [0] user token (string), [1] way id + # does: deletes way from db and any constituent nodes not used elsewhere + # also removes ways/nodes from any relations they're in + # out: [0] 0 (success), [1] way id (unchanged) + + def deleteway(args) #:doc: + usertoken,way_id=args + RAILS_DEFAULT_LOGGER.info(" Message: deleteway, id=#{way_id}") + uid=getuserid(usertoken) + if !uid then return -1,"You are not logged in, so the way could not be deleted." end + + # FIXME + # the next bit removes the way from any relations + # the delete_with_relations_and_nodes_and_history method should do this, + # but at present it just throws a 'precondition failed' + way=way.to_i + db_now='@now'+(rand*100).to_i.to_s+uid.to_s+way.abs.to_s+Time.new.to_i.to_s + db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.abs.to_s+Time.new.to_i.to_s + ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()") + createuniquenodes(way,db_uqn,[]) + deleteuniquenoderelations(db_uqn,uid,db_now) + deleteitemrelations(way_id,'way',uid,db_now) + ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}") + # end of FIXME + + # now delete the way + user = User.find(uid) + way = Way.find(way_id) + way.delete_with_relations_and_nodes_and_history(user) + return [0,way_id] end - # Delete way and all constituent nodes. Also removes from any relations. - # Returns 0 (success), unchanged way id. - def deleteway(usertoken,way_id) #:doc: - uid=getuserid(usertoken) - if !uid then return -1,"You are not logged in, so the way could not be deleted." end + def readwayquery(id,insistonvisible) #:doc: + sql=<<-EOF + SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,current_nodes.id,tags,visible + FROM current_way_nodes,current_nodes + WHERE current_way_nodes.id=#{id} + AND current_way_nodes.node_id=current_nodes.id + EOF + if insistonvisible then sql+=" AND current_nodes.visible=1 " end + sql+=" ORDER BY sequence_id" + ActiveRecord::Base.connection.select_all(sql) + end + + # Get the latest version id of a way + def getlastversion(id,version) #:doc: + old_way = OldWay.find(:first, :conditions => ['visible=1 AND id=?' , id], :order => 'version DESC') + old_way.version + end - # FIXME: would be good not to make two history entries when removing - # two nodes from the same relation - user = User.find(uid) - way = Way.find(way_id) - way.unique_nodes.each do |n| - deleteitemrelations(n,'node') - end + def readwayquery_old(id,version,historic) #:doc: + # Node handling on undelete (historic=false): + # - always use the node specified, even if it's moved + + # Node handling on revert (historic=true): + # - if it's a visible node, use a new node id (i.e. not mucking up the old one) + # which means the SWF needs to allocate new ids + # - if it's an invisible node, we can reuse the old node id + + # ----- get node list from specified version of way, + # and the _current_ lat/long/tags of each node + + row=ActiveRecord::Base.connection.select_one("SELECT timestamp FROM ways WHERE version=#{version} AND id=#{id}") + waytime=row['timestamp'] + + sql=<<-EOF + SELECT cn.id,visible,latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,tags + FROM way_nodes wn,current_nodes cn + WHERE wn.version=#{version} + AND wn.id=#{id} + AND wn.node_id=cn.id + ORDER BY sequence_id + EOF + rows=ActiveRecord::Base.connection.select_all(sql) + + # ----- 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,cwn.id AS currentway + FROM nodes n + LEFT JOIN current_way_nodes cwn + ON cwn.node_id=n.id AND cwn.id!=#{id} + WHERE n.id=#{rows[i]['id']} + AND n.timestamp<="#{waytime}" + ORDER BY n.timestamp DESC + LIMIT 1 + EOF + row=ActiveRecord::Base.connection.select_one(sql) + nx=row['longitude'].to_f + ny=row['latitude'].to_f + if (!row.nil?) + 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 + end + rows[i]['longitude']=nx + rows[i]['latitude' ]=ny + rows[i]['tags' ]=row['tags'] + end + end + rows + end - way.delete_with_relations_and_nodes_and_history(user) - return [0,way_id] + def createuniquenodes(way,uqn_name,nodelist) #:doc: + # Find nodes which appear in this way but no others + sql=<<-EOF + CREATE TEMPORARY TABLE #{uqn_name} + SELECT a.node_id + FROM (SELECT DISTINCT node_id FROM current_way_nodes + WHERE id=#{way}) a + LEFT JOIN current_way_nodes b + ON b.node_id=a.node_id + AND b.id!=#{way} + WHERE b.node_id IS NULL + EOF + unless nodelist.empty? then + sql+="AND a.node_id NOT IN ("+nodelist.join(',')+")" + end + ActiveRecord::Base.connection.execute(sql) end + # ==================================================================== - # Support functions + # Relations handling + # deleteuniquenoderelations(uqn_name,uid,db_now) + # deleteitemrelations(way|node,'way'|'node',uid,db_now) + + def deleteuniquenoderelations(uqn_name,uid,db_now) #:doc: + sql=<<-EOF + SELECT node_id,cr.id FROM #{uqn_name},current_relation_members crm,current_relations cr + WHERE crm.member_id=node_id + AND crm.member_type='node' + AND crm.id=cr.id + AND cr.visible=1 + EOF + + relnodes=ActiveRecord::Base.connection.select_all(sql) + relnodes.each do |a| + removefromrelation(a['node_id'],'node',a['id'],uid,db_now) + end + end - # Remove a node or way from all relations + def deleteitemrelations(objid,type,uid,db_now) #:doc: + sql=<<-EOF + SELECT cr.id FROM current_relation_members crm,current_relations cr + WHERE crm.member_id=#{objid} + AND crm.member_type='#{type}' + AND crm.id=cr.id + AND cr.visible=1 + EOF + + relways=ActiveRecord::Base.connection.select_all(sql) + relways.each do |a| + removefromrelation(objid,type,a['id'],uid,db_now) + end + end - def deleteitemrelations(objid,type) #:doc: - relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', type, objid]).collect { |ws| ws.id }.uniq - relationids.each do |relid| - rel=Relation.find(relid) - rel.members.delete_if {|x| x[0]==type and x[1]==objid} - rel.save_with_history! - end + def removefromrelation(objid,type,relation,uid,db_now) #:doc: + rver=ActiveRecord::Base.connection.insert("INSERT INTO relations (id,user_id,timestamp,visible) VALUES (#{relation},#{uid},#{db_now},1)") + + tagsql=<<-EOF + INSERT INTO relation_tags (id,k,v,version) + SELECT id,k,v,#{rver} FROM current_relation_tags + WHERE id=#{relation} + EOF + ActiveRecord::Base.connection.insert(tagsql) + + membersql=<<-EOF + INSERT INTO relation_members (id,member_type,member_id,member_role,version) + SELECT id,member_type,member_id,member_role,#{rver} FROM current_relation_members + WHERE id=#{relation} + AND (member_id!=#{objid} OR member_type!='#{type}') + EOF + ActiveRecord::Base.connection.insert(membersql) + + ActiveRecord::Base.connection.update("UPDATE current_relations SET user_id=#{uid},timestamp=#{db_now} WHERE id=#{relation}") + ActiveRecord::Base.connection.execute("DELETE FROM current_relation_members WHERE id=#{relation} AND member_type='#{type}' AND member_id=#{objid}") end - # Break out node tags into a hash - # (should become obsolete as of API 0.6) + def sqlescape(a) #:doc: + a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr) {92.chr+92.chr} + end - def tagstring_to_hash(a) #:doc: - tags={} - Tags.split(a) do |k, v| - tags[k]=v - end - tags + def tag2array(a) #:doc: + tags={} + Tags.split(a) do |k, v| + tags[k.gsub(':','|')]=v + end + tags end - # Authenticate token - # (could be removed if no-one uses the username+password form) + def array2tag(a) #:doc: + tags = [] + a.each do |k,v| + if v=='' then next end + if v[0,6]=='(type ' then next end + tags << [k.gsub('|',':'), v] + end + return Tags.join(tags) + end def getuserid(token) #:doc: - if (token =~ /^(.+)\+(.+)$/) then - user = User.authenticate(:username => $1, :password => $2) - else - user = User.authenticate(:token => token) - end + if (token =~ /^(.+)\+(.+)$/) then + user = User.authenticate(:username => $1, :password => $2) + else + user = User.authenticate(:token => token) + end - return user ? user.id : nil; + return user ? user.id : nil; end - # Compare two floating-point numbers to within 0.0000001 + # ==================================================================== + # Co-ordinate conversion - def fpcomp(a,b) #:doc: - return ((a/0.0000001).round==(b/0.0000001).round) + def lat2coord(a,basey,masterscale) #:doc: + -(lat2y(a)-basey)*masterscale end - - # ==================================================================== - # Alternative SQL queries for getway/whichways - - def sql_find_way_ids_in_area(xmin,ymin,xmax,ymax) - sql=<<-EOF - SELECT DISTINCT current_way_nodes.id AS wayid - FROM current_way_nodes - INNER JOIN current_nodes ON current_nodes.id=current_way_nodes.node_id - INNER JOIN current_ways ON current_ways.id =current_way_nodes.id - WHERE current_nodes.visible=1 - AND current_ways.visible=1 - AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")} - EOF - return ActiveRecord::Base.connection.select_all(sql).collect { |a| a['wayid'].to_i } + def long2coord(a,baselong,masterscale) #:doc: + (a-baselong)*masterscale end - - def sql_find_pois_in_area(xmin,ymin,xmax,ymax) - sql=<<-EOF - SELECT current_nodes.id,current_nodes.latitude*0.0000001 AS lat,current_nodes.longitude*0.0000001 AS lon,current_nodes.tags - FROM current_nodes - LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id - WHERE current_nodes.visible=1 - AND cwn.id IS NULL - AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")} - EOF - return ActiveRecord::Base.connection.select_all(sql).collect { |n| [n['id'].to_i,n['lon'].to_f,n['lat'].to_f,tagstring_to_hash(n['tags'])] } + + def lat2y(a) #:doc: + 180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2)) end - - def sql_find_relations_in_area_and_ways(xmin,ymin,xmax,ymax,way_ids) - # ** It would be more Potlatchy to get relations for nodes within ways - # during 'getway', not here - sql=<<-EOF - SELECT DISTINCT cr.id AS relid - FROM current_relations cr - INNER JOIN current_relation_members crm ON crm.id=cr.id - INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='node' - WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")} - EOF - unless way_ids.empty? - sql+=<<-EOF - UNION - SELECT DISTINCT cr.id AS relid - FROM current_relations cr - INNER JOIN current_relation_members crm ON crm.id=cr.id - WHERE crm.member_type='way' - AND crm.member_id IN (#{way_ids.join(',')}) - EOF - end - return ActiveRecord::Base.connection.select_all(sql).collect { |a| a['relid'].to_i }.uniq + + def coord2lat(a,masterscale,basey) #:doc: + y2lat(a/-masterscale+basey) end - - def sql_get_nodes_in_way(wayid) - points=[] - sql=<<-EOF - SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id,tags - FROM current_way_nodes,current_nodes - WHERE current_way_nodes.id=#{wayid.to_i} - AND current_way_nodes.node_id=current_nodes.id - AND current_nodes.visible=1 - ORDER BY sequence_id - EOF - ActiveRecord::Base.connection.select_all(sql).each do |row| - points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nil,tagstring_to_hash(row['tags'])] - end - points + + def coord2long(a,masterscale,baselong) #:doc: + a/masterscale+baselong end - - def sql_get_tags_in_way(wayid) - tags={} - ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_way_tags WHERE id=#{wayid.to_i}").each do |row| - tags[row['k']]=row['v'] - end - tags + + def y2lat(a) + 180/Math::PI * (2*Math.atan(Math.exp(a*Math::PI/180))-Math::PI/2) end end diff --git a/app/models/node.rb b/app/models/node.rb index d61293e82..abfa44d67 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -20,10 +20,6 @@ class Node < ActiveRecord::Base 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 - # Atomic undelete support - has_many :old_way_nodes - has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way - # Sanity check the latitude and longitude and add an error if it's broken def validate_position errors.add_to_base("Node is not in the world") unless in_world? diff --git a/app/models/old_way.rb b/app/models/old_way.rb index 63265d6bf..1abb23bbb 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -110,35 +110,6 @@ class OldWay < ActiveRecord::Base return el1 end - # Read full version of old way - # For get_nodes_undelete, uses same nodes, even if they've moved since - # For get_nodes_revert, allocates new ids - # Currently returns Potlatch-style array - - def get_nodes_undelete - points = [] - self.nds.each do |n| - node=Node.find(n) - points << [node.lon, node.lat, n, node.visible ? 1 : 0, node.tags_as_hash] - end - points - end - - def get_nodes_revert - points=[] - self.nds.each do |n| - oldnode=OldNode.find(:first, :conditions=>['id=? AND timestamp<=?',n,self.timestamp], :order=>"timestamp DESC") - curnode=Node.find(n) - id=n; v=curnode.visible ? 1 : 0 - if oldnode.lat!=curnode.lat or oldnode.lon!=curnode.lon or oldnode.tags!=curnode.tags then - # node has changed: if it's in other ways, give it a new id - if curnode.ways-[self.id] then id=-1; v=nil end - end - points << [oldnode.lon, oldnode.lat, id, v, oldnode.tags_as_hash] - end - points - end - # Temporary method to match interface to nodes def tags_as_hash return self.tags diff --git a/app/models/old_way_node.rb b/app/models/old_way_node.rb index a6e65da85..85a6f3c1c 100644 --- a/app/models/old_way_node.rb +++ b/app/models/old_way_node.rb @@ -2,7 +2,4 @@ class OldWayNode < ActiveRecord::Base set_table_name 'way_nodes' set_primary_keys :id, :version, :sequence_id - - # Atomic undelete support - belongs_to :way, :foreign_key=> :id end diff --git a/app/models/way.rb b/app/models/way.rb index 59988d88b..64b11cf67 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -236,7 +236,13 @@ class Way < ActiveRecord::Base # 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_to_delete = self.unique_nodes + 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 # delete the nodes not used by other ways node_ids_to_delete.each do |node_id| @@ -252,16 +258,6 @@ class Way < ActiveRecord::Base end - # Find nodes that belong to this way only - def unique_nodes - node_ids = self.nodes.collect {|node| node.id } - if node_ids.length==0 then return [] end - node_ids_in_other_ways = [] - way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}") - node_ids_in_other_ways = way_nodes.collect {|way_node| way_node.node_id} - return node_ids - node_ids_in_other_ways - end - # Temporary method to match interface to nodes def tags_as_hash return self.tags diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml index 9c3c78fda..a3896bc48 100644 --- a/app/views/site/edit.rhtml +++ b/app/views/site/edit.rhtml @@ -65,9 +65,9 @@ fo.addVariable('token','<%= session[:token] %>'); if (lat) { fo.addVariable('lat',lat); } if (lon) { fo.addVariable('long',lon); } - <% if params['gpx'] %>fo.addVariable('gpx' ,'<%= h(params['gpx'] ) %>');<% end %> - <% if params['way'] %>fo.addVariable('way' ,'<%= h(params['way'] ) %>');<% end %> - <% if params['node'] %>fo.addVariable('node','<%= h(params['node']) %>');<% end %> + <% if params['gpx'] %> + fo.addVariable('gpx','<%= h(params['gpx']) %>'); + <% end %> fo.write("map"); } diff --git a/config/environment.rb b/config/environment.rb index 6cf8b261d..495f94d80 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -78,6 +78,4 @@ end # This has to be after the above block for some reason (doesnt pull in /lib/osm.rb?) POTLATCH_PRESETS = Potlatch::Potlatch.get_presets() -# Use SQL (faster) or Rails (more elegant) for common Potlatch reads -# getway speedup is approximately x2, whichways approximately x7 -POTLATCH_USE_SQL = true + diff --git a/config/potlatch/localised.yaml b/config/potlatch/localised.yaml deleted file mode 100644 index f61bdc18a..000000000 --- a/config/potlatch/localised.yaml +++ /dev/null @@ -1,621 +0,0 @@ -a_poi: - "de": $1 einen Ort von Interesse (POI) - "hu": POI $1 -a_way: - "de": $1 einen Weg - "hu": Út $1 -action_addpoint: - "de": Am Ende des Wegs Punkt hinzufügen - "es": Añadir un punto al final de una vía - "fi": pisteen lisääminen tien perään - "fr": Ajout d'un point à la fin d'un chemin - "hu": pont hozzáadása az út végéhez - "no": adding a node to the end of a way - "ru": добавить точку в конец пути - "sv": lägger till en punkt på slutet av en väg -action_cancelchanges: - "de": Änderungen an $1 abgebrochen - "es": Cancelar cambios - "fi": peruutetaan muutokset - "fr": annulation de la modification - "hu": cancelling changes to - "no": cancelling changes to - "ru": отмена изменений к - "sv": avbryter ändringar på -action_createpoi: - "de": Einen Ort von Interesse (POI) erstellen - "es": Crear un punto de interés (POI) - "fi": "POI:n lisääminen" - "fr": créer un POI (point d'intérêt) - "hu": POI készítése - "no": lage et POI (interessant punkt) - "ru": создаю точку интереса(POI) - "sv": Skapa en POI, "punk av intresse" -action_deletepoint: - "de": Punkt löschen - "es": Borrar un punto - "fi": pisteen poistaminen - "fr": suppression d'un point - "hu": pont törlése - "no": deleting a point - "ru": удаляю узел - "sv": Tar bort en punkt -action_insertnode: - "de": Punkt auf Weg hinzufügen - "es": Añadir un punto a una vía - "fi": pisteen lisääminen tiehen - "fr": Ajouter un point sur un chemin - "hu": pont hozzáadása úthoz - "no": adding a node into a way - "ru": добавляю узел в путь - "sv": läggertill en punkt till en väg -action_mergeways: - "de": Zwei Wege verschmelzen - "es": Combinar dos vías - "fi": kahden tien yhdistäminen - "fr": Joindre deux chemins - "hu": két út egyesítése - "no": slår sammen to veier - "ru": соединяю два пути - "sv": Slåsamman två vägar -action_movepoi: - "de": Ort von Interesse (POI) verschieben - "es": Mover un punto de interés (POI) - "fi": "POI:n siirtäminen" - "fr": déplacer un POI - "hu": POI mozgatása - "no": flytter et POI (interessant punkt) - "ru": перемещаю точку интереса(POI) - "sv": Flytta på en POI, "punkt av intresse" -action_movepoint: - "de": Punkt verschieben - "es": Mover un punto - "fi": pisteen lisääminen - "fr": déplacer un point - "hu": pont mozgatása - "no": flytter punkt - "ru": перемещаю точку - "sv": Flytta en punkt -action_moveway: - "de": einen Weg verschieben - "hu": út mozgatása -action_pointtags: - "de": Attribute (Tags) für Punkt zuweisen - "es": Parámetros (tags) un punto - "fi": pisteen tagien asettaminen - "fr": Paramétrer un point - "hu": setting tags on a point - "no": setting tags on a point - "ru": установка тегов для точки - "sv": lägger till tagger på en punkt -action_poitags: - "de": Attribute (Tags) für Ort von Interesse (POI) zuweisen - "es": Parámetros (tags) en un punto de interés (POI) - "fi": "POI:n tagien asettaminen" - "fr": Paramétrer un POI - "hu": setting tags on a POI - "no": setting tags on a POI - "ru": установка тегов для точки интереса (POI) - "sv": lägger till tagger på en POI -action_reverseway: - "de": Wegrichtung umkehren - "es": Invertir dirección de una vía - "fi": tien kääntäminen - "fr": Inverser le sens du chemin - "hu": út megfordítása - "no": reversing a way - "ru": ищменение направления пути - "sv": Byter rikting på en väg -action_splitway: - "de": Weg teilen - "es": Dividir una vía - "fi": tien katkaisu - "fr": Scinder un chemin - "hu": út kettévágása - "no": splitting a way - "ru": разбиваю путь - "sv": delar upp en väg -action_waytags: - "de": Attribute (Tags) für Weg zuweisen - "es": Parámetros (tags) en una vía - "fi": tien tagian asettaminen - "fr": Paramétrer un chemin - "hu": setting tags on a way - "no": setting tags on a way - "ru": установка тегов для путиs - "sv": lägger till tagger på en väg -add: - "de": Hinzufügen - "es": Añadir - "fi": Lisää - "fr": Ajouter - "hu": Hozzáadás - "no": Add - "ru": Добавить - "sv": Läggtill -cancel: - "de": Abbrechen - "es": Cancelar - "fi": Peru - "fr": Annuler - "hu": Mégse - "no": Avbryt - "ru": Отмена - "sv": Avbryt -createrelation: - "de": Eine neue Relation erstellen - "es": Crear una nueva relación - "fi": Luo uusi relaatio - "fr": Créer une nouvelle relation - "hu": Új kapcsolat létrehozása - "no": Create a new relation - "ru": Создать отношение - "sv": Skapa en ny relation -delete: - "de": löschen - "hu": Törlés -deleting: - "de": löschen - "es": Borrar - "fi": poistaminen - "fr": suppression - "hu": törlés - "no": deleting - "ru": удаляю - "sv": Tar bort -dontshowagain: - "de": Diese Meldung nicht wieder anzeigen. - "es": No mostrar este mensaje de nuevo - "fi": Älä näytä tätä viestiä enää. - "fr": Ne plus afficher ce message - "hu": Ez az üzenet ne jelenjen meg újra - "no": Ikke vis denne meldingen igjen - "ru": Не показывать это сообщение снова. - "sv": Visa inte detta medelande igen -editingmap: - "de": Karte editieren - "hu": Térkép szerkesztése -emailauthor: - "de": \n\nBitte maile an richard\@systemeD.net eine Fehlerbeschreibung, und schildere, was Du in dem Moment getan hast. (Wenn möglich auf Englisch) - "es": \n\nPor favor envíe un mail a richard\@systemeD.net con un informe del error, describiendo lo que hacía en ese momento. - "fi": \n\nLähetäthän sähköpostia, jossa kerrot mitä olit tekemässä, osoitteeseen richard\@systemeD.net mieluiten englanniksi. - "fr": \n\nMerci d'envoyer un e-mail a richard\@systemeD.net pour signaler ce bogue, en expliquant ce que vous faisiez quand il est survenu. - "hu": \n\nPlease e-mail richard\@systemeD.net with a bug report, saying what you were doing at the time. - "no": \n\nPlease e-mail richard\@systemeD.net with a bug report, saying what you were doing at the time. - "ru": "\n\n Пожалуйста, отправьте сообщение об ошибке (на английском языке) на электронную почту: richard\@systemeD.net, с указанием того, какие действия вы совершали." - "sv": \n\nVänligen e-posta richard\@systemeD.net med en felreport, som beskriver vad du gjorde när felet inträffade. -error_connectionfailed: - "de": Die Verbindung zum OpenStreetMap Server ist leider fehlgeschlagen. Kürzliche Änderungen wurden nicht gespeichert.\n\nNochmal versuchen? - "es": "Disculpe - la conexión al servidor de OpenStreetMap ha fallado. Cualquier cambio reciente no se ha guardado.\n\nPodría intentarlo de nuevo?" - "fi": "Yhteys OSM-palvelimeen epäonnistui. Tuoreita muutoksia ei ole tallennettu.\n\nHaluatko yrittää uudestaan?" - "fr": "Désolé, la connexion au serveur OpenStreetMap a échoué. Vos changements récents ne sont pas enregistrés.\n\nVoulez-vous réessayer ?" - "hu": "Bocs - az OpenStreetMap szerverhez való kapcsolódás sikertelen. A legutóbbi módosítások nem lettek elmentve.\n\nSzeretnéd megpróbálni újra?" - "no": "Sorry - the connection to the OpenStreetMap server failed. Any recent changes have not been saved.\n\nWould you like to try again?" - "ru": "Извините, соединение с сервером OpenStreetMap разорвано. Все текущие изменения не были сохранены.\n\nПопробовать ещё раз?" - "sv": "Tyvärr har vi tappat kontakten med OpenStreetMap serven. Ny gjorda ändringar har inte kunnat sparas.\n\nFörsöka återansluta?" -error_nopoi: - "de": Der Ort von Interesse (POI) kann nicht gefunden werden (vielleicht hast Du den Kartenausschnitt verschoben?), daher ist Rückgängigmachen nicht möglich. - "es": El punto de interés (POI) no se puede encontrar (igual usted se ha desplazado a otra zona?), por tanto no se puede deshacer. - "fi": POI ei löydä (ehkä vieritit siitä liian kauaksi), joten peruminen ei onnistu. - "fr": Le point d'intérêt (POI) n'est pas trouvé (éventuellement sur une autre page?), il ne peut être restauré. - "hu": The POI cannot be found (perhaps you've panned away?) so I can't undo. - "no": The POI cannot be found (perhaps you've panned away?) so I can't undo. - "ru": Точка интереса(POI) не найдена (возможно вы отошли в сторону?), поэтому невозможно отменить. - "sv": "POI:n kan inte hittas (du kanske har flyttat den utanför bilden?) så det går inte att ångra." -error_nosharedpoint: - "de": Die Wege $1 und $2 haben keinen gemeinsamen Punkt mehr, daher kann das Aufteilen nicht rückgängig gemacht werden. - "es": Las vías $1 y $2 ya no tienen ningún punto en común, por tanto no se pueden dividir. - "fi": Ways $1 and $2 don't share a common point any more, so I can't undo the split. - "fr": "Les chemins $1 et $2 n'ont plus de point en commun et ne peuvent donc pas être recollés : l'opération précédente de scindage ne peut être annulée." - "hu": Ways $1 and $2 don't share a common point any more, so I can't undo the split. - "no": Ways $1 and $2 don't share a common point any more, so I can't undo the split. - "ru": Пути $1 и $2 больше не содержат общих узлов, поэтому невозможно отменить разделение. - "sv": Vägarna $1 och $2 möts inte i någon punkt längre, så det går inte att ångra delningen. -error_noway: - "de": Der Weg $1 kann nicht gefunden werden (vielleicht hast Du den Kartenausschnitt verschoben?), daher ist Rückgängigmachen nicht möglich. - "es": La vía $1 no se puede encontrar (igual usted se ha desplazado a otra zona?), por tanto no se puede deshacer.. - "fi": Tietä $1 ei löydy (ehkä vieritit siitä liian kauaksi), joten kumoaminen ei onnistu. - "fr": Le chemin $1 n'a pas été trouvé, il ne peut être restauré à son état précédent. - "hu": Way $1 cannot be found (perhaps you've panned away?) so I can't undo. - "no": Way $1 cannot be found (perhaps you've panned away?) so I can't undo. - "ru": Путь $1 не найден (возможно вы отошли в сторону?), поэтому невозможно отменить. - "sv": Vägen $1 kan inte hittas (du kanske har flyttat den utanför bilden?) så det går inte att ångra. -gpxpleasewait: - "de": Bitte warten, während die GPX-Aufzeichnung (Track) verarbeitet wird. - "es": Por favor espere un poco mientras el track GPX se procesa. - "fi": Odota. GPX-jälkeä käsitellään. - "fr": Patientez pendant que la trace GPX est traitée. - "hu": Kérlek várj a GPX útvonal feldolgozásáig. - "no": Vennligst vent mens sporloggen behandles. - "ru": Пожалуйста, подождите — GPX-треки обрабатываются. - "sv": GPX loggen bearbetas, var god vänta. -help: - "de": Hilfe - "es": Ayuda - "fi": Ohje - "fr": Aide - "hu": Segítség - "no": Hjelp - "ru": Помощь - "sv": Hjälp -hint_drawmode: - "de": Klicken um Punkt hinzuzufügen\n Doppelklicken oder Eingabetaste zum Beenden der Linie - "es": Clic para añadir un punto\ndoble-clic/Return\npara terminar la línea - "fi": klikkaa lisätäksesi piste\ntuplaklikkaa tai paina enter päättääksesi tien - "fr": clic pour ajouter un point\ndouble-clic/Return\npour terminer le chemin - "hu": kattintás pont hozzáadásához\ndupla kattintás/Return\na vonal befejezéséhez - "no": trykk for å legge til punkt\ndobbeltklikk eller enter\nfor å avslutte linje - "ru": кликните для добавления точки\nдвойной клик или Enter\nчтобы чтобы закончить путь - "sv": Klicka för att lägga till en punkt\n Dubbel klicka för att avsluta vägen. -hint_loading: - "de": Wege werden geladen - "es": Cargando vías - "fi": ladataan teitä - "fr": chargement des chemins en cours - "hu": utak betöltése - "no": laster veier - "ru": загрузка путей - "sv": laddar vägar -hint_overendpoint: - "de": Überlappung mit Endpunkt\nKlicken zum Anschließen\nShift+Klick zum Verschmelzen - "es": Sobre punto final\nclic para unir\nshift-clic para combinar - "fi": päätepisteen päällä\nklikkaa sulkeaksi\nshift-klikkaa yhdistääksesi - "fr": sur le dernier point du tracé \nclick pour joindre\nshift-click pour fusionner - "hu": végpont fölött\nkattintás a csatlakoztatáshoz\nshift-kattintás az egyesítéshez - "no": over endepunkt\ntrykk for å koble sammen\nshift+trykk for å slå sammen - "ru": над конечным узлом\nclick для соединения\nshift-click для слияния - "sv": över en slutpunkt\nklicka för att sätta fast\nshift-klicka för att slåsamman -hint_overpoint: - "de": Überlappung mit Punkt\nklicken zum Anschließen - "es": Sobre punto\nclick para unir" - "fi": pisteen päällä\nklikkaa yhdistääksesi" - "fr": point du dessus\nclick pour joindre" - "hu": pont fölött\nkattintás a csatlakoztatáshoz" - "no": over punkt\ntrykk for å koble sammen - "ru": над узлом\nclick для соединения" - "sv": över en punkt \nkicka att sätta fast" -hint_pointselected: - "de": Punkt ist markiert\n(Shift+Punkt anklicken, um\n eine neue Linie zu ziehen) - "es": Punto seleccionado\n(shift-clic en el punto para\nempezar nueva línea) - "fi": piste valittua\n(shift-klikkaa pistettä\naloittaksesi uuden tien) - "fr": point sélectionné\n(shift-clic sur le point pour\ncommencer une nouvelle ligne) - "hu": pont kijelölve\n(shift-kattintás a pontra \núj vonal kezdéséhez) - "no": punkt valgt\n(shift+trykk punktet for å\nstarte en ny linje) - "ru": точка выбрана\n(кликните с нажатым Shift на точку\nчтобы начать новую линию) - "sv": En punk är vald\n(Shift-klicka på punkten för att starta en ny väg) -hint_toolong: - "de": "Zu lang zum Entsperren:\n bitte in kürzere Wege aufteilen" - "es": "Demasiado larga para desbloquear:\nPorfavor divida\nen vías más cortas" - "fi": "liian pitkä vapautettavaksi:\nkatkaise\nlyhyempiin teihin" - "fr": "trop long pour débloquer la situation:\nscindez le chemin en\nchemins plus courts" - "hu": "too long to unlock:\nplease split into\nshorter ways" - "no": "for lang til å låse opp:\nvennligst del opp\ni mindre veier" - "ru": "слишком длинный путь для разблокировки:\пожалуйста, разбейте его\nна более короткие пути" - "sv": "för lång för att låsaupp:\ndela upp vägen\ni mindre delar" -option_background: - "de": "Hintergrund:" - "es": "Fondo:" - "fi": "Tausta:" - "fr": "Arrière-plan :" - "hu": "Háttér:" - "no": "Background:" - "ru": "Фон:" - "sv": "Bakgrund:" -option_custompointers: - "de": Stift- und Hand-Mauszeiger benutzen - "es": Usar punteros de pluma y mano - "fi": Käytä kynä- ja käsikursoreita - "fr": Utiliser le crayon et la main pour pointer les éléments - "hu": Use pen and hand pointers - "no": Use pen and hand pointers - "ru": Использовать курсоры пера и руки - "sv": Använd penna och hand pekare -option_fadebackground: - "de": Hintergrund verblasst - "es": Atenuar fondo - "fi": Himmeä tausta - "fr": Arrière-plan clair - "hu": Fade background - "no": Fade background - "ru": Обесцветить фон - "sv": Mattad bakgrund -option_thinlines: - "de": Dünne Linien in allen Auflösungen benutzen - "es": Usar líneas finas en todas las escalas - "fi": Käytä aina ohuita viivoja - "fr": Utiliser un trait fin à toutes les échelles - "hu": Use thin lines at all scales - "no": Use thin lines at all scales - "ru": Использовать тонкие линии на всех масштабах - "sv": Använd tunna linjer på alla skalor -play: - "de": Ausprobieren - "hu": Kipróbálás -point: - "de": Punkt - "hu": Pont -practicemode: - "de": Übungsmodus - "es": Modo prácticas - "fi": Harjoitustila - "fr": Mode d'essai - "hu": Gyakorlás mód - "no": Øvelsesmodus - "ru": Тренировочный режим - "sv": Tränings läge -prompt_accuracy: - "de": Fehlerfreiheit ist wichtig - Trage nur Orte ein, wo Du warst - "es": La precisión es importante - Mapee solo zonas en las que ha estado físicamente. - "fi": Tarkkuus on tärkeää; muokkaathan vain paikkoja, joissa olet ollut. - "fr": Précision importante - Éditez seulement les lieux que vous avez visités - "hu": A pontosság fontos - csak olyan helyeket térképezz, ahol már jártál - "no": Nøyaktighet er viktig, bare kartlegg steder du har besøkt - "ru": Точность важна. Составляйте карты только для тех мест, в которых вы были. - "sv": Noggrannhet är viktigt - kartera bara ställen du varit -prompt_addtorelation: - "de": $1 zu einer Relation hinzufügen - "es": Añadir $1 a una relación - "fi": Lisä $1 relaatioon - "fr": Ajouter $1 à la relation - "hu": $1 hozzáadása egy kapcsolathoz - "no": Add $1 to a relation - "ru": Добавить $1 в отношение - "sv": Läggtill $1 till en relation -prompt_dontcopy: - "de": Kopiere nichts von anderen Karten - "es": No copie de otros mapas - "fi": Älä kopioi muista kartoista - "fr": Ne copiez pas d'autre cartes - "hu": Ne másolj más térképekből - "no": Ikke kopier fra andre kart - "ru": Не копируйте информацию с других карт - "sv": Kopiera inget från andra kartor -prompt_enjoy: - "de": "Und: Viel Spaß!" - "es": Y páselo bien! - "fi": Pidä hauskaa! - "fr": Et amusez-vous bien ! - "hu": És szórakozz jól! - "no": Og ha det morsomt! - "ru": Приятного вам времяпровождения! - "sv": och ha roligt! -prompt_help: - "de": Anleitung für Potlatch, diesen Karten-Editor. - "es": Encuentre cómo usar Potlatch (éste editor de mapas). - "fi": Kuinka käytän Potlatchiä, tätä editoria? - "fr": Découvrez comment utiliser Potlatch, cet éditeur de la carte. - "hu": Nézz utána, hogyan kell használni a Potlatch-ot, ezt a térképszerkesztőt. - "no": Find out how to use Potlatch, this map editor. - "ru": Узнать, как пользоваться редактором. - "sv": Information hur man använder Potlatch, den här kart editorn. -prompt_introduction: - "de": Wähle unten eine Schaltfläche zum Editieren. Wenn Du "Start" anklickst, wirst Du die Karte sofort direkt bearbeiten - Änderungen werden meist jeden Donnerstag sichtbar. Wenn Du "Ausprobieren" anklickst, werden Deine Änderungen nicht gespeichert, also kannst Du hier das Bearbeiten üben.\n\nDenk an die Goldenen Regeln von OpenStreetMap:\n\n - "es": Seleccione uno de los botones más abajo para empezar a editar. Si pulsa "Empezar", estará editando directamente el mapa - Normalmente los cambios se mostrarán cada Jueves. Si pulsa "Jugar", sus cambios no se guardarán, de esta manera podrá practicar la edición.\n\nRecuerde las reglas de oro de OpenStreetMap:\n\n - "fi": "Valitse haluamasi tila. Jos valitset aloita, pääset muokkaamaan karttaa suoraan - muutokset päivittyvät pääsivun kartalle yleensä torstaisin. Jos valitset harjoittele, tekemiäsi muutoksia ei tallenneta mihinkää, eli voit harjoitella editointia\n\nMuistathan OpenStreetMapin kultaiset säännöt:\n\n" - "fr": "Choisir un bouton ci-dessous pour commencer l'édition. Si vous cliquez sur 'Start', vous éditerez directement la carte principale - les modifications sont visibles sur celle-ci généralement tous les jeudis. Si vous cliquez sur 'Play', vos modifications ne seront pas enregistrées, ainsi vous pouvez vous exercer sans risques.\n\nEt gardez en tête ces règles d'or d'OpenStreetMap :\n\n" - "hu": "Válassz az alábbi gombok közül a szerkesztéshez. Ha a 'Kezdés'-re kattintasz, akkor közvetlenül a főtérképet szerkesztheted - a módosítások általában minden csütörtökön jelennek meg. Ha a 'Kipróbálás'-ra kattintasz, akkor a módosításaid nem lesznek elmentve, így gyakorolhatod a szerkesztést.\n\nEmlékezz az OpenStreetMap aranyszabályaira:\n\n" - "no": "Velg en knapp nedenfor for å redigere. Hvis du velger 'Start' redigerer du kartet direkte, endringer blir vanligvis synlige hver torsdag. Hvis du velger 'Lek' lagres ikke endringer, så du kan øve deg på å redigere.\nHusk OpenStreetMaps gyldne regler:\n\n" - "ru": "Выберите кнопку. Если вы нажмёте «Start», вы начнёте редактировать карту. Основная карта обновляется по средам. Если вы нажмёте «Play», ваши изменения на карте сохраняться не будут и вы сможете практиковаться в редактировании.\n\nЗапомните основные правила OpenStreetMap:\n\n" - "sv": "För att börja editera, klicka på en av knapparna nedan. Om du klickar på 'Start' så arbetar du direkt mot huvudkartan, och ändringar sparas automatiskt - ändringarna syns normalt varje torsdag efter huvudkartan uppdaterats. Om du klickar 'Play' så kommer inget att sparas, ett bra sätt att träna på att använda programmet.\n\nKom ihåg OpenStreetMaps gyllene regler:\n\n" -prompt_practise: - "de": Bearbeiten üben - Deine Änderungen werden nicht gespeichert. - "es": Mapear en prácticas - Sus cambios no se guardarán. - "fi": Harjoittele - muutoksiasi ei talleneta. - "fr": "Essai de cartographie : vos changements ne seront pas pris en compte." - "hu": Térképezés gyakorlása - módosításaid nem lesznek elmentve. - "no": Øv på kartlegging, endringer blir ikke lagret. - "ru": Тренировочное редактирование — ваши изменения не будут сохранены. - "sv": Träna på kartering - inga ändringar kommer att sparas. -prompt_revertversion: - "de": "Früher gespeicherte Version wiederherstellen:" - "es": "Volver a una versión previamente guardada:" - "fi": "Palauta aiempaan versioon:" - "fr": "Revenir à une version sauvegardée plus récente :" - "hu": "Visszaállítás egy korábbi mentett változatra:" - "no": "Tilbakestill til tidligere lagret versjon:" - "ru": "Восстановить ранее сохраненную версию:" - "sv": Gå tillbaks till en tidigare version -prompt_selectrelation: - "de": Bestehende Relation zum Hinzufügen auswählen oder neue Relation erstellen. - "es": Seleccionar una relación existente para añadir a ella, o crear una nueva relación. - "fi": Valitse olemassa oleva relaatio, johon lisätään, tai luo uusi. - "fr": Sélectionner une relation existante pour l'ajouter, ou créer une nouvelle relation. - "hu": Select an existing relation to add to, or create a new relation. - "no": Select an existing relation to add to, or create a new relation. - "ru": Выберете существующее отношение или создайте новое. - "sv": Välj en befintligrelation att addera till, eller skapa en ny relation. -prompt_start: - "de": Kartographieren mit OpenStreetMap beginnen - "es": Empezar a mapear con OpenStreetMap. - "fi": Aloita kartan muokkaus. - "fr": Démarrer la cartographie avec OpenStreetMap. - "hu": Térképezés kezdése OpenStreetMappal. - "no": Begynn å kartlegg med OpenStreetMap. - "ru": Начать редактировать карту OpenStreetMap. - "sv": Börja kartera med OpenStreetMap. -prompt_taggedpoints: - "de": Einige Punkte auf diesem Weg tragen Attribute (Tags). Trotzdem löschen? - "es": Algunos puntos de esta vía tienen parámetros (tags). Seguro que quiere borrar? - "fi": Joihinkin tien pisteisiin on lisätty tageja. Haluatko varmasti perua? - "fr": Certains points de ce chemin sont tagués. Souhaitez-vous les supprimer? - "hu": Ezen az úton van néhány címkézett pont. Biztosan törlöd? - "no": Some of the points on this way are tagged. Really delete? - "ru": Некоторые узлы данного пути содержат теги. Действительно удалить? - "sv": Några en punkterna i denna väg är taggade, vill du verkligen ta bort den? -prompt_track: - "de": Deine GPS-Aufzeichnungen (Tracks) in (gesperrte) Wege zum Editieren wandeln. - "es": Convierta su track de GPS a vías (bloqueadas) para editar. - "fi": Muunna GPX-jälki lukituiksi teiksi editointia varten - "fr": Conversion d'une trace GPS en chemin (verrouillé) pour l'édition. - "hu": Convert your GPS track to (locked) ways for editing. - "no": Convert your GPS track to (locked) ways for editing. - "ru": Конвертировать GPS-трек в путь(заблокированный), для редактирования. - "sv": Omvandla dina GPS spår till (låsta) vägar för editering. -prompt_welcome: - "de": Willkommen bei OpenStreetMap! - "es": Bienvenido a OpenStreetMap! - "fi": "Tervetuloa OpenStreetMap:iin" - "fr": Bienvenue sur OpenStreetMap ! - "hu": Üdvözöllek az OpenStreetMapon! - "no": Velkommen til OpenStreetMap! - "ru": Добро пожаловать в OpenStreetMap! - "sv": Välkommen till OpenStreetMap! -revert: - "de": Vorherige Version wiederherstellen - "es": Volver - "fi": Kumoa - "fr": Revenir - "hu": Visszaállítás - "no": Tilbakestill - "ru": Восстановить - "sv": Använd denna version -start: - "de": Start - "hu": Kezdés -tip_addrelation: - "de": Zu einer Relation hinzufügen - "es": Añadir a una relación - "fi": Lisää relaatio - "fr": Ajouter à une relation - "hu": Hozzáadás kapcsolathoz - "no": Legg til i en relation - "ru": Добавить новое отношение(relation) - "sv": Läggtill en ny relation -tip_addtag: - "de": Attribut (Tag) hinzufügen - "es": Añadir un nuevo parámetro (tag) - "fi": Lisää uusi tagi - "fr": Ajouter un nouveau tag - "hu": Új címke hozzáadása - "no": Legg til tag - "ru": Добавить новый тег - "sv": Läggtill en ny tag -tip_alert: - "de": Ein Fehler ist aufgetreten - Klicken für Details - "es": Ha ocurrido un error - clic para detalles - "fi": Tapahtui virhe - klikkaa saadaksesi lisätietoja - "fr": Une erreur vient de survenir - cliquez pour plus de détails - "hu": Hiba történt - kattints a részletekért - "no": Det oppstod en feil, trykk for detaljer - "ru": Произошла ошибка — нажмите для получения подробностей - "sv": Ett fel har inträffat - klicka för detaljer -tip_anticlockwise: - "de": Geschlossener Weg gegen den Uhrzeigersinn - Klicken zum Richtung Ändern - "es": Vía circular en el sentido contrario de las agujas del reloj - clic para invertir la dirección de la vía - "fi": Vastapäivään sulkeutuva tie - klikkaa kääntääksesi - "fr": Circulation dans le sens inverse des aiguilles d'une montre (trigonométrique) - Cliquez pour inverser le sens - "hu": Órajárással ellentétes körút - kattints a megfordításhoz - "no": Sirkulær vei mot klokka, trykk for å snu - "ru": Замкнутый путь против часовой стрелки - изменить на противоположный - "sv": Vägen är rund, riktad moturs, klicka för att vända rikting -tip_clockwise: - "de": Geschlossener Weg im Uhrzeigersinn - Klicken zum Richtung Ändern - "es": Vía circular en el sentido de las agujas del reloj - clic para invertir la dirección de la vía - "fi": Myötäpäivään sulkeutuva tie - klikkaa kääntääksesi - "fr": Circulation dans le sens des aiguilles d'une montre - Cliquez pour inverser le sens - "hu": Órajárással egyező körút - kattints a megfordításhoz - "no": Sirkulær vei med klokka, trykk for å snu - "ru": Замкнутый путь по часовой стрелке - изменить на противоположный - "sv": Vägen är rund riktad medurs, klicka för att vända riktning -tip_direction: - "de": Richtung des Weges - Klicken zum Ändern - "es": Dirección de la vía - clic para invertir la dirección de la vía - "fi": Tien suunta - klikkaa kääntääksesi - "fr": Direction du chemin - cliquez pour inverser - "hu": Út iránya - kattints a megfordításhoz - "no": Veiretning, trykk for å snu - "ru": Направление пути — изменить на противоположный - "sv": Vägens riktning - klicka för att vända vägen -tip_gps: - "de": GPS-Aufzeichnungen (Tracks) einblenden (G) - "es": Mostrar los tracks de GPS (G) - "fi": Näytä GPS-jäljet (G) - "fr": Afficher la trace GPS (G) - "hu": GPS útvonalak megjelenítése (G) - "no": Vis GPS sporlogger (G) - "ru": Показать GPS треки (G) - "sv": Visa GPS spår (G) -tip_noundo: - "de": Es gibt nichts rückgängig zu machen. - "es": Nada que deshacer - "fi": Ei kumottavaa - "fr": Rien à annuler - "hu": Nincs mit visszavonni - "no": Ingenting å angre - "ru": Нечего отменять - "sv": Finns inget att ångra -tip_options: - "de": Optionen ändern (Kartenhintergrund) - "es": Opciones (elegir el fondo del mapa) - "fi": Asetukset (valitse kartan tausta) - "fr": Options (choix de la carte d'arrière plan) - "hu": Beállítások módosítása (térképháttér kiválasztása) - "no": Sett valg (velg kartbakgrunn) - "ru": Задать настройки (выбрать карту-подложку) - "sv": Ändra inställningar (välj bakgrunds karta) -tip_presettype: - "de": Wähle die Art der Voreinstellungen, die im Menü angeboten werden sollen. - "es": Seleccionar que tipo de parámetros (tags) preestablecidos se ofrecen en el menú. - "fi": Valitse millaisia pohjia on tarjolla valikossa. - "fr": Sélectionner le type de paramètres proposés dans le menu de sélection. - "hu": Choose what type of presets are offered in the menu. - "no": Choose what type of presets are offered in the menu. - "ru": Выберете какой набор тегов отображать в меню. - "sv": Välj vilka typer an inställningar som syns i menyn. -tip_repeattag: - "de": Attribute (Tags) vom vorher markierten Weg übernehmen (R) - "es": Repetir los parámetros (tags) de la vía seleccionada previamente (R) - "fi": Toista tagit viimeksi valitusta tiestä (R) - "fr": Recopier les informations du chemin sélectionné précédemment (R) - "hu": Az előzőleg kiválasztott út címkéinek megismétlése (R) - "no": Repeter tagger fra siste valgte vei (R) - "ru": Повторить теги с предыдущего выбранного пути (R) - "sv": Kopiera taggarna från den senast valda vägen (R) -tip_revertversion: - "de": Version zum Wiederherstellen wählen - "es": Elige la versión a la que volver. - "fi": Valitse versio, johon palautetaan - "fr": Choisissez la version vers laquelle revenir - "hu": Válaszd ki a változatot a visszaállításhoz - "no": Velg versjonen det skal tilbakestilles til - "ru": Выберете версию для воосстановления - "sv": Välj version som ska användas -tip_selectrelation: - "de": Zur markierten Route hinzufügen ?Route or Way? - "es": Añadir a la ruta seleccionada - "fi": Lisää valittuun reittiin - "fr": Ajouter à la route choisie - "hu": Hozzáadás a kiválasztott útvonalhoz - "no": Add to the chosen route - "ru": Добавить в выбранное отношение - "sv": Addera till den valda rutten -tip_splitway: - "de": Weg am markierten Punkt auftrennen (X) - "es": Dividir la vía en el punto seleccionado (X) - "fi": Katkaise tie valitusta kohtaa (X) - "fr": scinder le chemin au point sélectionné (X) - "hu": Út kettévágása a kijelölt pontnál (X) - "no": Del vei i valgt punkt (X) - "ru": Разделить путь в текущем узле (X) - "sv": Dela upp vägen i två delar vid den valda punkten (x) -tip_undo: - "de": $1 rückgängig machen (Z) - "es": Deshacer $1 (Z) - "fi": Kumoa $1 (Z) - "fr": Annuler l'opération $1 (Z) - "hu": $1 visszavonása (Z) - "no": Undo $1 (Z) - "ru": Отменить $1 (Z) - "sv": Ångra $1 (Z) -track: - "de": "to track: Weg aufzeichnen, the track: GPS-Aufzeichnung (Track)" - "es": Track - "fi": Jälki - "fr": Trace - "hu": Útvonal - "no": Track - "ru": Трек - "sv": Spår -way: - "de": Weg - "hu": Út diff --git a/config/potlatch/relation_colours.txt b/config/potlatch/relation_colours.txt index 557563fe2..03398fb71 100644 --- a/config/potlatch/relation_colours.txt +++ b/config/potlatch/relation_colours.txt @@ -4,5 +4,4 @@ lcn 0x0000ff 50 10 rcn 0x28c9fe 50 10 ncn 0xff3333 50 10 -foot 0x228022 50 10 -trail 0x228022 50 10 +ldp 0x228022 50 10 diff --git a/lib/potlatch.rb b/lib/potlatch.rb index cf8f5903d..4dfba12ef 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -83,7 +83,7 @@ module Potlatch when 'Hash' a=3.chr n.each do |k,v| - a+=encodestring(k.to_s)+encodevalue(v) + a+=encodestring(k)+encodevalue(v) end a+0.chr+0.chr+9.chr when 'String' @@ -195,10 +195,7 @@ module Potlatch } end - # Read internationalisation - localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised.yaml")) - - [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,localised] + [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths] end end diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf index 63a04bf51..721840fe4 100755 Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ