Update Potlatch 2 to 2.3-22-g7ed0c35 build

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

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 47f692b08a9b327bcb36b9a660bca6207a7841c3..0e7e15bbf322655897d1be135b42e188a0c8a982 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,12 +1,12 @@
 class SwfController < ApplicationController
 class SwfController < ApplicationController

-       session :off
-       before_filter :check_read_availability
+       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
        


@@ -24,6 +24,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 +34,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 +44,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,14 +76,15 @@ 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)
-                               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
                        while b.length>80 do
                                r+=[b.slice!(0...80)].pack("B*")
                        end


@@ -117,8 +121,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


@@ -135,33 +139,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
 


@@ -187,11 +216,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)