Potlatch 0.4 (hopefully)
This commit is contained in:
Richard Fairhurst
parent
e8dbe46f7e
commit
d626256bc2
3 changed files with 165 additions and 380 deletions
|
|
@ -13,7 +13,8 @@ class AmfController < ApplicationController
|
|||
# ---- talk process AMF request
|
||||
|
||||
def talk
|
||||
req=StringIO.new(request.raw_post) # Get POST data as request
|
||||
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
|
||||
|
||||
|
|
@ -42,7 +43,6 @@ class AmfController < ApplicationController
|
|||
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))
|
||||
end
|
||||
|
|
@ -94,8 +94,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
|
||||
|
|
@ -126,8 +127,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 +156,7 @@ viaduct: railway=viaduct
|
|||
level crossing: railway=crossing
|
||||
|
||||
point/natural
|
||||
peak: point=peak
|
||||
peak: natural=peak
|
||||
|
||||
POI/road
|
||||
car park: amenity=parking
|
||||
|
|
@ -221,23 +222,21 @@ EOF
|
|||
|
||||
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 "+
|
||||
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 id's
|
||||
|
||||
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 "+
|
||||
" 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 cs1.id IS NULL AND cs2.id IS NULL "+
|
||||
" AND cwn.id IS NULL "+
|
||||
" AND current_nodes.visible=1")
|
||||
|
||||
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
|
||||
|
|
@ -260,20 +259,16 @@ EOF
|
|||
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
|
||||
|
|
@ -284,10 +279,11 @@ EOF
|
|||
# xmin,xmax,ymin,ymax
|
||||
|
||||
def putway(args)
|
||||
RAILS_DEFAULT_LOGGER.info(" putway started")
|
||||
usertoken,originalway,points,attributes,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
|
||||
RAILS_DEFAULT_LOGGER.info(" putway authenticated happily")
|
||||
db_uqn='unin'+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # temp uniquenodes table name, typically 51 chars
|
||||
db_now='@now'+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s # 'now' variable name, typically 51 chars
|
||||
ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
|
||||
|
|
@ -297,13 +293,14 @@ EOF
|
|||
|
||||
# -- 3. read original way into memory
|
||||
|
||||
xc={}; yc={}; tagc={}; seg={}
|
||||
xc={}; yc={}; tagc={}
|
||||
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
|
||||
id=row['id'].to_i
|
||||
xc[id]=row['longitude'].to_f
|
||||
yc[id]=row['latitude' ].to_f
|
||||
tagc[id]=row['tags']
|
||||
}
|
||||
ActiveRecord::Base.connection.update("UPDATE current_ways SET timestamp=#{db_now},user_id=#{uid},visible=1 WHERE id=#{way}")
|
||||
else
|
||||
|
|
@ -320,6 +317,7 @@ EOF
|
|||
xmax=ymax=-999999
|
||||
insertsql=''
|
||||
renumberednodes={}
|
||||
nodelist=[]
|
||||
|
||||
points.each_index do |i|
|
||||
xs=coord2long(points[i][0],masterscale,baselong)
|
||||
|
|
@ -328,7 +326,6 @@ EOF
|
|||
ymin=[ys,ymin].min; ymax=[ys,ymax].max
|
||||
node=points[i][2].to_i
|
||||
tagstr=array2tag(points[i][4])
|
||||
tagstr=tagstr.gsub(/[\000-\037]/,"")
|
||||
tagsql="'"+sqlescape(tagstr)+"'"
|
||||
lat=(ys * 10000000).round
|
||||
long=(xs * 10000000).round
|
||||
|
|
@ -341,14 +338,16 @@ EOF
|
|||
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!=xc[node] or ys!=yc[node] or tagstr!=tagc[node])
|
||||
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,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
|
||||
|
|
@ -358,58 +357,9 @@ EOF
|
|||
end
|
||||
|
||||
|
||||
# -- 6.i compare segments
|
||||
# -- 6a. delete any nodes not in modified way
|
||||
|
||||
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
|
||||
|
||||
createuniquesegments(way,db_uqs,seglist) # segments which appear in this way but no other
|
||||
|
||||
# delete segments from uniquesegments (and not in modified way)
|
||||
|
||||
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
|
||||
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)
|
||||
|
|
@ -426,26 +376,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 +405,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]
|
||||
[originalway,way,renumberednodes,xmin,xmax,ymin,ymax]
|
||||
end
|
||||
|
||||
# ----- putpoi (user token, id, x,y,tag array,visible,baselong,basey,masterscale)
|
||||
|
|
@ -483,6 +430,13 @@ EOF
|
|||
|
||||
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 [id,id] end # should really return an error
|
||||
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))+"'"
|
||||
|
|
@ -515,43 +469,28 @@ EOF
|
|||
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
|
||||
usertoken,way,preserve=args
|
||||
|
||||
RAILS_DEFAULT_LOGGER.info(" Message: deleteway, id=#{way}")
|
||||
|
||||
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
|
||||
# - delete any otherwise unused nodes
|
||||
|
||||
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)
|
||||
createuniquenodes(way,db_uqn,[])
|
||||
|
||||
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)
|
||||
|
||||
# - delete any unused nodes
|
||||
|
||||
createuniquenodes(db_uqs,db_uqn)
|
||||
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)
|
||||
|
|
@ -568,233 +507,113 @@ 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}")
|
||||
|
||||
# - 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_nodes WHERE id=#{way}")
|
||||
ActiveRecord::Base.connection.execute("DELETE FROM current_way_tags WHERE id=#{way}")
|
||||
|
||||
deleteitemrelations(way,'way',uid,db_now)
|
||||
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
|
||||
|
||||
# - find start point near x
|
||||
|
||||
xc=coord2long(x,masterscale,baselong)
|
||||
yc=coord2lat(y,masterscale,basey)
|
||||
|
||||
RAILS_DEFAULT_LOGGER.info(" Message: makeway, xc=#{xc}, y=#{yc}")
|
||||
|
||||
xs1=xc-0.001; xs2=xc+0.001
|
||||
ys1=yc-0.001; ys2=yc+0.001
|
||||
|
||||
sql=<<-EOF
|
||||
SELECT cn1.latitude*0.0000001 AS lat1,cn1.longitude*0.0000001 AS lon1,cn1.id AS id1,
|
||||
cn2.latitude*0.0000001 AS lat2,cn2.longitude*0.0000001 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 #{OSM.sql_for_area(ys1,xs1,ys2,xs2,"cn1.")}
|
||||
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
|
||||
|
||||
[points,xmin,xmax,ymin,ymax]
|
||||
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)!
|
||||
sql=<<-EOF
|
||||
SELECT cn1.latitude*0.0000001 AS lat1,cn1.longitude*0.0000001 AS lon1,cn1.id AS id1,
|
||||
cn2.latitude*0.0000001 AS lat2,cn2.longitude*0.0000001 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*0.0000001 AS lat1,cn1.longitude*0.0000001 AS lon1,cn1.id AS id1,
|
||||
cn2.latitude*0.0000001 AS lat2,cn2.longitude*0.0000001 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}
|
||||
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]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
# ====================================================================
|
||||
# Support functions for remote calls
|
||||
|
||||
def readwayquery(id)
|
||||
ActiveRecord::Base.connection.select_all "SELECT n1.latitude*0.0000001 AS lat1,n1.longitude*0.0000001 AS long1,n1.id AS id1,n1.tags as tags1, "+
|
||||
" n2.latitude*0.0000001 AS lat2,n2.longitude*0.0000001 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 "+
|
||||
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
|
||||
|
||||
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)
|
||||
end
|
||||
|
||||
def createuniquenodes(uqs_name,uqn_name)
|
||||
# Finds nodes which appear in uniquesegments but no other segments
|
||||
def createuniquenodes(way,uqn_name,nodelist)
|
||||
# Find nodes which appear in this way but no others
|
||||
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
|
||||
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
|
||||
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
|
||||
|
||||
|
||||
|
||||
# ====================================================================
|
||||
# Relations handling
|
||||
# deleteuniquenoderelations(uqn_name,uid,db_now)
|
||||
# deleteitemrelations(way|node,'way'|'node',uid,db_now)
|
||||
|
||||
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
|
||||
|
||||
relnodes=ActiveRecord::Base.connection.select_all(sql)
|
||||
relnodes.each do |a|
|
||||
removefromrelation(a['node_id'],'node',a['id'],uid,db_now)
|
||||
end
|
||||
end
|
||||
|
||||
def deleteitemrelations(objid,type,uid,db_now)
|
||||
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 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.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)
|
||||
|
|
@ -805,7 +624,7 @@ def tag2array(a)
|
|||
k,v=b.split('=')
|
||||
if k.nil? then k='' end
|
||||
if v.nil? then v='' end
|
||||
tags[k.gsub('#%','=')]=v.gsub('#%','=')
|
||||
tags[k.gsub('#%','=').gsub(':','|')]=v.gsub('#%','=')
|
||||
end
|
||||
tags
|
||||
end
|
||||
|
|
@ -816,7 +635,7 @@ def array2tag(a)
|
|||
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('=','===')
|
||||
str+=k.gsub(';',';;;').gsub('=','===').gsub('|',':')+'='+v.gsub(';',';;;').gsub('=','===')
|
||||
end
|
||||
str
|
||||
end
|
||||
|
|
|
|||
|
|
@ -86,41 +86,7 @@ class SwfController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# - Draw unwayed segments
|
||||
|
||||
if params['unwayed']=='true'
|
||||
sql="SELECT cn1.latitude*0.0000001 AS lat1,cn1.longitude*0.0000001 AS lon1,"+
|
||||
" cn2.latitude*0.0000001 AS lat2,cn2.longitude*0.0000001 AS lon2 "+
|
||||
" FROM current_segments "+
|
||||
" LEFT OUTER JOIN current_way_nodes"+
|
||||
" ON segment_id=current_segments.id,"+
|
||||
" current_nodes AS cn1,current_nodes AS cn2"+
|
||||
" WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"cn1.")+
|
||||
" AND segment_id IS NULL"+
|
||||
" AND current_segments.visible=1"+
|
||||
" AND cn1.id=node_a AND cn1.visible=1"+
|
||||
" AND cn2.id=node_b AND cn2.visible=1"
|
||||
seglist=ActiveRecord::Base.connection.select_all sql
|
||||
|
||||
seglist.each do |row|
|
||||
xs1=(long2coord(row['lon1'].to_f,baselong,masterscale)*20).floor; ys1=(lat2coord(row['lat1'].to_f,basey,masterscale)*20).floor
|
||||
xs2=(long2coord(row['lon2'].to_f,baselong,masterscale)*20).floor; ys2=(lat2coord(row['lat2'].to_f,basey,masterscale)*20).floor
|
||||
if (xs1==absx and ys1==absy)
|
||||
b+=drawTo(absx,absy,xs2,ys2)
|
||||
absx=xs2; absy=ys2
|
||||
elsif (xs2==absx and ys2==absy)
|
||||
b+=drawTo(absx,absy,xs1,ys1)
|
||||
absx=xs1; absy=ys1
|
||||
else
|
||||
b+=startAndMove(xs1,ys1,'10')
|
||||
b+=drawTo(xs1,ys1,xs2,ys2)
|
||||
absx=xs2; absy=ys2
|
||||
end
|
||||
while b.length>80 do
|
||||
r+=[b.slice!(0...80)].pack("B*")
|
||||
end
|
||||
end
|
||||
end
|
||||
# (Unwayed segments removed)
|
||||
|
||||
# - Write shape
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue