4 files changed, 43 insertions, 17 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index ef85ba7ea..0f5450d5f 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -235,31 +235,19 @@ the map.
 sub ajax : Path('/ajax') {
     my ( $self, $c ) = @_;
 
-    # Our current X/Y middle of visible map
-    my $x = ( $c->req->param('x') || 0 ) + 0;
-    my $y = ( $c->req->param('y') || 0 ) + 0;
-
-    # Where we started as that's the (0,0) we have to work to
-    my $sx = ( $c->req->param('sx') || 0 ) + 0;
-    my $sy = ( $c->req->param('sy') || 0 ) + 0;
-
     # how far back should we go?
     my $all_pins = $c->req->param('all_pins') ? 1 : undef;
     my $interval = $all_pins ? undef : $c->cobrand->on_map_default_max_pin_age;
 
     # extract the data from the map
     my ( $pins, $on_map, $around_map, $dist ) =
-      FixMyStreet::Map::map_pins( $c, $x, $y, $sx, $sy, $interval );
+      FixMyStreet::Map::map_pins( $c, $interval );
 
     # render templates to get the html
-    # my $on_map_list_html = $c->forward(
-    #     "View::Web", "render",
     my $on_map_list_html =
       $c->view('Web')
       ->render( $c, 'around/on_map_list_items.html', { on_map => $on_map } );
 
-    # my $around_map_list_html = $c->forward(
-    #     "View::Web", "render",
     my $around_map_list_html = $c->view('Web')->render(
         $c,
         'around/around_map_list_items.html',
@@ -279,8 +267,12 @@ sub ajax : Path('/ajax') {
     $c->res->content_type('text/javascript; charset=utf-8');
     $c->res->header( 'Cache_Control' => 'max-age=0' );
 
-    # Set the body - note that the js needs the surrounding brackets.
-    $c->res->body("($body)");
+    if ( $c->req->param('bbox') ) {
+        $c->res->body($body);
+    } else {
+        # The JS needs the surrounding brackets for Tilma
+        $c->res->body("($body)");
+    }
 }
 
 __PACKAGE__->meta->make_immutable;
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm
index 97482a761..6b5a811a6 100644
--- a/perllib/FixMyStreet/Map.pm
+++ b/perllib/FixMyStreet/Map.pm
@@ -83,7 +83,7 @@ sub map_features_bounds {
     my $lon = ( $max_lon + $min_lon ) / 2;
     return _map_features(
         $c, $lat, $lon,
-        $min_lon, $min_lat.
+        $min_lon, $min_lat,
         $max_lon, $max_lat,
         $interval
     );
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 9b968b4f6..05dc6ad39 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -95,6 +95,32 @@ sub display_map {
     };
 }
 
+sub map_pins {
+    my ($self, $c, $interval) = @_;
+
+    my $bbox = $c->req->param('bbox');
+    my ( $min_lon, $min_lat, $max_lon, $max_lat ) = split /,/, $bbox;
+
+    my ( $around_map, $around_map_list, $nearby, $dist ) =
+      FixMyStreet::Map::map_features_bounds( $c, $min_lon, $min_lat, $max_lon, $max_lat, $interval );
+
+    # create a list of all the pins
+    my @pins = map {
+        # Here we might have a DB::Problem or a DB::Nearby, we always want the problem.
+        my $p = (ref $_ eq 'FixMyStreet::App::Model::DB::Nearby') ? $_->problem : $_;
+        #{
+        #    latitude  => $p->latitude,
+        #    longitude => $p->longitude,
+        #    colour    => $p->state eq 'fixed' ? 'green' : 'red',
+        #    id        => $p->id,
+        #    title     => $p->title,
+        #}
+        [ $p->latitude, $p->longitude, $p->state eq 'fixed' ? 'green' : 'red', $p->id, $p->title ]
+    } @$around_map, @$nearby;
+
+    return (\@pins, $around_map_list, $nearby, $dist);
+}
+
 sub compass {
     my ( $x, $y, $z ) = @_;
     return {
diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm
index 6fa854cb2..0baa82011 100644
--- a/perllib/FixMyStreet/Map/Tilma/Original.pm
+++ b/perllib/FixMyStreet/Map/Tilma/Original.pm
@@ -96,7 +96,15 @@ sub display_pin {
 }
 
 sub map_pins {
-    my ($self, $c, $x, $y, $sx, $sy, $interval) = @_;
+    my ($self, $c, $interval) = @_;
+
+    # Our current X/Y middle of visible map
+    my $x = ( $c->req->param('x') || 0 ) + 0;
+    my $y = ( $c->req->param('y') || 0 ) + 0;
+
+    # Where we started as that's the (0,0) we have to work to
+    my $sx = ( $c->req->param('sx') || 0 ) + 0;
+    my $sy = ( $c->req->param('sy') || 0 ) + 0;
 
     my $e = tile_to_os($x);
     my $n = tile_to_os($y);