X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..2af0840ff314f9d1e0265a4a1b50fc6db4af9047:/app/controllers/swf_controller.rb diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb index af5afb7c9..a683e2177 100644 --- a/app/controllers/swf_controller.rb +++ b/app/controllers/swf_controller.rb @@ -1,6 +1,6 @@ class SwfController < ApplicationController - skip_before_filter :verify_authenticity_token - before_filter :check_api_readable + skip_before_action :verify_authenticity_token + before_action :check_api_readable # to log: # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}") @@ -15,13 +15,13 @@ class SwfController < ApplicationController def trackpoints # - Initialise - baselong = params['baselong'].to_f - basey = params['basey'].to_f - masterscale = params['masterscale'].to_f + baselong = params["baselong"].to_f + basey = params["basey"].to_f + masterscale = params["masterscale"].to_f - bbox = BoundingBox.new(params['xmin'], params['ymin'], - params['xmax'], params['ymax']) - start = params['start'].to_i + bbox = BoundingBox.new(params["xmin"], params["ymin"], + params["xmax"], params["ymax"]) + start = params["start"].to_i # - Begin movie @@ -30,7 +30,7 @@ class SwfController < ApplicationController bounds_bottom = 0 bounds_top = 240 * 20 - m = '' + m = "" m += swf_record(9, 255.chr + 155.chr + 155.chr) # Background absx = 0 absy = 0 @@ -39,15 +39,15 @@ class SwfController < ApplicationController # - Send SQL for GPS tracks - b = '' + b = "" lasttime = 0 - lasttrack = lastfile = '-1' + lasttrack = lastfile = "-1" - if 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," + " 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}" + 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 " + "WHERE " + OSM.sql_for_area(bbox, "gps_points.") + " AND (gps_points.timestamp IS NOT NULL) " + "ORDER BY fileid DESC,ts " + "LIMIT 10000 OFFSET #{start}" + 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(bbox, "gps_points.") + " AND (gps_points.timestamp IS NOT NULL) " + "ORDER BY fileid DESC,ts " + "LIMIT 10000 OFFSET #{start}" end gpslist = ActiveRecord::Base.connection.select_all sql @@ -55,23 +55,23 @@ class SwfController < ApplicationController r = start_shape gpslist.each do |row| - xs = (long2coord(row['lon'].to_f, baselong, masterscale) * 20).floor - ys = (lat2coord(row['lat'].to_f, basey, masterscale) * 20).floor + xs = (long2coord(row["lon"].to_f, baselong, masterscale) * 20).floor + 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 || row['fileid'] != lastfile || row['trackid'] != lasttrack # or row['ts'].to_i==lasttime - b += start_and_move(xs, ys, '01') + if row["ts"].to_i - lasttime > 180 || row["fileid"] != lastfile || row["trackid"] != lasttrack # or row['ts'].to_i==lasttime + b += start_and_move(xs, ys, "01") absx = xs.floor absy = ys.floor end b += draw_to(absx, absy, xs, ys) absx = xs.floor absy = ys.floor - lasttime = row['ts'].to_i - lastfile = row['fileid'] - lasttrack = row['trackid'] + lasttime = row["ts"].to_i + lastfile = row["fileid"] + lasttrack = row["trackid"] r += [b.slice!(0...80)].pack("B*") while b.length > 80 end @@ -86,11 +86,11 @@ class SwfController < ApplicationController # - Create Flash header and write to browser - m += swf_record(1, '') # Show frame - m += swf_record(0, '') # End + m += swf_record(1, "") # Show frame + m += swf_record(0, "") # End m = pack_rect(bounds_left, bounds_right, bounds_bottom, bounds_top) + 0.chr + 12.chr + pack_u16(1) + m - m = 'FWS' + 6.chr + pack_u32(m.length + 8) + m + m = "FWS" + 6.chr + pack_u32(m.length + 8) + m render :text => m, :content_type => "application/x-shockwave-flash" end @@ -113,13 +113,13 @@ class SwfController < ApplicationController end def end_shape - '000000' + "000000" end def start_and_move(x, y, col) - d = '001001' # Line style change, moveTo + d = "001001" # Line style change, moveTo l = [length_sb(x), length_sb(y)].max - d += sprintf("%05b%0#{l}b%0#{l}b", l, x, y) + d += format("%05b%0*b%0*b", l, l, x, l, y) d += col # Select line style d end @@ -133,7 +133,7 @@ class SwfController < ApplicationController mstep = [dx.abs / 16383, dy.abs / 16383, 1].max.ceil xstep = dx / mstep ystep = dy / mstep - d = '' + d = "" 1.upto(mstep).each do d += draw_section(x, y, x + xstep, y + ystep) x += xstep @@ -143,13 +143,13 @@ class SwfController < ApplicationController end def draw_section(x1, y1, x2, y2) - d = '11' # TypeFlag, EdgeFlag + d = "11" # TypeFlag, EdgeFlag dx = x2 - x1 dy = y2 - y1 l = [length_sb(dx), length_sb(dy)].max - d += sprintf("%04b", l - 2) - d += '1' # GeneralLine - d += sprintf("%0#{l}b%0#{l}b", dx, dy) + d += format("%04b", l - 2) + d += "1" # GeneralLine + d += format("%0*b%0*b", l, dx, l, dy) d end @@ -176,7 +176,7 @@ class SwfController < ApplicationController length_sb(c), length_sb(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 = format("%05b%0*b%0*b%0*b%0*b", l, l, a, l, b, l, c, l, d) # pack into byte string [n].pack("B*") end @@ -213,8 +213,4 @@ class SwfController < ApplicationController def lat2y(a) 180 / Math::PI * Math.log(Math.tan(Math::PI / 4 + a * (Math::PI / 180) / 2)) end - - def sqlescape(a) - a.gsub("'", "''").gsub(92.chr, 92.chr + 92.chr) - end end