X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e70d94c54a3c449bc12e99d0f3a01a3ef20fc0ab..88f469eec179d587f9539dd4b99032b847fc16f8:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 4e7e1c8ee..54f8382ea 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_availability
+	before_filter :check_read_availability
 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
@@ -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
 	
@@ -46,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 "+
-				 "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 (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 "+
+		  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 (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"
@@ -76,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')
@@ -89,42 +86,7 @@ class SwfController < ApplicationController
 			end
 		end
 		
-		# - 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 "+
-				"  FROM current_segments "+
-				"       LEFT OUTER JOIN current_way_segments"+
-				"       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})"+
-				"   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
-			
-			seglist.each do |row|
-				xs1=(long2coord(row['lon1'].to_f,baselong,masterscale)*20).floor; ys1=(lat2coord(row['lat1'].to_f,basey,masterscale)*20).floor
-				xs2=(long2coord(row['lon2'].to_f,baselong,masterscale)*20).floor; ys2=(lat2coord(row['lat2'].to_f,basey,masterscale)*20).floor
-				if (xs1==absx and ys1==absy)
-					b+=drawTo(absx,absy,xs2,ys2)
-					absx=xs2; absy=ys2
-				elsif (xs2==absx and ys2==absy)
-					b+=drawTo(absx,absy,xs1,ys1)
-					absx=xs1; absy=ys1
-				else
-					b+=startAndMove(xs1,ys1,'10')
-					b+=drawTo(xs1,ys1,xs2,ys2)
-					absx=xs2; absy=ys2
-				end
-				while b.length>80 do
-					r+=[b.slice!(0...80)].pack("B*")
-				end
-			end
-		end
+		#   (Unwayed segments removed)
 	
 		# - Write shape
 	
@@ -225,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)