X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6efdcaa9930bd2e392294304095ae31a91b8c4ab..1ffb5c1502d870a1d1c46648ea0c165e25dfbef9:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 4c4392b4e..a96e71d05 100644
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,4 +1,6 @@
 class SwfController < ApplicationController
+	session :off
+	before_filter :check_read_availability
 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
@@ -18,10 +20,10 @@ class SwfController < ApplicationController
 		basey		=params['basey'].to_f
 		masterscale	=params['masterscale'].to_f
 	
-		xmin=params['xmin'].to_f/0.000001
-		xmax=params['xmax'].to_f/0.000001
-		ymin=params['ymin'].to_f/0.000001
-		ymax=params['ymax'].to_f/0.000001
+		xmin=params['xmin'].to_f;
+		xmax=params['xmax'].to_f;
+		ymin=params['ymin'].to_f;
+		ymax=params['ymax'].to_f;
 	
 		# -	Begin movie
 	
@@ -37,36 +39,33 @@ class SwfController < ApplicationController
 		xl=yb= 9999999
 		xr=yt=-9999999
 	
-		# -	Send SQL and draw line
+		# -	Send SQL for GPS tracks
 	
 		b=''
 		lasttime=0
 		lastfile='-1'
 	
 		if params['token']
-			token=sqlescape(params['token'])
-			sql="SELECT gps_points.latitude*0.000001 AS lat,gps_points.longitude*0.000001 AS lon,gpx_files.id AS fileid,UNIX_TIMESTAMP(gps_points.timestamp) AS ts "+
-				 " FROM gpx_files,gps_points,users "+
-				 "WHERE gpx_files.id=gpx_id "+
-				 "  AND gpx_files.user_id=users.id "+
-				 "  AND token='#{token}' "+
-				 "  AND (gps_points.longitude BETWEEN #{xmin} AND #{xmax}) "+
-				 "  AND (gps_points.latitude BETWEEN #{ymin} AND #{ymax}) "+
-				 "  AND (gps_points.timestamp IS NOT NULL) "+
-				 "ORDER BY fileid DESC,ts "+
-				 "LIMIT 10000"
-		else
-			sql="SELECT latitude*0.000001 AS lat,longitude*0.000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(timestamp) AS ts "+
+		  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 "+
+			   " 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"
+		  else
+			sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(timestamp) AS ts "+
 				 " FROM gps_points "+
-				 "WHERE (longitude BETWEEN #{xmin} AND #{xmax}) "+
-				 "  AND (latitude  BETWEEN #{ymin} AND #{ymax}) "+
+				 "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"
 		end
 		gpslist=ActiveRecord::Base.connection.select_all sql
 	
-		# - Draw lines
+		# - Draw GPS trace lines
 	
 		r=startShape()
 		gpslist.each do |row|
@@ -74,10 +73,10 @@ 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)
+			if (row['ts'].to_i-lasttime<180 and row['fileid']==lastfile and row['ts'].to_i!=lasttime)
 				b+=drawTo(absx,absy,xs,ys)
 			else
-				b+=startAndMove(xs,ys)
+				b+=startAndMove(xs,ys,'01')
 			end
 			absx=xs.floor; absy=ys.floor
 			lasttime=row['ts'].to_i
@@ -86,6 +85,8 @@ class SwfController < ApplicationController
 				r+=[b.slice!(0...80)].pack("B*")
 			end
 		end
+		
+		#   (Unwayed segments removed)
 	
 		# - Write shape
 	
@@ -102,8 +103,7 @@ class SwfController < ApplicationController
 		m=packRect(bounds_left,bounds_right,bounds_bottom,bounds_top) + 0.chr + 12.chr + packUI16(1) + m
 		m='FWS' + 6.chr + packUI32(m.length+8) + m
 	
-		response.headers["Content-Type"]="application/x-shockwave-flash"
-		render :text=>m
+		render :text => m, :content_type => "application/x-shockwave-flash"
 	end
 
 	private
@@ -116,9 +116,10 @@ class SwfController < ApplicationController
 
 	def startShape
 		s =0.chr										# No fill styles
-		s+=1.chr										# One line style
-		s+=packUI16(5) + 0.chr + 255.chr + 255.chr		# Width 5, RGB #00FFFF
-		s+=17.chr										# 1 fill, 1 line index bit
+		s+=2.chr										# Two line styles
+		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
 	
@@ -126,11 +127,11 @@ class SwfController < ApplicationController
 		'000000'
 	end
 	
-	def startAndMove(x,y)
+	def startAndMove(x,y,col)
 		d='001001'										# Line style change, moveTo
 		l =[lengthSB(x),lengthSB(y)].max
 		d+=sprintf("%05b%0#{l}b%0#{l}b",l,x,y)
-		d+='1'											# Select line style 1
+		d+=col											# Select line style
 	end
 	
 	def drawTo(absx,absy,x,y)
@@ -186,11 +187,11 @@ class SwfController < ApplicationController
 	# (this is duplicated from amf_controller, should probably share)
 	
 	def lat2coord(a,basey,masterscale)
-		-(lat2y(a)-basey)*masterscale+250
+		-(lat2y(a)-basey)*masterscale
 	end
 	
 	def long2coord(a,baselong,masterscale)
-		(a-baselong)*masterscale+350
+		(a-baselong)*masterscale
 	end
 	
 	def lat2y(a)