diff options
Diffstat (limited to 'perllib/FixMyStreet/App/Controller')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Around.pm | 11 | ||||
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Questionnaire.pm | 6 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 6 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 6 |
4 files changed, 22 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 38e6025db..ac665055b 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -180,10 +180,13 @@ sub display_location : Private { $c->stash->{distance} = $distance; # create a list of all the pins - my @pins = map { - my $pin_colour = $_->{state} eq 'fixed' ? 'green' : 'red'; - [ $_->{latitude}, $_->{longitude}, $pin_colour, $_->{id}, $_->{title} ]; - } @$on_map_all, @$around_map; + my @pins = map { { + latitude => $_->{latitude}, + longitude => $_->{longitude}, + colour => $_->{state} eq 'fixed' ? 'green' : 'red', + id => $_->{id}, + title => $_->{title}, + } } @$on_map_all, @$around_map; { # FIXME - ideally this indented code should be in the templates $c->stash->{map_html} = FixMyStreet::Map::display_map( diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index 96650a1c6..289ba6bb3 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -212,7 +212,11 @@ sub display : Private { $c, latitude => $problem->latitude, longitude => $problem->longitude, - pins => [ [ $problem->latitude, $problem->longitude, $problem->state eq 'fixed' ? 'green' : 'red' ] ], + pins => [ { + latitude => $problem->latitude, + longitude => $problem->longitude, + colour => $problem->state eq 'fixed' ? 'green' : 'red', + } ], ); $c->stash->{map_js} = FixMyStreet::Map::header_js(); $c->stash->{cobrand_form_elements} = $c->cobrand->form_elements('questionnaireForm'); diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index ae3dd5291..82f553d71 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -156,7 +156,11 @@ sub generate_map_tags : Private { longitude => $problem->longitude, type => 0, pins => $problem->used_map - ? [ [ $problem->latitude, $problem->longitude, 'blue' ] ] + ? [ { + latitude => $problem->latitude, + longitude => $problem->longitude, + colour => 'blue', + } ] : [], ); $c->stash->{map_js} = FixMyStreet::Map::header_js(); diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index bbf125833..2bba93cd4 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -908,7 +908,11 @@ sub generate_map : Private { latitude => $latitude, longitude => $longitude, type => 1, - pins => [ [ $latitude, $longitude, 'purple' ] ], + pins => [ { + latitude => $latitude, + longitude => $longitude, + colour => 'purple', + } ], ); } |