aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Angell <josh@supercooldesign.co.uk>2012-02-29 12:59:11 +0000
committerJosh Angell <josh@supercooldesign.co.uk>2012-02-29 12:59:11 +0000
commitb0b39c7f020f9935ad1db9dfc49089e1164331b3 (patch)
treece08319a283f8409313d56c9dd75bdebf8bbd721
parent3ffef58745c4ce245953d32aeb618d9323fa6077 (diff)
parente771a1e5e04ae6f14928b1a328cca06c37f9af78 (diff)
Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into supercool
-rw-r--r--perllib/FixMyStreet/Map.pm4
-rw-r--r--web/js/map-OpenLayers.js2
2 files changed, 4 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm
index 2bccf1584..08bba3285 100644
--- a/perllib/FixMyStreet/Map.pm
+++ b/perllib/FixMyStreet/Map.pm
@@ -95,8 +95,10 @@ sub _map_features {
my $around_limit = $c->cobrand->on_map_list_limit || undef;
my @around_args = ( $min_lat, $max_lat, $min_lon, $max_lon, $interval );
- my $around_map_list = $c->cobrand->problems->around_map( @around_args, $around_limit );
my $around_map = $c->cobrand->problems->around_map( @around_args, undef );
+ my $around_map_list = $around_limit
+ ? $c->cobrand->problems->around_map( @around_args, $around_limit )
+ : $around_map;
my $dist;
mySociety::Locale::in_gb_locale {
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 0e45fac77..120bbf144 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -99,7 +99,7 @@ function fixmystreet_onload() {
styleMap: pin_layer_style_map
};
if (fixmystreet.page == 'around') {
- fixmystreet.bbox_strategy = new OpenLayers.Strategy.BBOX();
+ fixmystreet.bbox_strategy = new OpenLayers.Strategy.BBOX({ ratio: 1 });
pin_layer_options.strategies = [ fixmystreet.bbox_strategy ];
pin_layer_options.protocol = new OpenLayers.Protocol.HTTP({
url: '/ajax',