Resolve conflict

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

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 9a4516016700eaa2986ee1ebd06ccccbfa6e480c..5097aa8c3c481cec5baf6f39b9a13bff4e3cfd09 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,11 +1,13 @@
 class SwfController < ApplicationController
 class SwfController < ApplicationController

-  before_filter :check_availability
+       skip_before_filter :verify_authenticity_token
+       before_filter :check_api_readable

 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
 # $log.puts Time.new.to_s+','+Time.new.usec.to_s+": started GPS script"
 # http://localhost:3000/api/0.4/swf/trackpoints?xmin=-2.32402605810577&xmax=-2.18386309423859&ymin=52.1546608755772&ymax=52.2272777906895&baselong=-2.25325793066437&basey=61.3948537948532&masterscale=5825.4222222222
 
 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
 # $log.puts Time.new.to_s+','+Time.new.usec.to_s+": started GPS script"
 # http://localhost:3000/api/0.4/swf/trackpoints?xmin=-2.32402605810577&xmax=-2.18386309423859&ymin=52.1546608755772&ymax=52.2272777906895&baselong=-2.25325793066437&basey=61.3948537948532&masterscale=5825.4222222222
 

+

        # ====================================================================
        # Public methods
        
        # ====================================================================
        # Public methods
        


@@ -19,10 +21,9 @@ class SwfController < ApplicationController
                basey           =params['basey'].to_f
                masterscale     =params['masterscale'].to_f
        
                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
+               bbox = BoundingBox.new(params['xmin'], params['ymin'],
+                                      params['xmax'], params['ymax'])
+               start=params['start'].to_i;

        
                # -     Begin movie
        
        
                # -     Begin movie
        


@@ -32,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


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

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

        
                if params['token']
        
                if params['token']

-                       token=sqlescape(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 "+
-                                "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 (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 "+
+                 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,"+
+                      "      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(bbox,"gps_points.")+
+                          "  AND (gps_points.timestamp IS NOT NULL) "+
+                          "ORDER BY fileid DESC,ts "+
+                          "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 "+

                                 " FROM gps_points "+
                                 " FROM gps_points "+

-                                "WHERE (longitude BETWEEN #{xminr} AND #{xmaxr}) "+
-                                "  AND (latitude  BETWEEN #{yminr} AND #{ymaxr}) "+
+                                "WHERE "+OSM.sql_for_area(bbox,"gps_points.")+

                                 "  AND (gps_points.timestamp IS NOT NULL) "+
                                 "ORDER BY fileid DESC,ts "+
                                 "  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
        


@@ -75,55 +75,21 @@ 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)
-                               b+=drawTo(absx,absy,xs,ys)
-                       else
-                               b+=startAndMove(xs,ys,'01')
-                       end
+                       if row['ts'].to_i-lasttime>180 or row['fileid']!=lastfile or row['trackid']!=lasttrack #or row['ts'].to_i==lasttime
+                         b+=startAndMove(xs,ys,'01')
+                         absx=xs.floor; absy=ys.floor
+      end
+                 b+=drawTo(absx,absy,xs,ys)

                        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
                end
                
                        while b.length>80 do
                                r+=[b.slice!(0...80)].pack("B*")
                        end
                end
                

-               # - Draw unwayed segments
-               
-               if params['unwayed']=='true'
-                       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"+
-                               "       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})"+
-                               "   AND segment_id IS NULL"+
-                               "   AND current_segments.visible=1"+
-                               "   AND cn1.id=node_a AND cn1.visible=1"+
-                               "   AND cn2.id=node_b AND cn2.visible=1"
-                       seglist=ActiveRecord::Base.connection.select_all sql
-                       
-                       seglist.each do |row|
-                               xs1=(long2coord(row['lon1'].to_f,baselong,masterscale)*20).floor; ys1=(lat2coord(row['lat1'].to_f,basey,masterscale)*20).floor
-                               xs2=(long2coord(row['lon2'].to_f,baselong,masterscale)*20).floor; ys2=(lat2coord(row['lat2'].to_f,basey,masterscale)*20).floor
-                               if (xs1==absx and ys1==absy)
-                                       b+=drawTo(absx,absy,xs2,ys2)
-                                       absx=xs2; absy=ys2
-                               elsif (xs2==absx and ys2==absy)
-                                       b+=drawTo(absx,absy,xs1,ys1)
-                                       absx=xs1; absy=ys1
-                               else
-                                       b+=startAndMove(xs1,ys1,'10')
-                                       b+=drawTo(xs1,ys1,xs2,ys2)
-                                       absx=xs2; absy=ys2
-                               end
-                               while b.length>80 do
-                                       r+=[b.slice!(0...80)].pack("B*")
-                               end
-                       end
-               end
+               #   (Unwayed segments removed)

        
                # - Write shape
        
        
                # - Write shape
        


