Potlatch 0.4b: put POIs in ways; small SWF improvement; correct created_by for ways

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

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 0e5b2e44247de6c16c857cd249621bc14a66d23f..18aa20774dfe5b0c32999bd8ed8d1fb3d571be96 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,4 +1,6 @@
 class SwfController < ApplicationController
 class SwfController < ApplicationController

+       session :off
+       before_filter :check_read_availability

 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")


@@ -18,10 +20,10 @@ 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/0.0000001
-               xmax=params['xmax'].to_f/0.0000001
-               ymin=params['ymin'].to_f/0.0000001
-               ymax=params['ymax'].to_f/0.0000001
+               xmin=params['xmin'].to_f;
+               xmax=params['xmax'].to_f;
+               ymin=params['ymin'].to_f;
+               ymax=params['ymax'].to_f;

        
                # -     Begin movie
        
        
                # -     Begin movie
        


@@ -37,34 +39,33 @@ class SwfController < ApplicationController
                xl=yb= 9999999
                xr=yt=-9999999
        
                xl=yb= 9999999
                xr=yt=-9999999
        

-               # -     Send SQL and draw line
+               # -     Send SQL for GPS tracks

        
                b=''
                lasttime=0
                lastfile='-1'
        
                if params['token']
        
                b=''
                lasttime=0
                lastfile='-1'
        
                if params['token']

-                       token=sqlescape(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,UNIX_TIMESTAMP(gps_points.timestamp) AS ts "+

-                                " FROM gpx_files,gps_points,users "+
+                                " FROM gpx_files,gps_points "+

                                 "WHERE gpx_files.id=gpx_id "+
                                 "WHERE gpx_files.id=gpx_id "+

-                                "  AND gpx_files.user_id=users.id "+
-                                "  AND token='#{token}' "+
-                                "  AND (gps_points.longitude BETWEEN #{xmin} AND #{xmax}) "+
-                                "  AND (gps_points.latitude BETWEEN #{ymin} AND #{ymax}) "+
+                                "  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"
                else
                        sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(timestamp) AS ts "+
                                 " FROM gps_points "+
                                 "ORDER BY fileid DESC,ts "+
                                 "LIMIT 10000"
                else
                        sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(timestamp) AS ts "+
                                 " FROM gps_points "+

-                                "WHERE (longitude BETWEEN #{xmin} AND #{xmax}) "+
-                                "  AND (latitude  BETWEEN #{ymin} AND #{ymax}) "+
+                                "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"
                end
                gpslist=ActiveRecord::Base.connection.select_all sql
        
                                 "ORDER BY fileid DESC,ts "+
                                 "LIMIT 10000"
                end
                gpslist=ActiveRecord::Base.connection.select_all sql
        

-               # - Draw lines
+               # - Draw GPS trace lines

        
                r=startShape()
                gpslist.each do |row|
        
                r=startShape()
                gpslist.each do |row|


@@ -72,10 +73,10 @@ 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)
+                       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+=drawTo(absx,absy,xs,ys)
                        else

-                               b+=startAndMove(xs,ys)
+                               b+=startAndMove(xs,ys,'01')

                        end
                        absx=xs.floor; absy=ys.floor
                        lasttime=row['ts'].to_i
                        end
                        absx=xs.floor; absy=ys.floor
                        lasttime=row['ts'].to_i


@@ -84,6 +85,8 @@ class SwfController < ApplicationController
                                r+=[b.slice!(0...80)].pack("B*")
                        end
                end
                                r+=[b.slice!(0...80)].pack("B*")
                        end
                end

+               
+               #   (Unwayed segments removed)

        
                # - Write shape
        
        
                # - Write shape
        


@@ -100,8 +103,7 @@ class SwfController < ApplicationController
                m=packRect(bounds_left,bounds_right,bounds_bottom,bounds_top) + 0.chr + 12.chr + packUI16(1) + m
                m='FWS' + 6.chr + packUI32(m.length+8) + m
        
                m=packRect(bounds_left,bounds_right,bounds_bottom,bounds_top) + 0.chr + 12.chr + packUI16(1) + m
                m='FWS' + 6.chr + packUI32(m.length+8) + m
        

-               response.headers["Content-Type"]="application/x-shockwave-flash"
-               render :text=>m
+               render :text => m, :content_type => "application/x-shockwave-flash"

        end
 
        private
        end
 
        private


@@ -114,9 +116,10 @@ class SwfController < ApplicationController
 
        def startShape
                s =0.chr                                                                                # No fill styles
 
        def startShape
                s =0.chr                                                                                # No fill styles

-               s+=1.chr                                                                                # One line style
+               s+=2.chr                                                                                # Two line styles

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

-               s+=17.chr                                                                               # 1 fill, 1 line index bit
+               s+=packUI16(5) + 255.chr + 0.chr + 255.chr              # Width 5, RGB #FF00FF
+               s+=34.chr                                                                               # 2 fill, 2 line index bits

                s
        end
        
                s
        end
        


@@ -124,11 +127,11 @@ class SwfController < ApplicationController
                '000000'
        end
        
                '000000'
        end
        

-       def startAndMove(x,y)
+       def startAndMove(x,y,col)

                d='001001'                                                                              # Line style change, moveTo
                l =[lengthSB(x),lengthSB(y)].max
                d+=sprintf("%05b%0#{l}b%0#{l}b",l,x,y)
                d='001001'                                                                              # Line style change, moveTo
                l =[lengthSB(x),lengthSB(y)].max
                d+=sprintf("%05b%0#{l}b%0#{l}b",l,x,y)

-               d+='1'                                                                                  # Select line style 1
+               d+=col                                                                                  # Select line style

        end
        
        def drawTo(absx,absy,x,y)
        end
        
        def drawTo(absx,absy,x,y)