[Oxfordshire] Custom pin images with icons

Oxfordshire map pins now have icons on, and some use different colours,
to better communicate the status of reports.

Fixes mysociety/fixmystreetforcouncils#170

1 files changed, 11 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 3e262a700..7093e80bd 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -106,12 +106,20 @@ sub reports_ordering {
 sub pin_colour {
     my ( $self, $p, $context ) = @_;
     return 'grey' unless $self->owns_problem( $p );
-    return 'grey' if $p->state eq 'not responsible';
-    return 'green' if $p->is_fixed || $p->is_closed;
-    return 'red' if $p->state eq 'confirmed';
+    return 'grey' if $p->is_closed;
+    return 'green' if $p->is_fixed;
+    return 'yellow' if $p->state eq 'confirmed';
+    return 'orange'; # all the other `open_states` like "in progress"
+}
+
+sub pin_new_report_colour {
     return 'yellow';
 }
 
+sub path_to_pin_icons {
+    return '/cobrands/oxfordshire/images/';
+}
+
 sub open311_config {
     my ($self, $row, $h, $params) = @_;