X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/071c3581e94552e5da08a2eed14e9a69e4f87e4f..80903324cfabf9330973b06e68b423f38fc13522:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 10ec815db..5097aa8c3 100644
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -21,10 +21,8 @@ class SwfController < ApplicationController
 		basey		=params['basey'].to_f
 		masterscale	=params['masterscale'].to_f
 	
-		xmin=params['xmin'].to_f;
-		xmax=params['xmax'].to_f;
-		ymin=params['ymin'].to_f;
-		ymax=params['ymax'].to_f;
+		bbox = BoundingBox.new(params['xmin'], params['ymin'],
+		                       params['xmax'], params['ymax'])
 		start=params['start'].to_i;
 	
 		# -	Begin movie
@@ -54,7 +52,7 @@ class SwfController < ApplicationController
 			   " 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 "+OSM.sql_for_area(bbox,"gps_points.")+
 			   "  AND (gps_points.timestamp IS NOT NULL) "+
 			   "ORDER BY fileid DESC,ts "+
 			   "LIMIT 10000 OFFSET #{start}"
@@ -62,7 +60,7 @@ class SwfController < ApplicationController
 			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.")+
+				 "WHERE "+OSM.sql_for_area(bbox,"gps_points.")+
 				 "  AND (gps_points.timestamp IS NOT NULL) "+
 				 "ORDER BY fileid DESC,ts "+
 				 "LIMIT 10000 OFFSET #{start}"