We don't need the @notice hack - we can use flash.now to achieve the same thing.

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

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 6400bd1fb0bb4ae6fbe081a44b67378ca551cadd..d989a5e909f4462470e66e1a578ec9e1ba71b259 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,5 +1,4 @@
 class SwfController < ApplicationController
 class SwfController < ApplicationController

-       session :off

        before_filter :check_api_readable
 
 # to log:
        before_filter :check_api_readable
 
 # to log:


@@ -24,6 +23,7 @@ class SwfController < ApplicationController
                xmax=params['xmax'].to_f;
                ymin=params['ymin'].to_f;
                ymax=params['ymax'].to_f;
                xmax=params['xmax'].to_f;
                ymin=params['ymin'].to_f;
                ymax=params['ymax'].to_f;

+               start=params['start'].to_i;

        
                # -     Begin movie
        
        
                # -     Begin movie
        


@@ -55,7 +55,7 @@ class SwfController < ApplicationController
                           "  AND "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
                           "  AND (gps_points.timestamp IS NOT NULL) "+
                           "ORDER BY fileid DESC,ts "+
                           "  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"
+                          "LIMIT 10000 OFFSET #{start}"

                  else
                        sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,"+
                             "      EXTRACT(EPOCH FROM timestamp) AS ts, gps_points.trackid AS trackid "+
                  else
                        sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,"+
                             "      EXTRACT(EPOCH FROM timestamp) AS ts, gps_points.trackid AS trackid "+


@@ -63,7 +63,7 @@ class SwfController < ApplicationController
                                 "WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
                                 "  AND (gps_points.timestamp IS NOT NULL) "+
                                 "ORDER BY fileid DESC,ts "+
                                 "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"
+                                "LIMIT 10000 OFFSET #{start}"

                end
                gpslist=ActiveRecord::Base.connection.select_all sql
        
                end
                gpslist=ActiveRecord::Base.connection.select_all sql