diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-06-04 14:26:04 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-06-05 17:54:31 +0100 |
| commit | 078725f2d8dc7b2ceab372bbc178eacace20ad70 (patch) | |
| tree | 1735a84b4885e686de8418f39cd7acb86b0f912b | |
| parent | 1a1be49646218b2217e25e82e6666749f78dc612 (diff) | |
[Lincolnshire] Remove map subclass.
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Lincolnshire.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/Lincolnshire.pm | 21 | ||||
| -rw-r--r-- | templates/web/lincolnshire/footer_extra_js.html | 11 |
3 files changed, 11 insertions, 23 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm index 8d8ba3268..2506772b3 100644 --- a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm +++ b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm @@ -111,8 +111,6 @@ sub categories_restriction { ] } ); } -sub map_type { 'Lincolnshire' } - sub pin_colour { my ( $self, $p, $context ) = @_; my $ext_status = $p->get_extra_metadata('external_status_code'); diff --git a/perllib/FixMyStreet/Map/Lincolnshire.pm b/perllib/FixMyStreet/Map/Lincolnshire.pm deleted file mode 100644 index 7dbfe5d8e..000000000 --- a/perllib/FixMyStreet/Map/Lincolnshire.pm +++ /dev/null @@ -1,21 +0,0 @@ -# FixMyStreet:Map::Lincolnshire -# More JavaScript, for street assets - -package FixMyStreet::Map::Lincolnshire; -use base 'FixMyStreet::Map::FMS'; - -use strict; - -sub map_javascript { [ - '/vendor/OpenLayers/OpenLayers.wfs.js', - '/vendor/OpenLayers.Projection.OrdnanceSurvey.js', - '/js/map-OpenLayers.js', - '/js/map-bing-ol.js', - '/js/map-fms.js', - '/cobrands/fixmystreet-uk-councils/roadworks.js', - '/cobrands/fixmystreet/assets.js', - '/cobrands/lincolnshire/roadworks.js', - '/cobrands/lincolnshire/assets.js', -] } - -1; diff --git a/templates/web/lincolnshire/footer_extra_js.html b/templates/web/lincolnshire/footer_extra_js.html index 8113befc9..946bddfdc 100644 --- a/templates/web/lincolnshire/footer_extra_js.html +++ b/templates/web/lincolnshire/footer_extra_js.html @@ -1,3 +1,14 @@ [% scripts.push( version('/cobrands/fixmystreet-uk-councils/council_validation_rules.js'), ) %] +[%~ +IF bodyclass.match('mappage'); + scripts.push( + version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'), + version('/cobrands/fixmystreet-uk-councils/roadworks.js'), + version('/cobrands/fixmystreet/assets.js'), + version('/cobrands/lincolnshire/roadworks.js'), + version('/cobrands/lincolnshire/assets.js'), + ); +END +%] |