X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/00f7307824008e6c9d3da1bfa4228f81632888aa..ac8a24e79e4c7cfb94e8d13788f85311ec0bf293:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index cd9bf1823..40969c20f 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; 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
 	
@@ -44,22 +46,19 @@ class SwfController < ApplicationController
 		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 "+
+                        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=users.id "+
-				 "  AND token='#{token}' "+
-				 "  AND (gps_points.longitude BETWEEN #{xminr} AND #{xmaxr}) "+
-				 "  AND (gps_points.latitude BETWEEN #{yminr} AND #{ymaxr}) "+
+				 "  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.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"
@@ -90,15 +89,15 @@ class SwfController < ApplicationController
 		# - Draw unwayed segments
 		
 		if params['unwayed']=='true'
-			sql="SELECT cn1.latitude AS lat1,cn1.longitude AS lon1,"+
-				"		cn2.latitude AS lat2,cn2.longitude AS lon2 "+
+			sql="SELECT cn1.latitude*0.0000001 AS lat1,cn1.longitude*0.0000001 AS lon1,"+
+				"		cn2.latitude*0.0000001 AS lat2,cn2.longitude*0.0000001 AS lon2 "+
 				"  FROM current_segments "+
-				"       LEFT OUTER JOIN current_way_segments"+
+				"       LEFT OUTER JOIN current_way_nodes"+
 				"       ON segment_id=current_segments.id,"+
 				"       current_nodes AS cn1,current_nodes AS cn2"+
-				" WHERE (cn1.longitude BETWEEN #{xmin} AND #{xmax})"+
-				"   AND (cn1.latitude  BETWEEN #{ymin} AND #{ymax})"+
+				" WHERE	"+OSM.sql_for_area(ymin,xmin,ymax,xmax,"cn1.")+
 				"   AND segment_id IS NULL"+
+				"   AND current_segments.visible=1"+
 				"   AND cn1.id=node_a AND cn1.visible=1"+
 				"   AND cn2.id=node_b AND cn2.visible=1"
 			seglist=ActiveRecord::Base.connection.select_all sql
@@ -138,8 +137,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