X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/042388418411da6facdfe6ae590df6c17f85e88c..418b315ea57e34bd4f0ef43247163f20b8ebaa00:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index b576aae5c..628a95e06 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]}")
@@ -47,18 +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 "+OSM.sql_for_area(ymin,xmin,ymax,xmax)+
+				 "  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 "+OSM.sql_for_area(ymin,xmin,ymax,xmax)+
+				 "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"
@@ -95,8 +95,7 @@ class SwfController < ApplicationController
 				"       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})"+
+				" 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"+