@@ -154,8 +120,8 @@ class SwfController < ApplicationController
        def startShape
                s =0.chr                                                                                # No fill styles
                s+=2.chr                                                                                # Two line styles
        def startShape
                s =0.chr                                                                                # No fill styles
                s+=2.chr                                                                                # Two line styles

-               s+=packUI16(5) + 0.chr + 255.chr + 255.chr              # Width 5, RGB #00FFFF
-               s+=packUI16(5) + 255.chr + 0.chr + 255.chr              # Width 5, RGB #FF00FF
+               s+=packUI16(0) + 0.chr + 255.chr + 255.chr              # Width 5, RGB #00FFFF
+               s+=packUI16(0) + 255.chr + 0.chr + 255.chr              # Width 5, RGB #FF00FF

                s+=34.chr                                                                               # 2 fill, 2 line index bits
                s
        end
                s+=34.chr                                                                               # 2 fill, 2 line index bits
                s
        end


@@ -172,33 +138,58 @@ class SwfController < ApplicationController
        end
        
        def drawTo(absx,absy,x,y)
        end
        
        def drawTo(absx,absy,x,y)

-               d='11'                                                                                  # TypeFlag, EdgeFlag

                dx=x-absx
                dy=y-absy
                dx=x-absx
                dy=y-absy

-               
+
+    # Split the line up if there's anything>16383, because
+    # that would overflow the 4 bits allowed for length
+    mstep=[dx.abs/16383,dy.abs/16383,1].max.ceil
+    xstep=dx/mstep
+    ystep=dy/mstep
+    d=''
+    for i in (1..mstep)
+      d+=drawSection(x,y,x+xstep,y+ystep)
+      x+=xstep
+      y+=ystep
+    end
+    d
+       end
+       
+       def drawSection(x1,y1,x2,y2)
+               d='11'                                                                                  # TypeFlag, EdgeFlag
+         dx=x2-x1
+         dy=y2-y1

                l =[lengthSB(dx),lengthSB(dy)].max
                d+=sprintf("%04b",l-2)
                d+='1'                                                                                  # GeneralLine
                d+=sprintf("%0#{l}b%0#{l}b",dx,dy)
                l =[lengthSB(dx),lengthSB(dy)].max
                d+=sprintf("%04b",l-2)
                d+='1'                                                                                  # GeneralLine
                d+=sprintf("%0#{l}b%0#{l}b",dx,dy)

-       end
+  end

 
        # -----------------------------------------------------------------------
        # Specific data types
 
 
        # -----------------------------------------------------------------------
        # Specific data types
 

+  # SWF data block type
+

        def swfRecord(id,r)
                if r.length>62
        def swfRecord(id,r)
                if r.length>62

+      # Long header: tag id, 0x3F, length

                        return packUI16((id<<6)+0x3F) + packUI32(r.length) + r
                else
                        return packUI16((id<<6)+0x3F) + packUI32(r.length) + r
                else

+      # Short header: tag id, length

                        return packUI16((id<<6)+r.length) + r
                end
        end
 
                        return packUI16((id<<6)+r.length) + r
                end
        end
 

+  # SWF RECT type
+

        def packRect(a,b,c,d)
                l=[lengthSB(a),
                   lengthSB(b),
                   lengthSB(c),
                   lengthSB(d)].max
        def packRect(a,b,c,d)
                l=[lengthSB(a),
                   lengthSB(b),
                   lengthSB(c),
                   lengthSB(d)].max

+    # create binary string (00111001 etc.) - 5-byte length, then bbox

                n=sprintf("%05b%0#{l}b%0#{l}b%0#{l}b%0#{l}b",l,a,b,c,d)
                n=sprintf("%05b%0#{l}b%0#{l}b%0#{l}b%0#{l}b",l,a,b,c,d)

+    # pack into byte string

                [n].pack("B*")
        end
 
                [n].pack("B*")
        end
 


@@ -224,11 +215,11 @@ class SwfController < ApplicationController
        # (this is duplicated from amf_controller, should probably share)
        
        def lat2coord(a,basey,masterscale)
        # (this is duplicated from amf_controller, should probably share)
        
        def lat2coord(a,basey,masterscale)

-               -(lat2y(a)-basey)*masterscale+250
+               -(lat2y(a)-basey)*masterscale

        end
        
        def long2coord(a,baselong,masterscale)
        end
        
        def long2coord(a,baselong,masterscale)

-               (a-baselong)*masterscale+350
+               (a-baselong)*masterscale

        end
        
        def lat2y(a)
        end
        
        def lat2y(a)