Get header JS <script> out of code and into templates.

11 files changed, 13 insertions, 75 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index eef805da8..4aa37aa08 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -196,7 +196,6 @@ sub display_location : Private {
             clickable => 1,
             pins      => \@pins,
         );
-        $c->stash->{map_js} = FixMyStreet::Map::header_js();
     }
 
     return 1;
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index ba714a736..f6d7299b3 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -266,7 +266,6 @@ sub display : Private {
             colour    => $problem->state eq 'fixed' ? 'green' : 'red',
         } ],
     );
-    $c->stash->{map_js}                = FixMyStreet::Map::header_js();
     $c->stash->{cobrand_form_elements} = $c->cobrand->form_elements('questionnaireForm');
 }
 
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 82d83e318..b6f336ffa 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -162,7 +162,6 @@ sub generate_map_tags : Private {
           } ]
         : [],
     );
-    $c->stash->{map_js} = FixMyStreet::Map::header_js();
 
     return 1;
 }
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index ba864eca4..e113517f9 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -77,9 +77,6 @@ all_pins: related to map display - not relevant to creation of a new report
 sub report_new : Path : Args(0) {
     my ( $self, $c ) = @_;
 
-    # set up the page
-    $c->forward('setup_page');
-
     # create the report - loading a partial if available
     $c->forward('initialize_report');
 
@@ -270,20 +267,6 @@ sub report_import : Path('/import') {
     return 1;
 }
 
-=head2 setup_page
-
-Setup the page - notably add the map js to the stash
-
-=cut
-
-sub setup_page : Private {
-    my ( $self, $c ) = @_;
-
-    $c->stash->{extra_js_verbatim} = FixMyStreet::Map::header_js();
-
-    return 1;
-}
-
 =head2 initialize_report
 
 Create the report and set up some basics in it. If there is a partial report
diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 32420a0ec..54979eba1 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -11,13 +11,6 @@ package FixMyStreet::Map::Bing;
 use strict;
 use mySociety::Web qw(ent);
 
-sub header_js {
-    return '
-<script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script>
-<script type="text/javascript" src="/js/map-bing.js"></script>
-';
-}
-
 # display_map C PARAMS
 # PARAMS include:
 # latitude, longitude for the centre point of the map
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index f4dd31b61..d0a28be9b 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -14,20 +14,15 @@ use strict;
 use constant ZOOM_LEVELS    => 5;
 use constant MIN_ZOOM_LEVEL => 13;
 
-sub header_js {
-    return '
-<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-bing-ol.js"></script>
-';
-}
-
 # Is set by the JavaScript
 sub map_type {
     return '""';
 }
 
+sub map_template {
+    return 'fms';
+}
+
 sub copyright {
     return _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010. Microsoft');
 }
diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm
index 20c3ad2b6..ceb3a53ed 100644
--- a/perllib/FixMyStreet/Map/Google.pm
+++ b/perllib/FixMyStreet/Map/Google.pm
@@ -11,13 +11,6 @@ package FixMyStreet::Map::Google;
 use strict;
 use mySociety::Web qw(ent);
 
-sub header_js {
-    return '
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript" src="/js/map-google.js"></script>
-';
-}
-
 # display_map C PARAMS
 # PARAMS include:
 # latitude, longitude for the centre point of the map
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 862c618f8..4543ce2da 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -16,18 +16,14 @@ use Utils;
 use constant ZOOM_LEVELS    => 5;
 use constant MIN_ZOOM_LEVEL => 13;
 
-sub header_js {
-    return '
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-OpenStreetMap.js"></script>
-';
-}
-
 sub map_type {
     return 'OpenLayers.Layer.OSM.Mapnik';
 }
 
+sub map_template {
+    return 'osm';
+}
+
 sub map_tiles {
     my ($self, $x, $y, $z) = @_;
     my $tile_url = $self->base_tile_url();
@@ -78,7 +74,7 @@ sub display_map {
 
     $c->stash->{map} = {
         %params,
-        type => 'osm',
+        type => $self->map_template(),
         map_type => $self->map_type(),
         tiles => $self->map_tiles( $x_tile, $y_tile, $zoom_act ),
         copyright => $self->copyright(),
diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index ba7134c1e..141c2e328 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -11,18 +11,14 @@ use base 'FixMyStreet::Map::OSM';
 
 use strict;
 
-sub header_js {
-    return '
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-streetview.js"></script>
-';
-}
-
 sub map_type {
     return '""';
 }
 
+sub map_template {
+    return 'osm-streetview';
+}
+
 sub base_tile_url {
     return 'os.openstreetmap.org/sv';
 }
diff --git a/perllib/FixMyStreet/Map/Tilma/OpenLayers.pm b/perllib/FixMyStreet/Map/Tilma/OpenLayers.pm
index 96d0975f2..31e9eb096 100644
--- a/perllib/FixMyStreet/Map/Tilma/OpenLayers.pm
+++ b/perllib/FixMyStreet/Map/Tilma/OpenLayers.pm
@@ -14,15 +14,6 @@ sub TILE_WIDTH()   { return $FixMyStreet::Map::map_class->tile_width;   }
 sub SCALE_FACTOR() { return $FixMyStreet::Map::map_class->scale_factor; }
 sub TILE_TYPE()    { return $FixMyStreet::Map::map_class->tile_type;    }
 
-sub header_js {
-    return '
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-tilma-ol.js"></script>
-<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
-';
-}
-
 # display_map C PARAMS
 # PARAMS include:
 # latitude, longitude for the centre point of the map
diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm
index ddabf2ed5..e1ab34393 100644
--- a/perllib/FixMyStreet/Map/Tilma/Original.pm
+++ b/perllib/FixMyStreet/Map/Tilma/Original.pm
@@ -27,12 +27,6 @@ sub _ll_to_en {
     return Utils::convert_latlon_to_en( $lat, $lon );
 }
 
-sub header_js {
-    return '
-<script type="text/javascript" src="/js/map-tilma.js"></script>
-';
-}
-
 # display_map C PARAMS
 # PARAMS include:
 # latitude, longitude for the centre point of the map