X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..899891fe8a16934ab98b16456ea95d9f9c81587d:/app/controllers/swf_controller.rb

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 51fe4010b..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]}")
@@ -45,9 +45,9 @@ class SwfController < ApplicationController
 
     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
 
@@ -119,7 +119,7 @@ class SwfController < ApplicationController
   def start_and_move(x, y, col)
     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
@@ -147,9 +147,9 @@ class SwfController < ApplicationController
     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 += sprintf("%0#{l}b%0#{l}b", dx, dy)
+    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