diff options
author | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 11:31:32 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 12:45:22 +0100 |
commit | c6a20311276f00befd27fe0ea7e606db4a13844d (patch) | |
tree | a72eec3c6e1654dac232137ee367c4a622f70a48 /perllib/FixMyStreet/App/Controller | |
parent | ca5761ae2542de544f48f6338d7d81f8711d3caf (diff) |
Use our own StreetView tile server, add missing IE6 CSS for OpenLayers, don't set map parameter in JS.
Diffstat (limited to 'perllib/FixMyStreet/App/Controller')
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Around.pm | 5 | ||||
-rw-r--r-- | perllib/FixMyStreet/App/Controller/My.pm | 3 | ||||
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Reports.pm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 0f5450d5f..fcf91123e 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -239,6 +239,11 @@ sub ajax : Path('/ajax') { my $all_pins = $c->req->param('all_pins') ? 1 : undef; my $interval = $all_pins ? undef : $c->cobrand->on_map_default_max_pin_age; + # Need to be the class that can handle it + if ($c->req->param('bbox')) { + FixMyStreet::Map::set_map_class( 'OSM' ); + } + # extract the data from the map my ( $pins, $on_map, $around_map, $dist ) = FixMyStreet::Map::map_pins( $c, $interval ); diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm index b1359ae03..e5346f3d9 100644 --- a/perllib/FixMyStreet/App/Controller/My.pm +++ b/perllib/FixMyStreet/App/Controller/My.pm @@ -25,9 +25,6 @@ sub my : Path : Args(0) { $c->detach( '/auth/redirect' ) unless $c->user; - # Even though front end doesn't yet have it, have it on this page, it's better! - FixMyStreet::Map::set_map_class( 'FMS' ); - my $p_page = $c->req->params->{p} || 1; my $u_page = $c->req->params->{u} || 1; diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index e533ea347..61218448b 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -102,8 +102,6 @@ sub ward : Path : Args(2) { my $pins = $c->stash->{pins}; - # Even though front end doesn't yet have it, have it on this page, it's better! - FixMyStreet::Map::set_map_class( 'FMS' ); FixMyStreet::Map::display_map( $c, latitude => @$pins ? $pins->[0]{latitude} : 0, |