From cbcbd7a4a49edd3216abb5c56bdb6e61b08e1e5d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 8 May 2011 10:50:25 +0100 Subject: [PATCH] Don't add a geographic condition when fetching an RSS feed with no bbox --- app/controllers/map_bugs_controller.rb | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb index 6f645b131..063c06fbe 100644 --- a/app/controllers/map_bugs_controller.rb +++ b/app/controllers/map_bugs_controller.rb @@ -128,24 +128,20 @@ class MapBugsController < ApplicationController end def rss + limit = getLimit + conditions = closedCondition + # Figure out the bbox bbox = params['bbox'] if bbox and bbox.count(',') == 3 bbox = bbox.split(',') @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 = 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) + 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 @comments = MapBugComment.find(:all, :limit => limit, :order => "date_created DESC", :joins => :map_bug, :include => :map_bug, :conditions => conditions) render :template => 'map_bugs/rss.rss' -- 2.43.2