Dropping duplicate GPS points is very expensive and rarely finds

[rails.git] / app / controllers / swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 4e7e1c8ee85b601ce5fc5954f030eed14e984d2a..b576aae5c7c3242faba92f2fb7b5aa9d962a1be0 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -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'])
+                        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 (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)+
                                 "  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 "+
                                 " FROM gps_points "+
-                                "WHERE (longitude BETWEEN #{xminr} AND #{xmaxr}) "+
-                                "  AND (latitude  BETWEEN #{yminr} AND #{ymaxr}) "+
+                                "WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax)+
                                 "  AND (gps_points.timestamp IS NOT NULL) "+
                                 "ORDER BY fileid DESC,ts "+
                                 "LIMIT 10000"