aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Map
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet/Map')
-rw-r--r--perllib/FixMyStreet/Map/OSM.pm7
-rw-r--r--perllib/FixMyStreet/Map/Tilma/Original.pm5
2 files changed, 4 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index aeece3960..194f403c9 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -35,7 +35,7 @@ sub copyright {
# display_map C PARAMS
# PARAMS include:
# latitude, longitude for the centre point of the map
-# TYPE is 1 if the map is clickable, 0 otherwise.
+# CLICKABLE is set if the map is clickable
# PINS is array of pins to show, location and colour
sub display_map {
my ($self, $c, %params) = @_;
@@ -64,10 +64,8 @@ sub display_map {
here => [ map { Utils::truncate_coordinate($_) } tile_to_latlon( $x_tile, $y_tile, $zoom_act ) ],
};
$c->stash->{map} = {
+ %params,
type => 'osm',
- clickable => $params{type},
- latitude => $params{latitude},
- longitude => $params{longitude},
map_type => $self->map_type(),
tile_url => $self->base_tile_url(),
copyright => $self->copyright(),
@@ -75,7 +73,6 @@ sub display_map {
y_tile => $y_tile,
zoom => $zoom,
zoom_act => $zoom_act,
- pins => $params{pins},
compass => $compass,
};
}
diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm
index c7ff5a52f..f834c2d2a 100644
--- a/perllib/FixMyStreet/Map/Tilma/Original.pm
+++ b/perllib/FixMyStreet/Map/Tilma/Original.pm
@@ -36,7 +36,7 @@ sub header_js {
# display_map C PARAMS
# PARAMS include:
# latitude, longitude for the centre point of the map
-# TYPE is 1 if the map is clickable, 0 otherwise.
+# CLICKABLE is set if the map is clickable
# PINS is array of pins to show, location and colour
sub display_map {
my ($self, $c, %params) = @_;
@@ -72,10 +72,9 @@ sub display_map {
my $tiles = LWP::Simple::get($tiles_url);
my $tileids = RABX::unserialise($tiles);
$c->stash->{map} = {
+ %params,
type => 'tilma/original',
- pins => $params{pins},
tiles => $tiles,
- clickable => $params{type},
url => $url,
tileids => $tileids,
x => $x,