aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Map
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet/Map')
-rw-r--r--perllib/FixMyStreet/Map/Bing.pm4
-rw-r--r--perllib/FixMyStreet/Map/BingOL.pm4
-rw-r--r--perllib/FixMyStreet/Map/Google.pm4
-rw-r--r--perllib/FixMyStreet/Map/OSM.pm4
-rw-r--r--perllib/FixMyStreet/Map/OSM/StreetView.pm4
-rw-r--r--perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm4
-rw-r--r--perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm4
-rw-r--r--perllib/FixMyStreet/Map/Tilma/Original.pm4
8 files changed, 8 insertions, 24 deletions
diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 3d3f4bb09..4b15b4a76 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -36,12 +36,10 @@ sub display_map {
}
my $pins_js = join(",\n", @pins);
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $copyright = _('Map contains Ordnance Survey data © Crown copyright and database right 2010.');
my $key = mySociety::Config::get('BING_MAPS_API_KEY');
$out .= <<EOF;
-<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
<script type="text/javascript">
var fixmystreet = {
'key': '$key',
diff --git a/perllib/FixMyStreet/Map/BingOL.pm b/perllib/FixMyStreet/Map/BingOL.pm
index 41b7c1051..39ac2781a 100644
--- a/perllib/FixMyStreet/Map/BingOL.pm
+++ b/perllib/FixMyStreet/Map/BingOL.pm
@@ -38,11 +38,9 @@ sub display_map {
}
my $pins_js = join(",\n", @pins);
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010. Microsoft');
$out .= <<EOF;
-<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
<script type="text/javascript">
var fixmystreet = {
'latitude': $params{latitude},
diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm
index f51cae43d..d74f5eb2d 100644
--- a/perllib/FixMyStreet/Map/Google.pm
+++ b/perllib/FixMyStreet/Map/Google.pm
@@ -36,11 +36,9 @@ sub display_map {
}
my $pins_js = join(",\n", @pins);
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.');
$out .= <<EOF;
-<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
<script type="text/javascript">
var fixmystreet = {
'latitude': $params{latitude},
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 028b48125..292ad4ed7 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -71,13 +71,11 @@ sub display_map {
} else {
$img_type = '<img';
}
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $copyright = _('Map &copy; <a id="osm_link" href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
my $compass = compass($q, $x_tile, $y_tile, $zoom);
my $map_type = $self->map_type();
$out .= <<EOF;
-<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
<input type="hidden" name="zoom" value="$zoom">
<script type="text/javascript">
var fixmystreet = {
diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 5cc1ed5ba..9849c1ed5 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -37,11 +37,9 @@ sub display_map {
}
my $pins_js = join(",\n", @pins);
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.');
$out .= <<EOF;
-<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
<script type="text/javascript">
var fixmystreet = {
'latitude': $params{latitude},
diff --git a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm b/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
index 785c8eafe..d8ce80fab 100644
--- a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
+++ b/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
@@ -43,14 +43,12 @@ sub display_map {
}
my $pins_js = join(",\n", @pins);
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $tile_width = TILE_WIDTH;
my $tile_type = TILE_TYPE;
my $sf = SCALE_FACTOR / TILE_WIDTH;
my $copyright = _('&copy; Crown copyright. All rights reserved. Ministry of Justice 100037819&nbsp;2008.');
$out .= <<EOF;
-<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
<script type="text/javascript">
var fixmystreet = {
'tilewidth': $tile_width,
diff --git a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm b/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
index 632e75e39..74dd315bb 100644
--- a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
+++ b/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
@@ -43,14 +43,12 @@ sub display_map {
}
my $pins_js = join(",\n", @pins);
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $tile_width = TILE_WIDTH;
my $tile_type = TILE_TYPE;
my $sf = SCALE_FACTOR / TILE_WIDTH;
my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.');
$out .= <<EOF;
-<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
<script type="text/javascript">
var fixmystreet = {
'tilewidth': $tile_width,
diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm
index 20fc79a60..bf55e51eb 100644
--- a/perllib/FixMyStreet/Map/Tilma/Original.pm
+++ b/perllib/FixMyStreet/Map/Tilma/Original.pm
@@ -96,14 +96,12 @@ sub display_map {
my $cobrand = Page::get_cobrand($q);
my $root_path_js = Cobrand::root_path_js($cobrand, $q);
- my $out = FixMyStreet::Map::header($q, $params{type});
+ my $out = '';
my $img_type;
if ($params{type}) {
$out .= <<EOF;
<input type="hidden" name="x" id="formX" value="$x">
<input type="hidden" name="y" id="formY" value="$y">
-<input type="hidden" name="latitude" value="$params{latitude}">
-<input type="hidden" name="longitude" value="$params{longitude}">
EOF
$img_type = '<input type="image"';
} else {