Implement pin_colour_key for cobrands

perllib/FixMyStreet/Cobrand/BathNES.pm

@@ -192,6 +192,15 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'red', 'Confirmed' ],
+        [ 'green', 'Fixed/closed' ],
+        [ 'grey', 'Not responsible' ],
+        [ 'yellow', 'Other' ],
+    ];
+}
+
 =head2 default_map_zoom
 
 If we're displaying the map at the user's GPS location we

perllib/FixMyStreet/Cobrand/Bexley.pm

@@ -116,6 +116,17 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow', 'Open/other' ],
+        [ 'bexley/orange', 'Action scheduled' ],
+        [ 'bexley/aqua', 'Investigating' ],
+        [ 'green-tick', 'Fixed' ],
+        [ 'bexley/spring', 'Closed' ],
+        [ 'bexley/grape', 'Not responsible' ],
+    ];
+}
+
 =item * Report resending
 
 Report resend button is disabled. But we can resend reports upon category change, unless it will be going to the

perllib/FixMyStreet/Cobrand/Brent.pm

@@ -374,6 +374,15 @@ sub pin_colour {
     return 'orange-work'; # all the other `open_states` like "in progress"
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow-cone', 'Confirmed' ],
+        [ 'green-tick', 'Fixed' ],
+        [ 'grey-cross', 'Closed' ],
+        [ 'orange-work', 'Other' ], # all the other `open_states` like "in progress"
+    ];
+}
+
 =head2 categories_restriction
 
 Doesn't show TfL's River Piers category as no piers in Brent.

perllib/FixMyStreet/Cobrand/Bristol.pm

@@ -103,6 +103,15 @@ sub pin_colour {
     return 'orange-work'; # all the other `open_states` like "in progress"
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow-cone', 'Confirmed' ],
+        [ 'green-tick', 'Fixed' ],
+        [ 'grey-cross', 'Closed' ],
+        [ 'orange-work', 'Other' ], # all the other `open_states` like "in progress"
+    ];
+}
+
 sub path_to_pin_icons { '/i/pins/whole-shadow-cone-spot/' }
 
 =head2 body_disallows_state_change

perllib/FixMyStreet/Cobrand/CentralBedfordshire.pm

@@ -122,6 +122,15 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'red', 'Confirmed' ],
+        [ 'green', 'Fixed/closed' ],
+        [ 'grey', 'Not responsible' ],
+        [ 'yellow', 'Other' ],
+    ];
+}
+
 sub disambiguate_location {
     my $self    = shift;
     my $string  = shift;

perllib/FixMyStreet/Cobrand/EastHerts.pm

@@ -35,4 +35,13 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'red', 'Confirmed' ],
+        [ 'green', 'Fixed/closed' ],
+        [ 'grey', 'Not responsible' ],
+        [ 'yellow', 'Other' ],
+    ];
+}
+
 1;

perllib/FixMyStreet/Cobrand/Gloucester.pm

@@ -144,6 +144,15 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'orange', 'In progress' ],
+        [ 'green', 'Fixed' ],
+        [ 'grey', 'Closed' ],
+        [ 'yellow', 'Other' ],
+    ];
+}
+
 sub disambiguate_location {
     my $self = shift;
     my $string = shift;

perllib/FixMyStreet/Cobrand/Gloucestershire.pm

@@ -272,6 +272,14 @@ sub pin_colour {
     return 'yellow-cone';
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow-cone', 'Open' ],
+        [ 'green-tick', 'Fixed/closed' ],
+        [ 'blue-work', 'Defect' ],
+    ];
+}
+
 sub path_to_pin_icons { '/i/pins/whole-shadow-cone-spot/' }
 
 =head2 open311_config

perllib/FixMyStreet/Cobrand/Greenwich.pm

@@ -101,6 +101,15 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'red', 'Confirmed' ],
+        [ 'green', 'Fixed/closed' ],
+        [ 'grey', 'Not responsible' ],
+        [ 'yellow', 'Other' ],
+    ];
+}
+
 =head2 open311_extra_data_include
 
 When sending reports via Open311, we include an C<external_id> attribute, set

perllib/FixMyStreet/Cobrand/Hounslow.pm

@@ -56,6 +56,13 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow', 'Open' ],
+        [ 'green', 'Fixed/closed' ],
+    ];
+}
+
 sub send_questionnaires { 0 }
 
 sub categories_restriction {

perllib/FixMyStreet/Cobrand/Northumberland.pm

@@ -76,6 +76,14 @@ sub pin_colour {
     return 'orange'; # all the other `open_states` like "in progress"
 }
 
+sub pin_colour_key {
+    [
+        [ 'red', 'Confirmed' ],
+        [ 'green', 'Fixed/closed' ],
+        [ 'orange', 'Other' ], # all the other `open_states` like "in progress"
+    ];
+}
+
 sub has_aerial_maps { 'tilma.mysociety.org/mapcache/gmaps/northumberlandaerial@{grid}' }
 
 =item * Hovering over a pin includes the state as well as the title

perllib/FixMyStreet/Cobrand/NottinghamshirePolice.pm

@@ -93,6 +93,13 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow', 'Open' ],
+        [ 'green', 'Fixed/closed' ],
+    ];
+}
+
 =item * Do not allow email addresses in title or detail
 
 =back

