cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass sql_for_area a BoundingBox object

Browse source
This commit is contained in:
Tom Hughes 2011-11-18 16:50:54 +00:00
parent 0d6a51d74e
commit a6b64fdebd
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/swf_controller.rb
View file

@ -21,10 +21,8 @@ class SwfController < ApplicationController
basey =params['basey'].to_f
masterscale =params['masterscale'].to_f
xmin=params['xmin'].to_f;
xmax=params['xmax'].to_f;
ymin=params['ymin'].to_f;
ymax=params['ymax'].to_f;
bbox = BoundingBox.new(params['xmin'], params['ymin'],
params['xmax'], params['ymax'])
start=params['start'].to_i;
# - Begin movie
@ -54,7 +52,7 @@ class SwfController < ApplicationController
" 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,"gps_points.")+
" AND "+OSM.sql_for_area(bbox,"gps_points.")+
" AND (gps_points.timestamp IS NOT NULL) "+
"ORDER BY fileid DESC,ts "+
"LIMIT 10000 OFFSET #{start}"
@ -62,7 +60,7 @@ class SwfController < ApplicationController
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(ymin,xmin,ymax,xmax,"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}"