]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/swf_controller.rb
Wrap 'changeset.changeset.no_comment' in italics with <i></i>. Right
[rails.git] / app / controllers / swf_controller.rb
index 6b29d1535e8878608c25930c22f0da719896b026..262662c7af45880d939d9ec93731e1ea109d74ed 100644 (file)
@@ -1,6 +1,5 @@
 class SwfController < ApplicationController
-       session :off
-       before_filter :check_availability
+       before_filter :check_api_readable
 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
@@ -33,7 +32,7 @@ class SwfController < ApplicationController
                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
@@ -43,20 +42,22 @@ class SwfController < ApplicationController
        
                b=''
                lasttime=0
-               lastfile='-1'
+               lasttrack=lastfile='-1'
        
                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 "+
-                                " 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"
-               else
-                       sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 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(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,"+
+                            "      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) "+
@@ -73,7 +74,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
-                       if (row['ts'].to_i-lasttime<180 and row['fileid']==lastfile)
+                       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')
@@ -81,47 +82,13 @@ class SwfController < ApplicationController
                        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
                
-               # - 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_nodes"+
-                               "       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
        
@@ -152,8 +119,8 @@ class SwfController < ApplicationController
        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
@@ -222,11 +189,11 @@ class SwfController < ApplicationController
        # (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)
-               (a-baselong)*masterscale+350
+               (a-baselong)*masterscale
        end
        
        def lat2y(a)