X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d626256bc2f2798202dbb4656f2f53aab0815f2c..c02c516047f20cdaa8120968e514420f6c2c6034:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 2c9d64548..a96e71d05 100644
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -46,16 +46,16 @@ class SwfController < ApplicationController
 		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 "+
-				 " 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
+		  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 "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
@@ -73,7 +73,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)
+			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,'01')
@@ -117,8 +117,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
@@ -187,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)