aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2019-12-03 11:20:52 +0000
committerMatthew Somerville <matthew@mysociety.org>2019-12-03 11:20:52 +0000
commit6c0b85cf296adb076590070d94a665fe90b71e2b (patch)
tree7dbc4503df0eac6f3b9831f6037a223814d99201
parent0ef1a3f2221ba39f61885877b0f5e13e14d8eb50 (diff)
[UK] Remove roadworks.
-rw-r--r--.cypress/cypress/integration/isleofwight.js12
-rw-r--r--templates/web/bathnes/footer_extra_js.html2
-rw-r--r--templates/web/bristol/footer_extra_js.html2
-rw-r--r--templates/web/buckinghamshire/footer_extra_js.html2
-rw-r--r--templates/web/cheshireeast/footer_extra_js.html2
-rw-r--r--templates/web/hounslow/footer_extra_js.html1
-rw-r--r--templates/web/isleofwight/footer_extra_js.html1
-rw-r--r--templates/web/lincolnshire/footer_extra_js.html2
-rw-r--r--templates/web/northamptonshire/footer_extra_js.html2
-rw-r--r--templates/web/westminster/footer_extra_js.html2
-rw-r--r--web/cobrands/bathnes/base.scss15
-rw-r--r--web/cobrands/bathnes/js.js38
-rw-r--r--web/cobrands/bristol/js.js24
-rw-r--r--web/cobrands/buckinghamshire/js.js18
-rw-r--r--web/cobrands/cheshireeast/js.js18
-rw-r--r--web/cobrands/fixmystreet-uk-councils/roadworks.js225
-rw-r--r--web/cobrands/hounslow/js.js11
-rw-r--r--web/cobrands/isleofwight/js.js11
-rw-r--r--web/cobrands/lincolnshire/base.scss4
-rw-r--r--web/cobrands/lincolnshire/roadworks.js29
-rw-r--r--web/cobrands/northamptonshire/js.js19
-rw-r--r--web/cobrands/westminster/roadworks.js32
22 files changed, 0 insertions, 472 deletions
diff --git a/.cypress/cypress/integration/isleofwight.js b/.cypress/cypress/integration/isleofwight.js
index daa69f36a..ab7039a5f 100644
--- a/.cypress/cypress/integration/isleofwight.js
+++ b/.cypress/cypress/integration/isleofwight.js
@@ -20,16 +20,4 @@ describe('When you look at the Island Roads site', function() {
cy.get('select:eq(4)').select('Extra');
cy.contains('Help Island Roads');
});
-
- it('displays nearby roadworks', function() {
- cy.fixture('iow_roadworks.json');
- cy.route('/data/**', 'fixture:iow_roadworks.json').as('roadworks');
- cy.visit('http://isleofwight.localhost:3001/');
- cy.get('[name=pc]').type('PO30 5XJ');
- cy.get('[name=pc]').parents('form').submit();
- cy.get('#map_box').click();
- cy.wait('@report-ajax');
- cy.wait('@roadworks');
- cy.contains('Roadworks are scheduled near this location');
- });
});
diff --git a/templates/web/bathnes/footer_extra_js.html b/templates/web/bathnes/footer_extra_js.html
index 240767d48..6ab4c70a0 100644
--- a/templates/web/bathnes/footer_extra_js.html
+++ b/templates/web/bathnes/footer_extra_js.html
@@ -6,8 +6,6 @@ IF bodyclass.match('mappage');
scripts.push(
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
version('/cobrands/fixmystreet/assets.js'),
- version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
- version('/cobrands/bathnes/js.js'),
version('/cobrands/bathnes/assets.js'),
);
END
diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html
index 644576b72..deff4e395 100644
--- a/templates/web/bristol/footer_extra_js.html
+++ b/templates/web/bristol/footer_extra_js.html
@@ -6,8 +6,6 @@ IF bodyclass.match('mappage');
scripts.push(
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
version('/cobrands/fixmystreet/assets.js'),
- version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
- version('/cobrands/bristol/js.js'),
version('/cobrands/bristol/assets.js'),
version('/cobrands/highways/assets.js'),
);
diff --git a/templates/web/buckinghamshire/footer_extra_js.html b/templates/web/buckinghamshire/footer_extra_js.html
index 6080f5e4f..760722bcd 100644
--- a/templates/web/buckinghamshire/footer_extra_js.html
+++ b/templates/web/buckinghamshire/footer_extra_js.html
@@ -6,8 +6,6 @@ IF bodyclass.match('mappage');
scripts.push(
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
version('/cobrands/fixmystreet/assets.js'),
- version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
- version('/cobrands/buckinghamshire/js.js'),
version('/cobrands/buckinghamshire/assets.js'),
);
END
diff --git a/templates/web/cheshireeast/footer_extra_js.html b/templates/web/cheshireeast/footer_extra_js.html
index 10ac9a152..674763338 100644
--- a/templates/web/cheshireeast/footer_extra_js.html
+++ b/templates/web/cheshireeast/footer_extra_js.html
@@ -6,9 +6,7 @@ IF bodyclass.match('mappage');
scripts.push(
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
version('/cobrands/fixmystreet/assets.js'),
- version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
version('/cobrands/cheshireeast/assets.js'),
- version('/cobrands/cheshireeast/js.js'),
);
END
%]
diff --git a/templates/web/hounslow/footer_extra_js.html b/templates/web/hounslow/footer_extra_js.html
index 1ff386231..f0b01419e 100644
--- a/templates/web/hounslow/footer_extra_js.html
+++ b/templates/web/hounslow/footer_extra_js.html
@@ -5,7 +5,6 @@
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/highways/assets.js'),
version('/cobrands/hounslow/js.js'),
diff --git a/templates/web/isleofwight/footer_extra_js.html b/templates/web/isleofwight/footer_extra_js.html
index 0ad3525e6..563da86b6 100644
--- a/templates/web/isleofwight/footer_extra_js.html
+++ b/templates/web/isleofwight/footer_extra_js.html
@@ -2,7 +2,6 @@
scripts.push(
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
version('/cobrands/fixmystreet/assets.js'),
- version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
version('/cobrands/fixmystreet-uk-councils/js.js'),
version('/cobrands/isleofwight/js.js'),
version('/cobrands/isleofwight/assets.js'),
diff --git a/templates/web/lincolnshire/footer_extra_js.html b/templates/web/lincolnshire/footer_extra_js.html
index 946bddfdc..78b25b0c9 100644
--- a/templates/web/lincolnshire/footer_extra_js.html
+++ b/templates/web/lincolnshire/footer_extra_js.html
@@ -5,9 +5,7 @@
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
diff --git a/templates/web/northamptonshire/footer_extra_js.html b/templates/web/northamptonshire/footer_extra_js.html
index dc87babce..c17d2777e 100644
--- a/templates/web/northamptonshire/footer_extra_js.html
+++ b/templates/web/northamptonshire/footer_extra_js.html
@@ -4,8 +4,6 @@ IF bodyclass.match('mappage');
version('/cobrands/fixmystreet/assets.js'),
version('/cobrands/fixmystreet-uk-councils/alloy.js'),
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
- version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
- version('/cobrands/northamptonshire/js.js'),
version('/cobrands/northamptonshire/assets.js'),
version('/cobrands/highways/assets.js'),
version('/cobrands/fixmystreet-uk-councils/council_validation_rules.js'),
diff --git a/templates/web/westminster/footer_extra_js.html b/templates/web/westminster/footer_extra_js.html
index f89cee3d4..ec25926c5 100644
--- a/templates/web/westminster/footer_extra_js.html
+++ b/templates/web/westminster/footer_extra_js.html
@@ -3,8 +3,6 @@ IF bodyclass.match('mappage');
scripts.push(
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
version('/cobrands/fixmystreet/assets.js'),
- version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
- version('/cobrands/westminster/roadworks.js'),
version('/cobrands/westminster/assets.js'),
);
END
diff --git a/web/cobrands/bathnes/base.scss b/web/cobrands/bathnes/base.scss
index 611f71094..0b59469fa 100644
--- a/web/cobrands/bathnes/base.scss
+++ b/web/cobrands/bathnes/base.scss
@@ -72,18 +72,3 @@
color: #fff;
}
}
-
-.js-roadworks-message {
- margin: 1em -1em;
- padding: 1em;
- background-color: #00aeef;
- color: #fff;
- dt {
- float: left;
- margin-right: 0.25em;
- }
-
- p:last-child {
- font-weight: bold;
- }
-}
diff --git a/web/cobrands/bathnes/js.js b/web/cobrands/bathnes/js.js
deleted file mode 100644
index 51c8bcfed..000000000
--- a/web/cobrands/bathnes/js.js
+++ /dev/null
@@ -1,38 +0,0 @@
-(function(){
-
-if (!fixmystreet.maps) {
- return;
-}
-
-fixmystreet.roadworks.config = {
- tag_top: 'h3',
- colon: true,
- skip_delays: true,
- text_after: "<p>If you think this issue needs immediate attention you can continue your report below</p>"
-};
-
-fixmystreet.roadworks.filter = function(feature) {
- var category = $('select#form_category').val(),
- parts = feature.attributes.symbol.split(''),
- valid_types = ['h', 'n', 'l', 'w'],
- valid_subtypes = ['15', '25'],
- type = parts[2],
- sub_type = parts[4] + parts[5],
- categories = ['Damage to pavement', 'Damage to road', 'Faded road markings', 'Damaged Railing, manhole, or drain cover'];
- return OpenLayers.Util.indexOf(categories, category) != -1 &&
- ( OpenLayers.Util.indexOf(valid_types, type) != -1 ||
- ( type === 'o' && OpenLayers.Util.indexOf(valid_subtypes, sub_type) != -1 ) );
-};
-
-var org_id = '114';
-var body = "Bath and North East Somerset Council";
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-
-})();
diff --git a/web/cobrands/bristol/js.js b/web/cobrands/bristol/js.js
deleted file mode 100644
index c2431607f..000000000
--- a/web/cobrands/bristol/js.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function(){
-
-if (!fixmystreet.maps) {
- return;
-}
-
-var org_id = '1015';
-var body = "Bristol City Council";
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-
-fixmystreet.roadworks.config = {
- summary_heading_text: 'Location',
- extra_dates_text: '<small>Please note that dates are updated by the contractor carrying out the works and the finish date may be incorrect in cases of unauthorised or overrunning works</small>',
- skip_delays: true
-};
-
-})();
diff --git a/web/cobrands/buckinghamshire/js.js b/web/cobrands/buckinghamshire/js.js
deleted file mode 100644
index 6be03f91f..000000000
--- a/web/cobrands/buckinghamshire/js.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function(){
-
-if (!fixmystreet.maps) {
- return;
-}
-
-var org_id = '1016';
-var body = "Buckinghamshire County Council";
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-
-})();
diff --git a/web/cobrands/cheshireeast/js.js b/web/cobrands/cheshireeast/js.js
deleted file mode 100644
index 499a3903b..000000000
--- a/web/cobrands/cheshireeast/js.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function(){
-
-if (!fixmystreet.maps) {
- return;
-}
-
-var org_id = '1451';
-var body = "Cheshire East Council";
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-
-})();
diff --git a/web/cobrands/fixmystreet-uk-councils/roadworks.js b/web/cobrands/fixmystreet-uk-councils/roadworks.js
deleted file mode 100644
index 2b0de306a..000000000
--- a/web/cobrands/fixmystreet-uk-councils/roadworks.js
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Using this file, you also need to include the JavaScript file
- * OpenLayers.Projection.OrdnanceSurvey.js for the 27700 conversion, and an
- * OpenLayers build that includes OpenLayers.Layer.SphericalMercator and
- * OpenLayers.Format.GeoJSON.
- */
-
-(function(){
-
-var industry = { 'l': 4, 'n': 4, 'h': 4, 'e': 2, 't': 5, 'w': 6, 'g': 3, 'r': 17, 'm': 18, 'x': 19, 'p': 19 };
-var industry_other = { '08': 7, '11': 19, '12': 8, '13': 14, '14': 12, '15': 20, '90': 4 };
-var traffic_management = { 'n': 0, 'l': 1, 's': 2, 'p': 3, 'a': 4, 'r': 5, 'g': 6, 'c': 7 };
-var impact = { 'g': 2, 'y': 1, 'r': 0 };
-
-// 0-indexed
-function getRow(symbol, promoter_org_ref) {
- if (promoter_org_ref == 7347) { return 24-1; }
- if (promoter_org_ref == 11 || promoter_org_ref == 15) { return 23-1; }
- var r = industry[symbol.substr(2, 1)] || industry_other[symbol.substr(4, 2)] || 4;
- return r-1;
-}
-
-// 0-indexed
-function getColumn(symbol) {
- var tm = traffic_management[symbol.substr(3, 1)] || 0;
- if (symbol.substr(1, 1) == 'p') {
- return 28 + tm - 1;
- }
- return 1 + impact[symbol.substr(0, 1)] + tm * 3 - 1;
-}
-
-OpenLayers.Format.RoadworksForwardPlanning = OpenLayers.Class(OpenLayers.Format.GeoJSON, {
- read: function(json, type, filter) {
- type = (type) ? type : "FeatureCollection";
- var results = null;
- var obj = null;
- if (typeof json == "string") {
- try {
- obj = OpenLayers.Format.JSON.prototype.read.apply(this, [json, filter]);
- } catch (error) {
- OpenLayers.Console.error("Bad JSON: " + error);
- return;
- }
- } else {
- obj = json;
- }
- if(!obj || !obj.query) {
- OpenLayers.Console.error("Bad JSON: " + json);
- return;
- }
-
- // Convert what we're given into GeoJSON
- var data = obj.query.data;
- obj = {
- 'type': 'FeatureCollection',
- 'features': []
- };
- for (var i = 0, l=data.longitude.length; i<l; i++) {
- var feature = {
- 'id': data.se_id[i],
- 'type': 'Feature',
- 'properties': {
- 'symbol': data.gsymbol_id[i],
- 'symbol_num': getRow(data.gsymbol_id[i]) * 36 + getColumn(data.gsymbol_id[i]),
- 'tooltip': data.tooltip[i],
- 'org': data.org_name_disp[i],
- 'promoter': data.promoter[i],
- 'works_desc': data.works_desc[i],
- 'start': data.start_date[i],
- 'end': data.end_date[i],
- }
- };
- // var geojson = false;
- var geojson = data.geojson_wgs84[i];
- if (geojson) {
- feature.geometry = OpenLayers.Format.JSON.prototype.read.apply(this, [geojson]);
- } else {
- feature.geometry = {
- 'type': 'Point',
- 'coordinates': [data.longitude[i], data.latitude[i]]
- };
- }
- obj.features.push(feature);
- }
- return OpenLayers.Format.GeoJSON.prototype.read.apply(this, [obj, type, filter]);
- },
-
- CLASS_NAME: "OpenLayers.Format.RoadworksForwardPlanning"
-});
-
-// ---
-
-function format_date(date) {
- var day = ('0' + date.getDate()).slice(-2);
- var month = ('0' + (date.getMonth() + 1)).slice(-2);
- var year = date.getFullYear();
- return day + '/' + month + '/' + year;
-}
-
-var stylemap = new OpenLayers.StyleMap({
- 'default': new OpenLayers.Style({
- fillOpacity: 0,
- strokeOpacity: 0,
-/*
- fillOpacity: 1,
- fillColor: "#FFFF00",
- strokeColor: "#000000",
- strokeOpacity: 0.8,
- strokeWidth: 2,
- pointRadius: 6,
- graphicWidth: 34,
- graphicHeight: 42,
- graphicXOffset: -17,
- graphicYOffset: -42,
- graphicOpacity: 1,
- externalGraphic: '/cobrands/fixmystreet-uk-councils/roadworks/${symbol_num}.png'
-*/
- })
-});
-
-var roadworks_defaults = {
- http_options: {
- url: "https://portal.roadworks.org/data/",
- // url: "/data/",
- params: {
- get: 'Points',
- userid: '1',
- organisation_id: '', // Cobrand JS should extend and override this.
- filterimpact: '1,2,3,4',
- extended_func_id: '14',
- },
- filterToParams: function(filter, params) {
- params = params || {};
- filter.value.transform('EPSG:4326', 'EPSG:27700');
- params.b = filter.value.toArray();
- var date = new Date();
- params.filterstartdate = format_date(date);
- date.setMonth(date.getMonth() + 3);
- params.filterenddate = format_date(date);
- params.mapzoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset;
- return params;
- }
- },
- srsName: "EPSG:4326",
- format_class: OpenLayers.Format.RoadworksForwardPlanning,
- strategy_class: OpenLayers.Strategy.FixMyStreet,
- stylemap: stylemap,
- body: "", // Cobrand JS should extend and override this.
- non_interactive: true,
- always_visible: true,
- nearest_radius: 100,
- road: true,
- all_categories: true,
- actions: {
- found: function(layer, feature) {
- $(".js-roadworks-message-" + layer.id).remove();
- if (!fixmystreet.roadworks.filter || fixmystreet.roadworks.filter(feature)) {
- fixmystreet.roadworks.display_message(feature);
- return true;
- }
- },
- not_found: function(layer) {
- $(".js-roadworks-message-" + layer.id).remove();
- }
- }
-};
-
-fixmystreet.roadworks = {};
-
-fixmystreet.roadworks.layer_planned = $.extend(true, {}, roadworks_defaults, {
- http_options: { params: { t: 'fp' } }
-});
-
-fixmystreet.roadworks.layer_future = $.extend(true, {}, roadworks_defaults, {
- http_options: { params: { t: 'cw' } }
-});
-
-// fixmystreet.map.layers[5].getNearestFeature(new OpenLayers.Geometry.Point(-0.835614, 51.816562).transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:3857")), 10)
-
-fixmystreet.roadworks.config = {};
-
-fixmystreet.roadworks.display_message = function(feature) {
- var attr = feature.attributes,
- start = new Date(attr.start.replace(/{ts '([^ ]*).*/, '$1')).toDateString(),
- end = new Date(attr.end.replace(/{ts '([^ ]*).*/, '$1')).toDateString(),
- tooltip = attr.tooltip.replace(/\\n/g, '\n'),
- desc = attr.works_desc.replace(/\\n/g, '\n');
-
- var config = this.config,
- summary_heading_text = config.summary_heading_text || 'Summary',
- tag_top = config.tag_top || 'p',
- colon = config.colon ? ':' : '';
-
- var $msg = $('<div class="js-roadworks-message js-roadworks-message-' + feature.layer.id + ' box-warning"><' + tag_top + '>Roadworks are scheduled near this location, so you may not need to report your issue.</' + tag_top + '></div>');
- var $dl = $("<dl></dl>").appendTo($msg);
- $dl.append("<dt>Dates" + colon + "</dt>");
- var $dates = $("<dd></dd>").appendTo($dl);
- $dates.text(start + " until " + end);
- if (config.extra_dates_text) {
- $dates.append('<br>' + config.extra_dates_text);
- }
- $dl.append("<dt>" + summary_heading_text + colon + "</dt>");
- var $summary = $("<dd></dd>").appendTo($dl);
- tooltip.split("\n").forEach(function(para) {
- if (para.match(/^(\d{2}\s+\w{3}\s+(\d{2}:\d{2}\s+)?\d{4}( - )?){2}/)) {
- // skip showing the date again
- return;
- }
- if (config.skip_delays && para.match(/^delays/)) {
- // skip showing traffic delay information
- return;
- }
- $summary.append(para).append("<br />");
- });
- if (desc) {
- $dl.append("<dt>Description" + colon + "</dt>");
- $dl.append($("<dd></dd>").text(desc));
- }
- if (config.text_after) {
- $dl.append(config.text_after);
- }
-
- $msg.prependTo('#js-post-category-messages');
-};
-
-})();
diff --git a/web/cobrands/hounslow/js.js b/web/cobrands/hounslow/js.js
index 7bd9fb91c..237ce0c2e 100644
--- a/web/cobrands/hounslow/js.js
+++ b/web/cobrands/hounslow/js.js
@@ -4,17 +4,6 @@ if (!fixmystreet.maps) {
return;
}
-var org_id = '5540';
-var body = "Hounslow Borough Council";
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-}));
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-}));
-
if (fixmystreet.cobrand == 'hounslow') {
// We want the cobranded site to always display "Hounslow Highways"
// as the destination for reports in the "Public details" section.
diff --git a/web/cobrands/isleofwight/js.js b/web/cobrands/isleofwight/js.js
index d43006fd5..0afd2eee7 100644
--- a/web/cobrands/isleofwight/js.js
+++ b/web/cobrands/isleofwight/js.js
@@ -19,15 +19,4 @@ if (fixmystreet.cobrand == 'isleofwight') {
};
}
-var org_id = '1062';
-var body = "Isle of Wight Council";
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-
})();
diff --git a/web/cobrands/lincolnshire/base.scss b/web/cobrands/lincolnshire/base.scss
index edae2baec..727a0837d 100644
--- a/web/cobrands/lincolnshire/base.scss
+++ b/web/cobrands/lincolnshire/base.scss
@@ -129,10 +129,6 @@ body.mappage .big-green-banner {
padding: 2em 0 3em;
}
-.js-roadworks-message dd:last-child {
- margin-bottom: 0;
-}
-
// Certain categories have linear assets so hide the spot marker in the guidance
#category_meta_message_Missingsafetyfence, #category_meta_message_Roadsidesafetybarrier {
.asset-spot:before {
diff --git a/web/cobrands/lincolnshire/roadworks.js b/web/cobrands/lincolnshire/roadworks.js
deleted file mode 100644
index 0e8923607..000000000
--- a/web/cobrands/lincolnshire/roadworks.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function(){
-
-if (!fixmystreet.maps) {
- return;
-}
-
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: '1070' } },
- body: "Lincolnshire County Council"
-});
-// NB Lincs don't want forward planning works displayed, so
-// fixmystreet.roadworks.layer_planned is deliberately missing here.
-
-
-// Lincs want to also display the responsible party in roadworks messages
-var original_display_message = fixmystreet.roadworks.display_message;
-fixmystreet.roadworks.display_message = function(feature) {
- var retval = original_display_message.apply(this, arguments);
-
- if (feature.attributes.promoter) {
- var $dl = $(".js-roadworks-message-" + feature.layer.id + " dl");
- $dl.append("<dt>Responsibility</dt>");
- $dl.append($("<dd></dd>").text(feature.attributes.promoter));
- }
-
- return retval;
-};
-
-})();
diff --git a/web/cobrands/northamptonshire/js.js b/web/cobrands/northamptonshire/js.js
deleted file mode 100644
index 286b24551..000000000
--- a/web/cobrands/northamptonshire/js.js
+++ /dev/null
@@ -1,19 +0,0 @@
-(function(){
-
-if (!fixmystreet.maps) {
- return;
-}
-
-var org_id = '1089';
-var body = "Northamptonshire County Council";
-
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-
-})();
diff --git a/web/cobrands/westminster/roadworks.js b/web/cobrands/westminster/roadworks.js
deleted file mode 100644
index d7a30b63d..000000000
--- a/web/cobrands/westminster/roadworks.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function(){
-
-if (!fixmystreet.maps) {
- return;
-}
-
-var org_id = '1160';
-var body = "Westminster City Council";
-fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
- http_options: { params: { organisation_id: org_id } },
- body: body
-});
-
-// Westminster want to also display the responsible party in roadworks messages
-var original_display_message = fixmystreet.roadworks.display_message;
-fixmystreet.roadworks.display_message = function(feature) {
- var retval = original_display_message.apply(this, arguments);
-
- if (feature.attributes.promoter) {
- var $dl = $(".js-roadworks-message-" + feature.layer.id + " dl");
- $dl.append("<dt>Responsibility</dt>");
- $dl.append($("<dd></dd>").text(feature.attributes.promoter));
- }
-
- return retval;
-};
-
-})();