Use .present? instead of double negative to check if terms_agreed timestamp is set.

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

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 51fe4010b7702a4062cd61b88396b1b96fad5aec..ceaf7e4c0d306f15d6f06ac17f9d94e027eb6087 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,6 +1,6 @@
 class SwfController < ApplicationController
 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]}")
 
   # to log:
   # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")


@@ -31,7 +31,7 @@ class SwfController < ApplicationController
     bounds_top = 240 * 20
 
     m = ""
     bounds_top = 240 * 20
 
     m = ""

-    m += swf_record(9, 255.chr + 155.chr + 155.chr)                    # Background
+    m += swf_record(9, 255.chr + 155.chr + 155.chr)    # Background

     absx = 0
     absy = 0
     xl = yb = 9999999
     absx = 0
     absy = 0
     xl = yb = 9999999


@@ -45,9 +45,9 @@ class SwfController < ApplicationController
 
     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," +                     "      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
     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
 
     end
     gpslist = ActiveRecord::Base.connection.select_all sql
 


@@ -104,11 +104,11 @@ class SwfController < ApplicationController
   # Line-drawing
 
   def start_shape
   # Line-drawing
 
   def start_shape

-    s = 0.chr                                          # No fill styles
-    s += 2.chr                                         # Two line styles
-    s += pack_u16(0) + 0.chr + 255.chr + 255.chr       # Width 5, RGB #00FFFF
-    s += pack_u16(0) + 255.chr + 0.chr + 255.chr       # Width 5, RGB #FF00FF
-    s += 34.chr                                                                                # 2 fill, 2 line index bits
+    s = 0.chr                                    # No fill styles
+    s += 2.chr                                   # Two line styles
+    s += pack_u16(0) + 0.chr + 255.chr + 255.chr # Width 5, RGB #00FFFF
+    s += pack_u16(0) + 255.chr + 0.chr + 255.chr # Width 5, RGB #FF00FF
+    s += 34.chr                                         # 2 fill, 2 line index bits

     s
   end
 
     s
   end
 


@@ -117,10 +117,10 @@ class SwfController < ApplicationController
   end
 
   def start_and_move(x, y, col)
   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
     l = [length_sb(x), length_sb(y)].max

-    d += sprintf("%05b%0#{l}b%0#{l}b", l, x, y)
-    d += col                                           # Select line style
+    d += format("%05b%0*b%0*b", l, l, x, l, y)
+    d += col   # Select line style

     d
   end
 
     d
   end
 


@@ -147,9 +147,9 @@ class SwfController < ApplicationController
     dx = x2 - x1
     dy = y2 - y1
     l = [length_sb(dx), length_sb(dy)].max
     dx = x2 - x1
     dy = y2 - y1
     l = [length_sb(dx), length_sb(dy)].max

-    d += sprintf("%04b", l - 2)
+    d += format("%04b", l - 2)

     d += "1"                                                                                   # GeneralLine
     d += "1"                                                                                   # GeneralLine

-    d += sprintf("%0#{l}b%0#{l}b", dx, dy)
+    d += format("%0*b%0*b", l, dx, l, dy)

     d
   end
 
     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
          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
     # 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 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
 end