Set method and action on the search box to something that works so that

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

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 182fb8c549f934291c87f457dd4b069ae24e092a..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
        


@@ -33,7 +33,7 @@ class SwfController < ApplicationController
                bounds_top   =240*20
 
                m =''
                bounds_top   =240*20
 
                m =''

-               m+=swfRecord(9,255.chr + 155.chr + 155.chr)                     #ÊBackground
+               m+=swfRecord(9,255.chr + 155.chr + 155.chr)                     # Background

                absx=0
                absy=0
                xl=yb= 9999999
                absx=0
                absy=0
                xl=yb= 9999999


@@ -43,25 +43,27 @@ class SwfController < ApplicationController
        
                b=''
                lasttime=0
        
                b=''
                lasttime=0

-               lastfile='-1'
+               lasttrack=lastfile='-1'

        
                if params['token']
                  user=User.authenticate(:token => params[:token])
        
                if params['token']
                  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 "+
+                 sql="SELECT gps_points.latitude*0.0000001 AS lat,gps_points.longitude*0.0000001 AS lon,gpx_files.id AS fileid,"+
+                      "      EXTRACT(EPOCH FROM gps_points.timestamp) AS ts, gps_points.trackid AS trackid "+

                           " 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 "+
                           " 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"
+                          "LIMIT 10000 OFFSET #{start}"

                  else
                  else

-                       sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 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,"+
+                            "      EXTRACT(EPOCH FROM timestamp) AS ts, gps_points.trackid AS trackid "+

                                 " FROM gps_points "+
                                 "WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
                                 "  AND (gps_points.timestamp IS NOT NULL) "+
                                 "ORDER BY fileid DESC,ts "+
                                 " FROM gps_points "+
                                 "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
        


@@ -73,7 +75,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
                        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 and row['ts'].to_i!=lasttime)
+                       if (row['ts'].to_i-lasttime<180 and row['fileid']==lastfile and row['trackid']==lasttrack and row['ts'].to_i!=lasttime)

                                b+=drawTo(absx,absy,xs,ys)
                        else
                                b+=startAndMove(xs,ys,'01')
                                b+=drawTo(absx,absy,xs,ys)
                        else
                                b+=startAndMove(xs,ys,'01')


@@ -81,6 +83,7 @@ class SwfController < ApplicationController
                        absx=xs.floor; absy=ys.floor
                        lasttime=row['ts'].to_i
                        lastfile=row['fileid']
                        absx=xs.floor; absy=ys.floor
                        lasttime=row['ts'].to_i
                        lastfile=row['fileid']

+                       lasttrack=row['trackid']

                        while b.length>80 do
                                r+=[b.slice!(0...80)].pack("B*")
                        end
                        while b.length>80 do
                                r+=[b.slice!(0...80)].pack("B*")
                        end