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

Allow column names in area conditions to be qualified, and do so for

Browse source 
the SWF queries which sometimes reference more than one table with
columns named latitude and longitude.
This commit is contained in:
Tom Hughes 2007-09-14 11:16:25 +00:00
parent ebef7b8009
commit 349413a520
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/swf_controller.rb
View file

@ -51,14 +51,14 @@ class SwfController < ApplicationController
" FROM gpx_files,gps_points "+ " FROM gpx_files,gps_points "+
"WHERE gpx_files.id=gpx_id "+ "WHERE gpx_files.id=gpx_id "+
" AND gpx_files.user_id=#{user.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) "+ " AND (gps_points.timestamp IS NOT NULL) "+
"ORDER BY fileid DESC,ts "+ "ORDER BY fileid DESC,ts "+
"LIMIT 10000" "LIMIT 10000"
else 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.000001 AS lat,longitude*0.000001 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) "+ " AND (gps_points.timestamp IS NOT NULL) "+
"ORDER BY fileid DESC,ts "+ "ORDER BY fileid DESC,ts "+
"LIMIT 10000" "LIMIT 10000"

6
lib/osm.rb
View file

@ -412,13 +412,13 @@ module OSM
end end
# Return an SQL fragment to select a given area of the globe # Return an SQL fragment to select a given area of the globe
def self.sql_for_area(minlat, minlon, maxlat, maxlon) def self.sql_for_area(minlat, minlon, maxlat, maxlon, prefix = nil)
tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon) tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon, prefix)
minlat = (minlat * 1000000).round minlat = (minlat * 1000000).round
minlon = (minlon * 1000000).round minlon = (minlon * 1000000).round
maxlat = (maxlat * 1000000).round maxlat = (maxlat * 1000000).round
maxlon = (maxlon * 1000000).round maxlon = (maxlon * 1000000).round
return "#{tilesql} AND latitude BETWEEN #{minlat} AND #{maxlat} AND longitude BETWEEN #{minlon} AND #{maxlon}" return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
end end
end end

6
lib/quad_tile.rb
View file

@ -41,7 +41,7 @@ module QuadTile
end end
end end
def self.sql_for_area(minlat, minlon, maxlat, maxlon) def self.sql_for_area(minlat, minlon, maxlat, maxlon, prefix)
sql = Array.new sql = Array.new
single = Array.new single = Array.new
@ -49,11 +49,11 @@ module QuadTile
if first == last if first == last
single.push(first) single.push(first)
else else
sql.push("tile BETWEEN #{first} AND #{last}") sql.push("#{prefix}tile BETWEEN #{first} AND #{last}")
end end
end end
sql.push("tile IN (#{single.join(',')})") if single.size > 0 sql.push("#{prefix}tile IN (#{single.join(',')})") if single.size > 0
return "( " + sql.join(" OR ") + " )" return "( " + sql.join(" OR ") + " )"
end end