cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply #1824.

Browse source
This commit is contained in:
Richard Fairhurst 2009-05-14 08:38:32 +00:00
parent 7331f82bce
commit add2d223a6
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/swf_controller.rb
View file

@ -43,11 +43,12 @@ class SwfController < ApplicationController
b='' b=''
lasttime=0 lasttime=0
lastfile='-1' lasttrack=lastfile='-1'
if params['token'] if params['token']
user=User.authenticate(:token => params[:token]) user=User.authenticate(:token => params[:token])
sql="SELECT gps_points.latitude*0.0000001 AS lat,gps_points.longitude*0.0000001 AS lon,gpx_files.id AS fileid,EXTRACT(EPOCH FROM gps_points.timestamp) AS ts "+ sql="SELECT gps_points.latitude*0.0000001 AS lat,gps_points.longitude*0.0000001 AS lon,gpx_files.id AS fileid,"+
" EXTRACT(EPOCH FROM gps_points.timestamp) AS ts, gps_points.trackid AS trackid "+
" FROM gpx_files,gps_points "+ " FROM gpx_files,gps_points "+
"WHERE gpx_files.id=gpx_id "+ "WHERE gpx_files.id=gpx_id "+
" AND gpx_files.user_id=#{user.id} "+ " AND gpx_files.user_id=#{user.id} "+
@ -56,7 +57,8 @@ class SwfController < ApplicationController
"ORDER BY fileid DESC,ts "+ "ORDER BY fileid DESC,ts "+
"LIMIT 10000" "LIMIT 10000"
else else
sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,EXTRACT(EPOCH FROM timestamp) AS ts "+ sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,"+
" EXTRACT(EPOCH FROM timestamp) AS ts, gps_points.trackid AS trackid "+
" FROM gps_points "+ " FROM gps_points "+
"WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+ "WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
" AND (gps_points.timestamp IS NOT NULL) "+ " AND (gps_points.timestamp IS NOT NULL) "+
@ -73,7 +75,7 @@ class SwfController < ApplicationController
ys=(lat2coord(row['lat'].to_f ,basey ,masterscale)*20).floor ys=(lat2coord(row['lat'].to_f ,basey ,masterscale)*20).floor
xl=[xs,xl].min; xr=[xs,xr].max xl=[xs,xl].min; xr=[xs,xr].max
yb=[ys,yb].min; yt=[ys,yt].max yb=[ys,yb].min; yt=[ys,yt].max
if (row['ts'].to_i-lasttime<180 and row['fileid']==lastfile and row['ts'].to_i!=lasttime) if (row['ts'].to_i-lasttime<180 and row['fileid']==lastfile and row['trackid']==lasttrack and row['ts'].to_i!=lasttime)
b+=drawTo(absx,absy,xs,ys) b+=drawTo(absx,absy,xs,ys)
else else
b+=startAndMove(xs,ys,'01') b+=startAndMove(xs,ys,'01')
@ -81,6 +83,7 @@ class SwfController < ApplicationController
absx=xs.floor; absy=ys.floor absx=xs.floor; absy=ys.floor
lasttime=row['ts'].to_i lasttime=row['ts'].to_i
lastfile=row['fileid'] lastfile=row['fileid']
lasttrack=row['trackid']
while b.length>80 do while b.length>80 do
r+=[b.slice!(0...80)].pack("B*") r+=[b.slice!(0...80)].pack("B*")
end end