X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/88f469eec179d587f9539dd4b99032b847fc16f8..06a17b6bc649daeada37e13d737816cd3d677640:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 54f8382ea..d989a5e90 100644
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,6 +1,5 @@
 class SwfController < ApplicationController
-	session :off
-	before_filter :check_read_availability
+	before_filter :check_api_readable
 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
@@ -24,6 +23,7 @@ class SwfController < ApplicationController
 		xmax=params['xmax'].to_f;
 		ymin=params['ymin'].to_f;
 		ymax=params['ymax'].to_f;
+		start=params['start'].to_i;
 	
 		# -	Begin movie
 	
@@ -33,7 +33,7 @@ class SwfController < ApplicationController
 		bounds_top   =240*20
 
 		m =''
-		m+=swfRecord(9,255.chr + 155.chr + 155.chr)			#ÊBackground
+		m+=swfRecord(9,255.chr + 155.chr + 155.chr)			# Background
 		absx=0
 		absy=0
 		xl=yb= 9999999
@@ -43,25 +43,27 @@ class SwfController < ApplicationController
 	
 		b=''
 		lasttime=0
-		lastfile='-1'
+		lasttrack=lastfile='-1'
 	
 		if 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,UNIX_TIMESTAMP(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 "+
 			   "WHERE gpx_files.id=gpx_id "+
 			   "  AND gpx_files.user_id=#{user.id} "+
 			   "  AND "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
 			   "  AND (gps_points.timestamp IS NOT NULL) "+
 			   "ORDER BY fileid DESC,ts "+
-			   "LIMIT 10000"
+			   "LIMIT 10000 OFFSET #{start}"
 		  else
-			sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(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 "+
 				 "WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
 				 "  AND (gps_points.timestamp IS NOT NULL) "+
 				 "ORDER BY fileid DESC,ts "+
-				 "LIMIT 10000"
+				 "LIMIT 10000 OFFSET #{start}"
 		end
 		gpslist=ActiveRecord::Base.connection.select_all sql
 	
@@ -73,7 +75,7 @@ class SwfController < ApplicationController
 			ys=(lat2coord(row['lat'].to_f ,basey   ,masterscale)*20).floor
 			xl=[xs,xl].min; xr=[xs,xr].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)
 			else
 				b+=startAndMove(xs,ys,'01')
@@ -81,6 +83,7 @@ class SwfController < ApplicationController
 			absx=xs.floor; absy=ys.floor
 			lasttime=row['ts'].to_i
 			lastfile=row['fileid']
+			lasttrack=row['trackid']
 			while b.length>80 do
 				r+=[b.slice!(0...80)].pack("B*")
 			end
@@ -117,8 +120,8 @@ class SwfController < ApplicationController
 	def startShape
 		s =0.chr										# No fill styles
 		s+=2.chr										# Two line styles
-		s+=packUI16(5) + 0.chr + 255.chr + 255.chr		# Width 5, RGB #00FFFF
-		s+=packUI16(5) + 255.chr + 0.chr + 255.chr		# Width 5, RGB #FF00FF
+		s+=packUI16(0) + 0.chr + 255.chr + 255.chr		# Width 5, RGB #00FFFF
+		s+=packUI16(0) + 255.chr + 0.chr + 255.chr		# Width 5, RGB #FF00FF
 		s+=34.chr										# 2 fill, 2 line index bits
 		s
 	end