X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9c01c4cb639775f4f93f477546124247a33f80d2..9ec8ef0220bcc4b0f186bba4de354e2ce3e0504f:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index ea32acec8..b7667b71d 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -4,8 +4,20 @@ class AmfController < ApplicationController session :off before_filter :check_write_availability + # AMF controller for 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). + # + # 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 @@ -13,9 +25,10 @@ class AmfController < ApplicationController # ---- talk process AMF request def talk - req=StringIO.new(request.raw_post) # Get POST data as request - req.read(2) # Skip version indicator and client ID - results={} # Results of each body + 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 # ------------- # Parse request @@ -37,14 +50,16 @@ class AmfController < ApplicationController args=getvalue(req) # | get response (probably an array) case message - when 'getpresets'; results[index]=putdata(index,getpresets) - when 'whichways'; results[index]=putdata(index,whichways(args)) - when 'getway'; results[index]=putdata(index,getway(args)) - when 'putway'; results[index]=putdata(index,putway(args)) - when 'deleteway'; results[index]=putdata(index,deleteway(args)) - when 'makeway'; results[index]=putdata(index,makeway(args)) - when 'putpoi'; results[index]=putdata(index,putpoi(args)) - when 'getpoi'; results[index]=putdata(index,getpoi(args)) + when 'getpresets'; results[index]=putdata(index,getpresets) + when 'whichways'; results[index]=putdata(index,whichways(args)) + when 'whichways_deleted'; results[index]=putdata(index,whichways_deleted(args)) + 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 'deleteway'; results[index]=putdata(index,deleteway(args)) + when 'putpoi'; results[index]=putdata(index,putpoi(args)) + when 'getpoi'; results[index]=putdata(index,getpoi(args)) end end @@ -94,8 +109,9 @@ motorway: highway=motorway,ref=(type road number) trunk road: highway=trunk,ref=(type road number),name=(type road name) primary road: highway=primary,ref=(type road number),name=(type road name) secondary road: highway=secondary,ref=(type road number),name=(type road name) -residential road: highway=residential,name=(type road name) -unclassified road: highway=unclassified,name=(type road name) +tertiary road: highway=tertiary,ref=,name=(type road name) +residential road: highway=residential,ref=,name=(type road name) +unclassified road: highway=unclassified,ref=,name=(type road name) way/footway footpath: highway=footway,foot=yes @@ -116,6 +132,7 @@ navigable drain: waterway=drain,boat=yes,name=(type name here) 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 @@ -126,8 +143,8 @@ disused railway tracks: railway=disused course of old railway: railway=abandoned way/natural -lake: landuse=water -forest: landuse=forest +lake: natural=water,landuse= +forest: landuse=forest,natural= point/road mini roundabout: highway=mini_roundabout @@ -155,7 +172,7 @@ viaduct: railway=viaduct level crossing: railway=crossing point/natural -peak: point=peak +peak: natural=peak POI/road car park: amenity=parking @@ -181,7 +198,7 @@ post office: amenity=post_office,tourism=,name=,religion=,denomination= pub: tourism=,amenity=pub,name=(type name here),religion=,denomination= POI/natural -peak: point=peak +peak: natural=peak EOF StringIO.open(txt) do |file| @@ -202,7 +219,7 @@ EOF end } end - return [presets,presetmenus,presetnames] + [presets,presetmenus,presetnames] end # ----- whichways(left,bottom,right,top) @@ -215,38 +232,60 @@ EOF 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] + baselong = args[4] + basey = args[5] + masterscale = args[6] RAILS_DEFAULT_LOGGER.info(" Message: whichways, bbox=#{xmin},#{ymin},#{xmax},#{ymax}") - waylist=WaySegment.find_by_sql("SELECT DISTINCT current_way_segments.id AS wayid"+ - " FROM current_way_segments,current_segments,current_nodes,current_ways "+ - " WHERE segment_id=current_segments.id "+ - " AND current_segments.visible=1 "+ - " AND node_a=current_nodes.id "+ - " AND current_ways.id=current_way_segments.id "+ - " AND current_ways.visible=1 "+ - " AND (latitude BETWEEN "+ymin.to_s+" AND "+ymax.to_s+") "+ - " AND (longitude BETWEEN "+xmin.to_s+" AND "+xmax.to_s+")") + waylist = ActiveRecord::Base.connection.select_all("SELECT DISTINCT current_way_nodes.id AS wayid"+ + " FROM current_way_nodes,current_nodes,current_ways "+ + " WHERE current_nodes.id=current_way_nodes.node_id "+ + " AND current_nodes.visible=1 "+ + " AND current_ways.id=current_way_nodes.id "+ + " AND current_ways.visible=1 "+ + " AND "+OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")) - ways = waylist.collect {|a| a.wayid.to_i } # get an array of way id's + ways = waylist.collect {|a| a['wayid'].to_i } # get an array of way IDs - pointlist =ActiveRecord::Base.connection.select_all("SELECT current_nodes.id,latitude,longitude,current_nodes.tags "+ + pointlist = ActiveRecord::Base.connection.select_all("SELECT current_nodes.id,current_nodes.latitude*0.0000001 AS lat,current_nodes.longitude*0.0000001 AS lng,current_nodes.tags "+ " FROM current_nodes "+ - " LEFT OUTER JOIN current_segments cs1 ON cs1.node_a=current_nodes.id "+ - " LEFT OUTER JOIN current_segments cs2 ON cs2.node_b=current_nodes.id "+ - " WHERE (latitude BETWEEN "+ymin.to_s+" AND "+ymax.to_s+") "+ - " AND (longitude BETWEEN "+xmin.to_s+" AND "+xmax.to_s+") "+ - " AND cs1.id IS NULL AND cs2.id IS NULL "+ + " LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id "+ + " WHERE "+OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")+ + " AND cwn.id IS NULL "+ " AND current_nodes.visible=1") - points = pointlist.collect {|a| [a['id'],long2coord(a['longitude'].to_f,baselong,masterscale),lat2coord(a['latitude'].to_f,basey,masterscale),tag2array(a['tags'])] } # get a list of node ids and their tags + 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) + # return array of deleted ways in current bounding box + + def whichways_deleted(args) + 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 + # ----- getway (objectname, way, baselong, basey, masterscale) # returns objectname, array of co-ordinates, attributes, # xmin,xmax,ymin,ymax @@ -255,30 +294,82 @@ EOF objname,wayid,baselong,basey,masterscale=args wayid = wayid.to_i points = [] - lastid = -1 - xmin = ymin = 999999 + xmin = ymin = 999999 xmax = ymax = -999999 RAILS_DEFAULT_LOGGER.info(" Message: getway, id=#{wayid}") readwayquery(wayid).each {|row| - xs1=long2coord(row['long1'].to_f,baselong,masterscale); ys1=lat2coord(row['lat1'].to_f,basey,masterscale) - xs2=long2coord(row['long2'].to_f,baselong,masterscale); ys2=lat2coord(row['lat2'].to_f,basey,masterscale) - points << [xs1,ys1,row['id1'].to_i,0,tag2array(row['tags1']),0] if (row['id1'].to_i!=lastid) - lastid = row['id2'].to_i - points << [xs2,ys2,row['id2'].to_i,1,tag2array(row['tags2']),row['segment_id'].to_i] - xmin = [xmin,row['long1'].to_f,row['long2'].to_f].min - xmax = [xmax,row['long1'].to_f,row['long2'].to_f].max - ymin = [ymin,row['lat1'].to_f,row['lat2'].to_f].min - ymax = [ymax,row['lat1'].to_f,row['lat2'].to_f].max + points<<[long2coord(row['longitude'].to_f,baselong,masterscale),lat2coord(row['latitude'].to_f,basey,masterscale),row['id'].to_i,nil,tag2array(row['tags'])] + 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 } attributes={} attrlist=ActiveRecord::Base.connection.select_all "SELECT k,v FROM current_way_tags WHERE id=#{wayid}" - attrlist.each {|a| attributes[a['k']]=a['v'] } + attrlist.each {|a| attributes[a['k'].gsub(':','|')]=a['v'] } [objname,points,attributes,xmin,xmax,ymin,ymax] end + + # ----- getway_old (objectname, way, version, baselong, basey, masterscale) + # returns old version of way + + def getway_old(args) + 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 + + objname,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,objname,points,attributes,xmin,xmax,ymin,ymax,version] + end + + # ----- getway_history (way) + # returns array of previous versions (version,timestamp,visible,user) + # should also show 'created_by' + + def getway_history(wayid) + history=[] + sql=<<-EOF + SELECT version,timestamp,visible,display_name,data_public + FROM ways,users + WHERE ways.id=#{wayid} + AND ways.user_id=users.id + ORDER BY version DESC + EOF + histlist=ActiveRecord::Base.connection.select_all(sql) + histlist.each { |row| + if row['data_public'] then user=row['display_name'] else user='anonymous' end + history<<[row['version'],row['timestamp'],row['visible'],user] + } + [history] + end # ----- putway (user token, way, array of co-ordinates, array of attributes, # baselong, basey, masterscale) @@ -286,28 +377,51 @@ EOF # xmin,xmax,ymin,ymax def putway(args) - usertoken,originalway,points,attributes,baselong,basey,masterscale=args + RAILS_DEFAULT_LOGGER.info(" putway started") + usertoken,originalway,points,attributes,oldversion,baselong,basey,masterscale=args uid=getuserid(usertoken) - return if !uid - db_uqs='uniq'+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquesegments table name, typically 51 chars - 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 + 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}") + # -- 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={}; seg={} + xc={}; yc={}; tagc={}; vc={} if originalway>0 way=originalway - readwayquery(way).each { |row| - id1=row['id1'].to_i; xc[id1]=row['long1'].to_f; yc[id1]=row['lat1'].to_f; tagc[id1]=row['tags1'] - id2=row['id2'].to_i; xc[id2]=row['long2'].to_f; yc[id2]=row['lat2'].to_f; tagc[id2]=row['tags2'] - seg[row['segment_id'].to_i]=id1.to_s+'-'+id2.to_s - } - ActiveRecord::Base.connection.update("UPDATE current_ways SET timestamp=#{db_now},user_id=#{uid},visible=1 WHERE id=#{way}") + if oldversion==0 + readwayquery(way).each { |row| + id=row['id'].to_i + xc[id]=row['longitude'].to_f + yc[id]=row['latitude' ].to_f + tagc[id]=row['tags'] + vc[id]=1 + } + else + readwayquery_old(way,oldversion,true).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 + } + 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 @@ -318,10 +432,11 @@ EOF # -- 5. compare nodes and update xmin,xmax,ymin,ymax - xmin = ymin = 999999 - xmax = ymax = -999999 - insertsql = '' + xmin=ymin= 999999 + xmax=ymax=-999999 + insertsql='' renumberednodes={} + nodelist=[] points.each_index do |i| xs=coord2long(points[i][0],masterscale,baselong) @@ -329,93 +444,47 @@ EOF 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]) - tagstr=tagstr.gsub(/[\000-\037]/,"") + 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) VALUES ( #{ys},#{xs},#{db_now},#{uid},1,#{tagsql})") - ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{newnode},#{ys},#{xs},#{db_now},#{uid},1,#{tagsql})") - points[i][2]=newnode - renumberednodes[node.to_s]=newnode.to_s + 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 + 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!=xc[node] or (ys/0.0000001).round!=(yc[node]/0.0000001).round or tagstr!=tagc[node]) - ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{node},#{ys},#{xs},#{db_now},#{uid},1,#{tagsql})") - ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{ys},longitude=#{xs},timestamp=#{db_now},user_id=#{uid},tags=#{tagsql},visible=1 WHERE id=#{node}") + if (xs!=xc[node] 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 - - - # -- 6.i compare segments - - numberedsegments={} - seglist='' # list of existing segments that we want to keep - for i in (0..(points.length-2)) - if (points[i+1][3].to_i==0) then next end - segid=points[i+1][5].to_i - from =points[i ][2].to_i - to =points[i+1][2].to_i - if seg.has_key?(segid) - # if segment exists, check it still refers to the same nodes - if seg[segid]=="#{from}-#{to}" then - if (seglist!='') then seglist+=',' end; seglist+=segid.to_s - next - end - elsif segid>0 - # not in previous version of way, but supplied, so assume - # that it's come from makeway (i.e. unwayed segments) - if (seglist!='') then seglist+=',' end; seglist+=segid.to_s - next - end - segid=ActiveRecord::Base.connection.insert("INSERT INTO current_segments ( node_a,node_b,timestamp,user_id,visible,tags) VALUES ( #{from},#{to},#{db_now},#{uid},1,'')") - ActiveRecord::Base.connection.insert("INSERT INTO segments (id,node_a,node_b,timestamp,user_id,visible,tags) VALUES (#{segid},#{from},#{to},#{db_now},#{uid},1,'')") - points[i+1][5]=segid - numberedsegments[(i+1).to_s]=segid.to_s end - # -- 6.ii insert new way segments + # -- 6a. delete any nodes not in modified way - createuniquesegments(way,db_uqs,seglist) # segments which appear in this way but no other - - # delete segments from uniquesegments (and not in modified way) + createuniquenodes(way,db_uqn,nodelist) # nodes which appear in this way but no other sql=<<-EOF - INSERT INTO segments (id,node_a,node_b,timestamp,user_id,visible) - SELECT DISTINCT segment_id,node_a,node_b,#{db_now},#{uid},0 - FROM current_segments AS cs, #{db_uqs} AS us - WHERE cs.id=us.segment_id AND cs.visible=1 - EOF - ActiveRecord::Base.connection.insert(sql) - - sql=<<-EOF - UPDATE current_segments AS cs, #{db_uqs} AS us - SET cs.timestamp=#{db_now},cs.visible=0,cs.user_id=#{uid} - WHERE cs.id=us.segment_id AND cs.visible=1 - EOF - ActiveRecord::Base.connection.update(sql) - - # delete nodes not in modified way or any other segments - - createuniquenodes(db_uqs,db_uqn) # nodes which appear in this way but no other - - sql=<<-EOF - INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible) - SELECT DISTINCT cn.id,cn.latitude,cn.longitude,#{db_now},#{uid},0 - FROM current_nodes AS cn,#{db_uqn} - WHERE cn.id=node_id + 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) @@ -426,26 +495,25 @@ EOF EOF ActiveRecord::Base.connection.update(sql) - ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqs}") + deleteuniquenoderelations(db_uqn,uid,db_now) ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}") - # insert new version of route into way_segments + # 6b. insert new version of route into way_nodes insertsql ='' currentsql='' sequence =1 - for i in (0..(points.length-2)) - if (points[i+1][3].to_i==0) then next end + points.each do |p| if insertsql !='' then insertsql +=',' end if currentsql!='' then currentsql+=',' end - insertsql +="(#{way},#{points[i+1][5]},#{version})" - currentsql+="(#{way},#{points[i+1][5]},#{sequence})" + insertsql +="(#{way},#{p[2]},#{sequence},#{version})" + currentsql+="(#{way},#{p[2]},#{sequence})" sequence +=1 end - ActiveRecord::Base.connection.execute("DELETE FROM current_way_segments WHERE id=#{way}"); - ActiveRecord::Base.connection.insert("INSERT INTO way_segments (id,segment_id,version ) VALUES #{insertsql}"); - ActiveRecord::Base.connection.insert("INSERT INTO current_way_segments (id,segment_id,sequence_id) VALUES #{currentsql}"); + 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 @@ -456,17 +524,15 @@ EOF if v[0,6]=='(type ' then next end if insertsql !='' then insertsql +=',' end if currentsql!='' then currentsql+=',' end - k=k.gsub(/[\000-\037]/,"") - v=v.gsub(/[\000-\037]/,"") - insertsql +="(#{way},'"+sqlescape(k)+"','"+sqlescape(v)+"',#{version})" - currentsql+="(#{way},'"+sqlescape(k)+"','"+sqlescape(v)+"')" + 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 - [originalway,way,renumberednodes,numberedsegments,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) @@ -475,27 +541,38 @@ EOF # if old: add new row to nodes, update current_nodes 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 + 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 - x=coord2long(x.to_f,masterscale,baselong) - y=coord2lat(y.to_f,masterscale,basey) - tagsql="'"+sqlescape(array2tag(tags))+"'" - - if (id>0) then - ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{id},#{y},#{x},#{db_now},#{uid},#{visible},#{tagsql})"); - ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{y},longitude=#{x},timestamp=#{db_now},user_id=#{uid},visible=#{visible},tags=#{tagsql} WHERE id=#{id}"); - newid=id - else - newid=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes (latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{y},#{x},#{db_now},#{uid},#{visible},#{tagsql})"); - ActiveRecord::Base.connection.update("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{newid},#{y},#{x},#{db_now},#{uid},#{visible},#{tagsql})"); + 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 - [id,newid] + + 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 # ----- getpoi (id,baselong,basey,masterscale) @@ -503,320 +580,239 @@ EOF def getpoi(args) id,baselong,basey,masterscale=args; id=id.to_i - poi=ActiveRecord::Base.connection.select_one("SELECT latitude,longitude,tags "+ + poi=ActiveRecord::Base.connection.select_one("SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lng,tags "+ "FROM current_nodes WHERE visible=1 AND id=#{id}") if poi.nil? then return [nil,nil,nil,''] end [id, - long2coord(poi['longitude'].to_f,baselong,masterscale), - lat2coord(poi['latitude'].to_f,basey,masterscale), + long2coord(poi['lng'].to_f,baselong,masterscale), + lat2coord(poi['lat'].to_f,basey,masterscale), tag2array(poi['tags'])] end - # ----- deleteway (user token, way) + # ----- deleteway (user token, way, nodes to keep) # returns way ID only def deleteway(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_uqs='uniq'+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquesegments table name, typically 51 chars - 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 - ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()") - createuniquesegments(way,db_uqs,'') - - # - delete any otherwise unused segments - - sql=<<-EOF - INSERT INTO segments (id,node_a,node_b,timestamp,user_id,visible) - SELECT DISTINCT segment_id,node_a,node_b,#{db_now},#{uid},0 - FROM current_segments AS cs, #{db_uqs} AS us - WHERE cs.id=us.segment_id - EOF - ActiveRecord::Base.connection.insert(sql) - - sql=<<-EOF - UPDATE current_segments AS cs, #{db_uqs} AS us - SET cs.timestamp=#{db_now},cs.visible=0,cs.user_id=#{uid} - WHERE cs.id=us.segment_id - EOF - ActiveRecord::Base.connection.update(sql) + way=way.to_i + 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 unused nodes + # - delete any otherwise unused nodes - createuniquenodes(db_uqs,db_uqn) + createuniquenodes(way,db_uqn,[]) - sql=<<-EOF - INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible) - SELECT DISTINCT cn.id,cn.latitude,cn.longitude,#{db_now},#{uid},0 - FROM current_nodes AS cn,#{db_uqn} - WHERE cn.id=node_id +# 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) + 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) + ActiveRecord::Base.connection.insert(sql) - sql=<<-EOF + 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) - - ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqs}") - ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}") + ActiveRecord::Base.connection.update(sql) - # - delete way - - ActiveRecord::Base.connection.insert("INSERT INTO ways (id,user_id,timestamp,visible) VALUES (#{way},#{uid},#{db_now},0)") - ActiveRecord::Base.connection.update("UPDATE current_ways SET user_id=#{uid},timestamp=#{db_now},visible=0 WHERE id=#{way}") - ActiveRecord::Base.connection.execute("DELETE FROM current_way_segments WHERE id=#{way}") - ActiveRecord::Base.connection.execute("DELETE FROM current_way_tags WHERE id=#{way}") + deleteuniquenoderelations(db_uqn,uid,db_now) + ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}") + + # - delete way - way + ActiveRecord::Base.connection.insert("INSERT INTO ways (id,user_id,timestamp,visible) VALUES (#{way},#{uid},#{db_now},0)") + ActiveRecord::Base.connection.update("UPDATE current_ways SET user_id=#{uid},timestamp=#{db_now},visible=0 WHERE id=#{way}") + 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) + [0,way] end -# ----- makeway(x,y,baselong,basey,masterscale) -# returns way made from unwayed segments -def makeway(args) - usertoken,x,y,baselong,basey,masterscale=args - uid=getuserid(usertoken) - return if !uid - points=[] - toreverse=[] # segments to reverse - nodesused={} # so we don't go over the same node twice +# ==================================================================== +# Support functions for remote calls - # - find start point near x - - xc=coord2long(x,masterscale,baselong) - yc=coord2lat(y,masterscale,basey) +def readwayquery(id) + ActiveRecord::Base.connection.select_all "SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,current_nodes.id,tags "+ + " FROM current_way_nodes,current_nodes "+ + " WHERE current_way_nodes.id=#{id} "+ + " AND current_way_nodes.node_id=current_nodes.id "+ + " AND current_nodes.visible=1 "+ + " ORDER BY sequence_id" +end - RAILS_DEFAULT_LOGGER.info(" Message: makeway, xc=#{xc}, y=#{yc}") +def getlastversion(id,version) + row=ActiveRecord::Base.connection.select_one("SELECT version FROM ways WHERE id=#{id} AND visible=1 ORDER BY version DESC LIMIT 1") + row['version'] +end - xs1=xc-0.001; xs2=xc+0.001 - ys1=yc-0.001; ys2=yc+0.001 - - sql=<<-EOF - SELECT cn1.latitude AS lat1,cn1.longitude AS lon1,cn1.id AS id1, - cn2.latitude AS lat2,cn2.longitude AS lon2,cn2.id AS id2, cs.id AS segid - FROM current_nodes AS cn1, - current_nodes AS cn2, - current_segments AS cs - LEFT OUTER JOIN current_way_segments ON segment_id=cs.id - WHERE (cn1.longitude BETWEEN #{xs1} AND #{xs2}) - AND (cn1.latitude BETWEEN #{ys1} AND #{ys2}) - AND segment_id IS NULL - AND cs.visible=1 - AND cn1.id=node_a AND cn1.visible=1 - AND cn2.id=node_b AND cn2.visible=1 - ORDER BY SQRT(POW(cn1.longitude-#{xc},2)+ - POW(cn1.latitude -#{yc},2)) - LIMIT 1 - EOF - row=ActiveRecord::Base.connection.select_one sql - if row.nil? then return [0,0,0,0,0] end - xs1=long2coord(row['lon1'].to_f,baselong,masterscale); ys1=lat2coord(row['lat1'].to_f,basey,masterscale) - xs2=long2coord(row['lon2'].to_f,baselong,masterscale); ys2=lat2coord(row['lat2'].to_f,basey,masterscale) - xmin=[xs1,xs2].min; xmax=[xs1,xs2].max - ymin=[ys1,ys2].min; ymax=[ys1,ys2].max - nodesused[row['id1'].to_i]=true - nodesused[row['id2'].to_i]=true - points<<[xs1,ys1,row['id1'].to_i,1,{},0] - points<<[xs2,ys2,row['id2'].to_i,1,{},row['segid'].to_i] - - # - extend at start, then end - while (a,point,nodesused,toreverse=findconnect(points[0][2],nodesused,'b',toreverse,baselong,basey,masterscale))[0] - points[0][5]=point[5]; point[5]=0 # segment leads to next node - points.unshift(point) - xmin=[point[0],xmin].min; xmax=[point[0],xmax].max - ymin=[point[1],ymin].min; ymax=[point[1],ymax].max - end - while (a,point,nodesused,toreverse=findconnect(points[-1][2],nodesused,'a',toreverse,baselong,basey,masterscale))[0] - points.push(point) - xmin=[point[0],xmin].min; xmax=[point[0],xmax].max - ymin=[point[1],ymin].min; ymax=[point[1],ymax].max - end - points[0][3]=0 # start with a move - - # reverse segments in toreverse - if toreverse.length>0 - sql=<<-EOF - UPDATE current_segments c1, current_segments c2 - SET c1.node_a=c2.node_b,c1.node_b=c2.node_a, - c1.timestamp=NOW(),c1.user_id=#{uid} - WHERE c1.id=c2.id - AND c1.id IN (#{toreverse.join(',')}) - EOF - ActiveRecord::Base.connection.update sql - sql=<<-EOF - INSERT INTO segments - (SELECT * FROM current_segments - WHERE id IN (#{toreverse.join(',')})) - EOF - ActiveRecord::Base.connection.insert sql - end +def readwayquery_old(id,version,historic) + # 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 - [points,xmin,xmax,ymin,ymax] + 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, + # and use this (though with a new id) if it differs from the current one + 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 + 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 + rows[i]['longitude']=nx + rows[i]['latitude' ]=ny + rows[i]['tags' ]=row['tags'] + end + end + end + rows end -def findconnect(id,nodesused,lookfor,toreverse,baselong,basey,masterscale) - # get all segments with 'id' as a point - # (to look for both node_a and node_b, UNION is faster than node_a=id OR node_b=id)! +def createuniquenodes(way,uqn_name,nodelist) + # Find nodes which appear in this way but no others sql=<<-EOF - SELECT cn1.latitude AS lat1,cn1.longitude AS lon1,cn1.id AS id1, - cn2.latitude AS lat2,cn2.longitude AS lon2,cn2.id AS id2, cs.id AS segid - FROM current_nodes AS cn1, - current_nodes AS cn2, - current_segments AS cs - LEFT OUTER JOIN current_way_segments ON segment_id=cs.id - WHERE segment_id IS NULL - AND cs.visible=1 - AND cn1.id=node_a AND cn1.visible=1 - AND cn2.id=node_b AND cn2.visible=1 - AND node_a=#{id} - UNION - SELECT cn1.latitude AS lat1,cn1.longitude AS lon1,cn1.id AS id1, - cn2.latitude AS lat2,cn2.longitude AS lon2,cn2.id AS id2, cs.id AS segid - FROM current_nodes AS cn1, - current_nodes AS cn2, - current_segments AS cs - LEFT OUTER JOIN current_way_segments ON segment_id=cs.id - WHERE segment_id IS NULL - AND cs.visible=1 - AND cn1.id=node_a AND cn1.visible=1 - AND cn2.id=node_b AND cn2.visible=1 - AND node_b=#{id} + 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 - connectlist=ActiveRecord::Base.connection.select_all sql - - if lookfor=='b' then tocol='id1'; tolat='lat1'; tolon='lon1'; fromcol='id2'; fromlat='lat2'; fromlon='lon2' - else tocol='id2'; tolat='lat2'; tolon='lon2'; fromcol='id1'; fromlat='lat1'; fromlon='lon1' - end - - # eliminate those already in the hash - connex=0 - point=nil - connectlist.each { |row| - tonode=row[tocol].to_i - fromnode=row[fromcol].to_i - if id==tonode and !nodesused.has_key?(fromnode) - # wrong way round; add, then add to 'segments to reverse' list - connex+=1 - nodesused[fromnode]=true - point=[long2coord(row[fromlon].to_f,baselong,masterscale),lat2coord(row[fromlat].to_f,basey,masterscale),fromnode,1,{},row['segid'].to_i] - toreverse.push(row['segid'].to_i) - elsif id==fromnode and !nodesused.has_key?(tonode) - # right way round; just add - connex+=1 - point=[long2coord(row[tolon].to_f,baselong,masterscale),lat2coord(row[tolat].to_f,basey,masterscale),tonode,1,{},row['segid'].to_i] - nodesused[tonode]=true - end - } - - # if only one left, then add it; otherwise return false - if connex!=1 or point.nil? then - return [false,[],nodesused,toreverse] - else - return [true,point,nodesused,toreverse] + unless nodelist.empty? then + sql+="AND a.node_id NOT IN ("+nodelist.join(',')+")" end + ActiveRecord::Base.connection.execute(sql) end + # ==================================================================== -# Support functions for remote calls +# Relations handling +# deleteuniquenoderelations(uqn_name,uid,db_now) +# deleteitemrelations(way|node,'way'|'node',uid,db_now) -def readwayquery(id) - ActiveRecord::Base.connection.select_all "SELECT n1.latitude AS lat1,n1.longitude AS long1,n1.id AS id1,n1.tags as tags1, "+ - " n2.latitude AS lat2,n2.longitude AS long2,n2.id AS id2,n2.tags as tags2,segment_id "+ - " FROM current_way_segments,current_segments,current_nodes AS n1,current_nodes AS n2 "+ - " WHERE current_way_segments.id=#{id} "+ - " AND segment_id=current_segments.id "+ - " AND current_segments.visible=1 "+ - " AND n1.id=node_a and n2.id=node_b "+ - " AND n1.visible=1 AND n2.visible=1 "+ - " ORDER BY sequence_id" -end +def deleteuniquenoderelations(uqn_name,uid,db_now) + 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 -def createuniquesegments(way,uqs_name,seglist) - # Finds segments which appear in (previous version of) this way and no other - sql=<<-EOF - CREATE TEMPORARY TABLE #{uqs_name} - SELECT a.segment_id - FROM (SELECT DISTINCT segment_id FROM current_way_segments - WHERE id = #{way}) a - LEFT JOIN current_way_segments b - ON b.segment_id = a.segment_id - AND b.id != #{way} - WHERE b.segment_id IS NULL - EOF - if (seglist!='') then sql+=" AND a.segment_id NOT IN (#{seglist})" end - ActiveRecord::Base.connection.execute(sql) + relnodes=ActiveRecord::Base.connection.select_all(sql) + relnodes.each do |a| + removefromrelation(a['node_id'],'node',a['id'],uid,db_now) + end end -def createuniquenodes(uqs_name,uqn_name) - # Finds nodes which appear in uniquesegments but no other segments +def deleteitemrelations(objid,type,uid,db_now) sql=<<-EOF - CREATE TEMPORARY TABLE #{uqn_name} - SELECT DISTINCT node_id - FROM (SELECT cn.id AS node_id - FROM current_nodes AS cn, - current_segments AS cs, - #{uqs_name} AS us - WHERE cs.id=us.segment_id - AND cn.id=cs.node_a) AS n - LEFT JOIN current_segments AS cs2 ON node_id=cs2.node_a AND cs2.visible=1 - LEFT JOIN current_segments AS cs3 ON node_id=cs3.node_b AND cs3.visible=1 - WHERE cs2.node_a IS NULL - AND cs3.node_b IS NULL + 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 - ActiveRecord::Base.connection.execute(sql) - sql=<<-EOF - INSERT INTO #{uqn_name} - SELECT DISTINCT node_id - FROM (SELECT cn.id AS node_id - FROM current_nodes AS cn, - current_segments AS cs, - #{uqs_name} AS us - WHERE cs.id=us.segment_id - AND cn.id=cs.node_b) AS n - LEFT JOIN current_segments AS cs2 ON node_id=cs2.node_a AND cs2.visible=1 - LEFT JOIN current_segments AS cs3 ON node_id=cs3.node_b AND cs3.visible=1 - WHERE cs2.node_a IS NULL - AND cs3.node_b IS NULL + + relways=ActiveRecord::Base.connection.select_all(sql) + relways.each do |a| + removefromrelation(objid,type,a['id'],uid,db_now) + end +end + +def removefromrelation(objid,type,relation,uid,db_now) + 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.execute(sql) + 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 + def sqlescape(a) - a.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('#%','=')]=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('=','===')+'='+v.gsub(';',';;;').gsub('=','===') + tags << [k.gsub('|',':'), v] end - str + return Tags.join(tags) end def getuserid(token) @@ -882,16 +878,16 @@ end def getvalue(s) case s.getc - when 0; return getdouble(s) # number - when 1; return s.getc # boolean - when 2; return getstring(s) # string - when 3; return getobject(s) # object/hash - when 5; return nil # null - when 6; return nil # undefined - when 8; s.read(4) # mixedArray - return getobject(s) # | - when 10; return getarray(s) # array - else; return nil # error + when 0; return getdouble(s) # number + when 1; return s.getc # boolean + when 2; return getstring(s) # string + when 3; return getobject(s) # object/hash + when 5; return nil # null + when 6; return nil # undefined + when 8; s.read(4) # mixedArray + return getobject(s) # | + when 10;return getarray(s) # array + else; return nil # error end end