X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6d44c78407ea9a553be030f3f7c49b48d616878b..cfbdd3f7e1c688e2c875ded9fd847fcc1c3a4caf:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 33e2ee4a6..6b29d1535 100644
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -20,10 +20,10 @@ class SwfController < ApplicationController
 		basey		=params['basey'].to_f
 		masterscale	=params['masterscale'].to_f
 	
-		xmin=params['xmin'].to_f; xminr=xmin/0.000001
-		xmax=params['xmax'].to_f; xmaxr=xmax/0.000001
-		ymin=params['ymin'].to_f; yminr=ymin/0.000001
-		ymax=params['ymax'].to_f; ymaxr=ymax/0.000001
+		xmin=params['xmin'].to_f;
+		xmax=params['xmax'].to_f;
+		ymin=params['ymin'].to_f;
+		ymax=params['ymax'].to_f;
 	
 		# -	Begin movie
 	
@@ -47,20 +47,18 @@ class SwfController < ApplicationController
 	
 		if params['token']
                         user=User.authenticate(:token => 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 "+
+			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 (gps_points.longitude BETWEEN #{xminr} AND #{xmaxr}) "+
-				 "  AND (gps_points.latitude BETWEEN #{yminr} AND #{ymaxr}) "+
+				 "  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.000001 AS lat,longitude*0.000001 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,UNIX_TIMESTAMP(timestamp) AS ts "+
 				 " FROM gps_points "+
-				 "WHERE (longitude BETWEEN #{xminr} AND #{xmaxr}) "+
-				 "  AND (latitude  BETWEEN #{yminr} AND #{ymaxr}) "+
+				 "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"