perllib/FixMyStreet/Cobrand/Shropshire.pm

@@ -258,6 +258,14 @@ sub pin_colour {
     return 'blue-work';
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow-cone', 'Confirmed' ],
+        [ 'green-tick', 'Fixed/closed' ],
+        [ 'blue-work', 'Other' ],
+    ];
+}
+
 sub path_to_pin_icons { '/i/pins/whole-shadow-cone-spot/' }
 
 =head2 Reports by parishes

perllib/FixMyStreet/Cobrand/Southwark.pm

@@ -82,6 +82,13 @@ sub pin_colour {
     return 'yellow-cone';
 }
 
+sub pin_colour_key {
+    [
+        [ 'yellow-cone', 'Open' ],
+        [ 'green-tick', 'Fixed/closed' ],
+    ];
+}
+
 sub path_to_pin_icons { '/i/pins/whole-shadow-cone-spot/' }
 
 sub allow_photo_display {

perllib/FixMyStreet/Cobrand/TfL.pm

@@ -127,6 +127,14 @@ sub pin_colour {
     return 'orange'; # all the other `open_states` like "in progress"
 }
 
+sub pin_colour_key {
+    [
+        [ 'red', 'Confirmed' ],
+        [ 'green', 'Fixed/closed' ],
+        [ 'orange', 'Other' ], # all the other `open_states` like "in progress"
+    ];
+}
+
 =item * Superusers and TfL staff can access the TfL admin
 
 =cut

templates/web/base/maps/_pin_legends.html

@@ -13,26 +13,12 @@ <h2 id="pin-legend-heading-desktop" class="pin-legend__heading">[% loc('Map pin
             </button>
         </div>
         <ul class="pin-legend__list">
-            <li class="pin-legend__item">
-                <img src="/i/pins/yellow/pin.png" alt="">
-                <span>[% loc('In progress') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/green/pin.png" alt="">
-                <span>[% loc('Fixed') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/bromley/green/pin.png" alt="">
-                <span>[% loc('Closed') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/orange/pin.png" alt="">
-                <span>[% loc('Action scheduled') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/bexley/aqua/pin.png" alt="">
-                <span>[% loc('Investigating') %]</span>
-            </li>
+            [% FOR colour IN c.cobrand.pin_colour_key %]
+                <li class="pin-legend__item">
+                    <img src='/i/pins/[% colour.0 %]/mini.png' alt="[% colour.0 %]"/>
+                    <span>[% loc( colour.1 ) %]</span>
+                </li>
+            [% END %]
         </ul>
     </div>
 </div>

templates/web/base/maps/_pin_legends_mobile.html

@@ -1,3 +1,4 @@
+[% # TODO? %]
 <div class="pin-legend pin-legend--mobile">
     <button type="button" class="js-pin-legend-toggle btn btn--primary has-inline-svg" aria-expanded="false" aria-controls="pin-legend-panel-mobile">
         [% INCLUDE 'icons/pin.html' width='1.5em' height='1.5em' %]
@@ -7,26 +8,12 @@
     <div id="pin-legend-panel-mobile" class="pin-legend__panel" hidden>
         <h2 id="pin-legend-heading-mobile" class="pin-legend__heading">[% loc('Map pin key') %]</h2>
         <ul class="pin-legend__list">
-            <li class="pin-legend__item">
-                <img src="/i/pins/yellow/pin.png" alt="">
-                <span>[% loc('In progress') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/green/pin.png" alt="">
-                <span>[% loc('Fixed') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/bromley/green/pin.png" alt="">
-                <span>[% loc('Closed') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/orange/pin.png" alt="">
-                <span>[% loc('Action scheduled') %]</span>
-            </li>
-            <li class="pin-legend__item">
-                <img src="/i/pins/bexley/aqua/pin.png" alt="">
-                <span>[% loc('Investigating') %]</span>
-            </li>
+            [% FOR colour IN c.cobrand.pin_colour_key %]
+                <li class="pin-legend__item">
+                    <img src='/i/pins/[% colour.0 %]/mini.png' alt="[% colour.0 %]"/>
+                    <span>[% loc( colour.1 ) %]</span>
+                </li>
+            [% END %]
         </ul>
     </div>
 </div>