rails_port_0.5: Merge rails_port r4643

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

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index b576aae5c7c3242faba92f2fb7b5aa9d962a1be0..40969c20fc5984f01aed60969e23c582353f10cf 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -1,6 +1,6 @@
 class SwfController < ApplicationController
        session :off
 class SwfController < ApplicationController
        session :off

-       before_filter :check_availability
+       before_filter :check_read_availability

 
 # 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]}")


@@ -47,18 +47,18 @@ 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} "+

-                                "  AND "+OSM.sql_for_area(ymin,xmin,ymax,xmax)+
+                                "  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
                                 "  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 "+
+                       sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(timestamp) AS ts "+

                                 " FROM gps_points "+
                                 " FROM gps_points "+

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


@@ -89,14 +89,13 @@ class SwfController < ApplicationController
                # - Draw unwayed segments
                
                if params['unwayed']=='true'
                # - Draw unwayed segments
                
                if params['unwayed']=='true'

-                       sql="SELECT cn1.latitude AS lat1,cn1.longitude AS lon1,"+
-                               "               cn2.latitude AS lat2,cn2.longitude AS lon2 "+
+                       sql="SELECT cn1.latitude*0.0000001 AS lat1,cn1.longitude*0.0000001 AS lon1,"+
+                               "               cn2.latitude*0.0000001 AS lat2,cn2.longitude*0.0000001 AS lon2 "+

                                "  FROM current_segments "+
                                "  FROM current_segments "+

-                               "       LEFT OUTER JOIN current_way_segments"+
+                               "       LEFT OUTER JOIN current_way_nodes"+

                                "       ON segment_id=current_segments.id,"+
                                "       current_nodes AS cn1,current_nodes AS cn2"+
                                "       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})"+
+                               " WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"cn1.")+

                                "   AND segment_id IS NULL"+
                                "   AND current_segments.visible=1"+
                                "   AND cn1.id=node_a AND cn1.visible=1"+
                                "   AND segment_id IS NULL"+
                                "   AND current_segments.visible=1"+
                                "   AND cn1.id=node_a AND cn1.visible=1"+