Cope with change in number of decimals for GPS point positions.

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 94a3f5b4ce1151a72cc49d923c88dabd2358ce64..2200ab6525bc4865b427aaeeab2104730150ece9 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -47,7 +47,7 @@ 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.000001 AS lat,gps_points.longitude*0.000001 AS lon,gpx_files.id AS fileid,UNIX_TIMESTAMP(gps_points.timestamp) AS ts "+
+                       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} "+
                                 " FROM gpx_files,gps_points "+
                                 "WHERE gpx_files.id=gpx_id "+
                                 "  AND gpx_files.user_id=#{user.id} "+


@@ -56,7 +56,7 @@ class SwfController < ApplicationController
                                 "ORDER BY fileid DESC,ts "+
                                 "LIMIT 10000"
                else
                                 "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 "+
+                       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 "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
                                 "  AND (gps_points.timestamp IS NOT NULL) "+
                                 " FROM gps_points "+
                                 "WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"gps_points.")+
                                 "  AND (gps_points.timestamp IS NOT NULL) "+