update test for changed maps and fix state checking

2 files changed, 10 insertions, 10 deletions

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 05dc6ad39..1fc90c8f0 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -115,7 +115,7 @@ sub map_pins {
         #    id        => $p->id,
         #    title     => $p->title,
         #}
-        [ $p->latitude, $p->longitude, $p->state eq 'fixed' ? 'green' : 'red', $p->id, $p->title ]
+        [ $p->latitude, $p->longitude, $p->is_fixed ? 'green' : 'red', $p->id, $p->title ]
     } @$around_map, @$nearby;
 
     return (\@pins, $around_map_list, $nearby, $dist);
diff --git a/t/map/tilma/original.t b/t/map/tilma/original.t
index b953a32b2..3add7719e 100644
--- a/t/map/tilma/original.t
+++ b/t/map/tilma/original.t
@@ -14,7 +14,7 @@ my $mech = FixMyStreet::TestMech->new;
 mySociety::Locale::gettext_domain('FixMyStreet');
 
 FixMyStreet::Map::set_map_class();
-my $r = Catalyst::Request->new( { base => URI->new('/'), uri => URI->new('http://fixmystreet.com/test') } );
+my $r = Catalyst::Request->new( { base => URI->new('/'), uri => URI->new('http://fixmystreet.com/test'), parameters => { bbox => '-7.6,49.7,-7.5,49.8' } } );
 
 my $c = FixMyStreet::App->new( {
     request => $r,
@@ -56,31 +56,31 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
 for my $test ( 
     {
         state => 'fixed', 
-        colour => 'G',
+        colour => 'green',
     },
     {
         state => 'fixed - user', 
-        colour => 'G',
+        colour => 'green',
     },
     {
         state => 'fixed - council', 
-        colour => 'G',
+        colour => 'green',
     },
     {
         state => 'confirmed', 
-        colour => 'R',
+        colour => 'red',
     },
     {
         state => 'investigating', 
-        colour => 'R',
+        colour => 'red',
     },
     {
         state => 'planned', 
-        colour => 'R',
+        colour => 'red',
     },
     {
         state => 'in progress', 
-        colour => 'R',
+        colour => 'red',
     },
 ) {
     subtest "pin colour for state $test->{state}" => sub {
@@ -98,7 +98,7 @@ for my $test (
         my $id = $report->id;
         my $colour = $test->{colour};
 
-        like $pins, qr#<a [^>]* /report/$id [^>]*>[^>]*/i/pin$colour#x, 'pin colour';
+        is $pins->[0][2], $colour, 'pin colour';
     };
 }