diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
| commit | 3b5d561700b184c20e63111d4cbc1daab78e16c6 (patch) | |
| tree | f0c53c6bf8d4ebf12e5388053ad856fb0d0e7b86 /perllib/FixMyStreet/Map | |
| parent | 390f8e8ad1e10f832c4323c39bed2c883744a03f (diff) | |
| parent | f38b8e985697c35a62374a2f02dce2d681ef58cd (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/User.pm
t/app/controller/admin.t
templates/web/default/admin/update_edit.html
web/css/core.css
Diffstat (limited to 'perllib/FixMyStreet/Map')
| -rw-r--r-- | perllib/FixMyStreet/Map/Bing.pm | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/Google.pm | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/OSM.pm | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm index 54979eba1..676e70bf6 100644 --- a/perllib/FixMyStreet/Map/Bing.pm +++ b/perllib/FixMyStreet/Map/Bing.pm @@ -9,7 +9,6 @@ package FixMyStreet::Map::Bing; use strict; -use mySociety::Web qw(ent); # display_map C PARAMS # PARAMS include: diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm index ceb3a53ed..c0d83e35a 100644 --- a/perllib/FixMyStreet/Map/Google.pm +++ b/perllib/FixMyStreet/Map/Google.pm @@ -9,7 +9,6 @@ package FixMyStreet::Map::Google; use strict; -use mySociety::Web qw(ent); # display_map C PARAMS # PARAMS include: diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm index 1fc90c8f0..be185c35c 100644 --- a/perllib/FixMyStreet/Map/OSM.pm +++ b/perllib/FixMyStreet/Map/OSM.pm @@ -59,7 +59,8 @@ sub display_map { } # Adjust zoom level dependent upon population density - my $dist = mySociety::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude}, 200_000 ); + my $dist = $c->stash->{distance} + || mySociety::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude}, 200_000 ); my $default_zoom = $numZoomLevels - 3; $default_zoom = $numZoomLevels - 2 if $dist < 10; |