X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e70d94c54a3c449bc12e99d0f3a01a3ef20fc0ab..60e990790db098193291b1b99ef1fb9a6fab23df:/app/controllers/swf_controller.rb?ds=sidebyside

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 4e7e1c8ee..33e2ee4a6 100644
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -46,12 +46,11 @@ class SwfController < ApplicationController
 		lastfile='-1'
 	
 		if params['token']
-			token=sqlescape(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 "+
-				 " FROM gpx_files,gps_points,users "+
+				 " FROM gpx_files,gps_points "+
 				 "WHERE gpx_files.id=gpx_id "+
-				 "  AND gpx_files.user_id=users.id "+
-				 "  AND token='#{token}' "+
+				 "  AND gpx_files.user_id=#{user.id} "+
 				 "  AND (gps_points.longitude BETWEEN #{xminr} AND #{xmaxr}) "+
 				 "  AND (gps_points.latitude BETWEEN #{yminr} AND #{ymaxr}) "+
 				 "  AND (gps_points.timestamp IS NOT NULL) "+
@@ -95,7 +94,7 @@ class SwfController < ApplicationController
 			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"+
+				"       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})"+