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

Don't add a geographic condition when fetching an RSS feed with no bbox

Browse source
This commit is contained in:
Tom Hughes 2011-05-08 10:50:25 +01:00
parent 8852454795
commit cbcbd7a4a4
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/map_bugs_controller.rb
View file

@ -128,24 +128,20 @@ class MapBugsController < ApplicationController
end end
def rss def rss
limit = getLimit
conditions = closedCondition
# Figure out the bbox # Figure out the bbox
bbox = params['bbox'] bbox = params['bbox']
if bbox and bbox.count(',') == 3 if bbox and bbox.count(',') == 3
bbox = bbox.split(',') bbox = bbox.split(',')
@min_lon, @min_lat, @max_lon, @max_lat = sanitise_boundaries(bbox) @min_lon, @min_lat, @max_lon, @max_lat = sanitise_boundaries(bbox)
else
@min_lon = -180.0
@min_lat = -90.0
@max_lon = 180.0
@max_lat = 90.0
end
limit = getLimit conditions = cond_merge conditions, [OSM.sql_for_area_no_quadtile(@min_lat, @min_lon, @max_lat, @max_lon)]
conditions = closedCondition
conditions = cond_merge conditions, [OSM.sql_for_area_no_quadtile(@min_lat, @min_lon, @max_lat, @max_lon)] check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, :false)
end
check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, :false)
@comments = MapBugComment.find(:all, :limit => limit, :order => "date_created DESC", :joins => :map_bug, :include => :map_bug, :conditions => conditions) @comments = MapBugComment.find(:all, :limit => limit, :order => "date_created DESC", :joins => :map_bug, :include => :map_bug, :conditions => conditions)
render :template => 'map_bugs/rss.rss' render :template => 'map_bugs/rss.rss'