]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/swf_controller.rb
Fixed bug in changeset closing and querying where the number of elements exceeded...
[rails.git] / app / controllers / swf_controller.rb
index ce185b59a2de08c1778975831fb53883ed2bc9a2..a96e71d05ee4ef99f9e4ff9e882e29a3fc2d3194 100644 (file)
@@ -1,4 +1,6 @@
 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]}")
@@ -18,10 +20,10 @@ class SwfController < ApplicationController
                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
+               xmin=params['xmin'].to_f;
+               xmax=params['xmax'].to_f;
+               ymin=params['ymin'].to_f;
+               ymax=params['ymax'].to_f;
        
                # -     Begin movie
        
@@ -44,22 +46,19 @@ class SwfController < ApplicationController
                lastfile='-1'
        
                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,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 "+
                                 " FROM gps_points "+
-                                "WHERE (longitude BETWEEN #{xminr} AND #{xmaxr}) "+
-                                "  AND (latitude  BETWEEN #{yminr} AND #{ymaxr}) "+
+                                "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"
@@ -74,7 +73,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['ts'].to_i!=lasttime)
                                b+=drawTo(absx,absy,xs,ys)
                        else
                                b+=startAndMove(xs,ys,'01')
@@ -87,44 +86,7 @@ class SwfController < ApplicationController
                        end
                end
                
-               # - Draw unwayed segments
-               
-               if params['unwayed']=='true'
-                       lastx=lasty=-999999
-       
-                       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 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); ys1=lat2coord(row['lat1'].to_f)
-                               xs2=long2coord(row['lon2'].to_f); ys2=lat2coord(row['lat2'].to_f)
-                               if (xs1==lastx and ys1==lasty)
-                                       b+=drawTo(xs2*20, ys2*20)
-                                       lastx=xs2; lasty=ys2
-                               elsif (xs2==lastx and ys2==lasty)
-                                       b+=drawTo(xs1*20, ys1*20)
-                                       lastx=xs1; lasty=ys1
-                               else
-                                       b+=startAndMove(xs1*20,ys1*20,'10')
-                                       b+=drawTo(xs2*20, ys2*20)
-                                       lastx=xs2; lasty=ys2
-                               end
-                               absx=lastx.floor; absy=lasty.floor
-                               while b.length>80 do
-                                       r+=[b.slice!(0...80)].pack("B*")
-                               end
-                       end
-               end
+               #   (Unwayed segments removed)
        
                # - Write shape
        
@@ -141,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
        
-               response.headers["Content-Type"]="application/x-shockwave-flash"
-               render :text=>m
+               render :text => m, :content_type => "application/x-shockwave-flash"
        end
 
        private
@@ -156,8 +117,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
@@ -226,11 +187,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)