X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d469b91e7e1e1c1474c2b1e52838ada3aba158c2..33d32bf7377150a85aa8027bfda3fc70b76f119b:/app/controllers/swf_controller.rb?ds=sidebyside

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 18aa20774..9688af3ef 100644
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,6 +1,6 @@
 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]}")
@@ -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
@@ -46,17 +46,17 @@ 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
-			sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 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,EXTRACT(EPOCH FROM 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,EXTRACT(EPOCH FROM timestamp) AS ts "+
 				 " FROM gps_points "+
 				 "WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
 				 "  AND (gps_points.timestamp IS NOT NULL) "+
@@ -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)