aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--web/cobrands/bathnes/assets.js16
-rw-r--r--web/cobrands/bathnes/js.js8
-rw-r--r--web/cobrands/bathnes/staff.js4
-rw-r--r--web/cobrands/bristol/assets.js32
-rw-r--r--web/cobrands/bromley/assets.js20
-rw-r--r--web/cobrands/buckinghamshire/assets.js44
-rw-r--r--web/cobrands/buckinghamshire/js.js8
-rw-r--r--web/cobrands/fixmystreet/assets.js4
-rw-r--r--web/cobrands/highways/assets.js4
-rw-r--r--web/cobrands/lincolnshire/assets.js44
-rw-r--r--web/cobrands/lincolnshire/roadworks.js4
-rw-r--r--web/cobrands/northamptonshire/assets.js20
12 files changed, 105 insertions, 103 deletions
diff --git a/web/cobrands/bathnes/assets.js b/web/cobrands/bathnes/assets.js
index 16ecb3076..fd1386480 100644
--- a/web/cobrands/bathnes/assets.js
+++ b/web/cobrands/bathnes/assets.js
@@ -33,7 +33,7 @@ fixmystreet.maps.banes_defaults = {
};
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
+fixmystreet.assets.add(fixmystreet.maps.banes_defaults, {
http_options: {
params: {
TYPENAME: "Gritbins"
@@ -44,9 +44,9 @@ fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
attributes: {
asset_details: 'feature_location'
}
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
+fixmystreet.assets.add(fixmystreet.maps.banes_defaults, {
http_options: {
params: {
TYPENAME: "ParksOpenSpacesAssets"
@@ -91,7 +91,7 @@ fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
'Seats'
],
name: "Parks and Grounds"
-}));
+});
@@ -190,7 +190,7 @@ var lighting_stylemap = new OpenLayers.StyleMap({
});
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
+fixmystreet.assets.add(fixmystreet.maps.banes_defaults, {
http_options: {
params: {
TYPENAME: "StreetLighting"
@@ -211,7 +211,7 @@ fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
"description: " + a.unitdescription;
}
}
-}));
+});
var highways_stylemap = new OpenLayers.StyleMap({
@@ -221,7 +221,7 @@ var highways_stylemap = new OpenLayers.StyleMap({
})
});
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
+fixmystreet.assets.add(fixmystreet.maps.banes_defaults, {
http_options: {
params: {
TYPENAME: "AdoptedHighways"
@@ -236,7 +236,7 @@ fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
},
name: "Adopted Highways",
attribution: " © Crown Copyright. All rights reserved. 1000233344"
-}));
+});
})();
diff --git a/web/cobrands/bathnes/js.js b/web/cobrands/bathnes/js.js
index afc7df44d..51c8bcfed 100644
--- a/web/cobrands/bathnes/js.js
+++ b/web/cobrands/bathnes/js.js
@@ -26,13 +26,13 @@ fixmystreet.roadworks.filter = function(feature) {
var org_id = '114';
var body = "Bath and North East Somerset Council";
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_future, {
+fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
http_options: { params: { organisation_id: org_id } },
body: body
-}));
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_planned, {
+});
+fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
http_options: { params: { organisation_id: org_id } },
body: body
-}));
+});
})();
diff --git a/web/cobrands/bathnes/staff.js b/web/cobrands/bathnes/staff.js
index c6a8a9560..1f9aa6e6e 100644
--- a/web/cobrands/bathnes/staff.js
+++ b/web/cobrands/bathnes/staff.js
@@ -21,7 +21,7 @@ var llpg_stylemap = new OpenLayers.StyleMap({
});
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
+fixmystreet.assets.add(fixmystreet.maps.banes_defaults, {
http_options: {
params: {
TYPENAME: "LLPG"
@@ -32,7 +32,7 @@ fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, {
stylemap: llpg_stylemap,
non_interactive: true,
always_visible: true
-}));
+});
// Some normally-invisible layers are visible to staff, so replace their
diff --git a/web/cobrands/bristol/assets.js b/web/cobrands/bristol/assets.js
index 77124ce96..b31f3c154 100644
--- a/web/cobrands/bristol/assets.js
+++ b/web/cobrands/bristol/assets.js
@@ -30,26 +30,26 @@ var options = $.extend({}, common_options, {
}
});
-fixmystreet.assets.add($.extend({}, options, {
+fixmystreet.assets.add(options, {
wfs_feature: "COD_ASSETS_AREA",
asset_type: 'area',
asset_category: "Bridges/Subways",
asset_item: 'bridge/subway'
-}));
+});
-fixmystreet.assets.add($.extend({}, options, {
+fixmystreet.assets.add(options, {
asset_category: "Gully/Drainage",
asset_item: 'gully',
filter_key: 'COD_ASSET_TYPE',
filter_value: 'GULLY'
-}));
+});
-fixmystreet.assets.add($.extend({}, options, {
+fixmystreet.assets.add(options, {
asset_category: "Grit Bins",
asset_item: 'grit bin',
filter_key: 'COD_ASSET_TYPE',
filter_value: 'GRITBIN'
-}));
+});
var lighting_options = $.extend({}, common_options, {
@@ -75,7 +75,7 @@ var lighting_options = $.extend({}, common_options, {
filter_key: 'Unit_type_description'
});
-fixmystreet.assets.add($.extend({}, lighting_options, {
+fixmystreet.assets.add(lighting_options, {
asset_category: "Street Light",
asset_item: 'street light',
filter_value: [
@@ -88,32 +88,32 @@ fixmystreet.assets.add($.extend({}, lighting_options, {
'SL: Refuge Column',
'SL: Subway'
]
-}));
+});
-fixmystreet.assets.add($.extend({}, lighting_options, {
+fixmystreet.assets.add(lighting_options, {
asset_category: "Zebra Crossing Light",
asset_item: 'light',
filter_value: 'SL: Zebra'
-}));
+});
-fixmystreet.assets.add($.extend({}, lighting_options, {
+fixmystreet.assets.add(lighting_options, {
asset_category: "Iluminated Bollard",
asset_item: 'bollard',
filter_value: 'SL: Bollard'
-}));
+});
// NB there's a typo in BCC's ‘Iluminated Bollard’ category so this repeats
// the above (without the typo) just in case they fix it.
-fixmystreet.assets.add($.extend({}, lighting_options, {
+fixmystreet.assets.add(lighting_options, {
asset_category: "Illuminated Bollard",
asset_item: 'bollard',
filter_value: 'SL: Bollard'
-}));
+});
-fixmystreet.assets.add($.extend({}, lighting_options, {
+fixmystreet.assets.add(lighting_options, {
asset_category: "Illuminated Sign",
asset_item: 'sign',
filter_value: 'SL: Sign'
-}));
+});
})();
diff --git a/web/cobrands/bromley/assets.js b/web/cobrands/bromley/assets.js
index 44bf50a98..d5386d9af 100644
--- a/web/cobrands/bromley/assets.js
+++ b/web/cobrands/bromley/assets.js
@@ -37,7 +37,7 @@ OpenLayers.Layer.VectorAssetBromley = OpenLayers.Class(OpenLayers.Layer.VectorAs
CLASS_NAME: 'OpenLayers.Layer.VectorAssetBromley'
});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
class: OpenLayers.Layer.VectorAssetBromley,
http_options: {
params: {
@@ -51,9 +51,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
asset_category: ["Street Lighting and Road Signs"],
subcategories: [ 'SL_LAMP', 'SL_NOT_WORK', 'SL_ON_DAY', 'SL_BLOCK_VEG' ],
asset_item: 'street light'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
class: OpenLayers.Layer.VectorAssetBromley,
http_options: {
params: {
@@ -64,9 +64,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
subcategories: ['PG_OFLOW_DOG', 'SC_LIT_BIN'],
asset_item: 'park bin',
asset_item_message: 'For our parks, pick a <b class="asset-spot">bin</b> from the map &raquo;'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "Street_Trees"
@@ -74,7 +74,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
},
asset_category: ["Public Trees"],
asset_item: 'tree'
-}));
+});
var highways_stylemap = new OpenLayers.StyleMap({
'default': new OpenLayers.Style({
@@ -100,7 +100,7 @@ $(function(){
});
});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "TFL_Red_Route"
@@ -129,7 +129,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
fixmystreet.body_overrides.remove_only_send();
}
}
-}));
+});
var prow_stylemap = new OpenLayers.StyleMap({
'default': new OpenLayers.Style({
@@ -141,7 +141,7 @@ var prow_stylemap = new OpenLayers.StyleMap({
})
});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "PROW"
@@ -160,6 +160,6 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
$('#form_prow_reference').val('');
}
}
-}));
+});
})();
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 4ced684fd..208eb26e9 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -32,7 +32,7 @@ var defaults = {
strategy_class: OpenLayers.Strategy.FixMyStreet
};
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "Grit_Bins"
@@ -40,7 +40,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
},
asset_category: ["Salt bin damaged", "Salt bin refill"],
asset_item: 'grit bin'
-}));
+});
var pin_prefix = fixmystreet.pin_prefix || document.getElementById('js-map-data').getAttribute('data-pin_prefix');
@@ -123,7 +123,7 @@ var labeled_defaults = $.extend(true, {}, defaults, {
}
});
-fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
+fixmystreet.assets.add(labeled_defaults, {
http_options: {
params: {
TYPENAME: "StreetLights_Union"
@@ -135,9 +135,9 @@ fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
'Street light intermittent',
'Street light not working' ],
asset_item: 'street light'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
+fixmystreet.assets.add(labeled_defaults, {
http_options: {
params: {
TYPENAME: "IlluminatedBollards"
@@ -145,9 +145,9 @@ fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
},
asset_category: ["Bollard light not working"],
asset_item: 'bollard'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
+fixmystreet.assets.add(labeled_defaults, {
http_options: {
params: {
TYPENAME: "Bollards"
@@ -155,9 +155,9 @@ fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
},
asset_category: ["Bollards or railings"],
asset_item: 'bollard'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
+fixmystreet.assets.add(labeled_defaults, {
stylemap: streetlight_stylemap,
http_options: {
params: {
@@ -168,9 +168,9 @@ fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
'Belisha Beacon broken',
],
asset_item: 'belisha beacon'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
+fixmystreet.assets.add(labeled_defaults, {
stylemap: streetlight_stylemap,
http_options: {
params: {
@@ -181,9 +181,9 @@ fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
'Belisha Beacon broken',
],
asset_item: 'belisha beacon'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
+fixmystreet.assets.add(labeled_defaults, {
stylemap: streetlight_stylemap_alt,
http_options: {
params: {
@@ -196,9 +196,9 @@ fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
'Traffic lights & crossings problems with timings',
],
asset_item: 'crossing'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
+fixmystreet.assets.add(labeled_defaults, {
http_options: {
params: {
TYPENAME: "Signs_Union"
@@ -209,9 +209,9 @@ fixmystreet.assets.add($.extend(true, {}, labeled_defaults, {
'Sign problem',
],
asset_item: 'sign'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "Gullies"
@@ -221,7 +221,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
'Blocked drain'
],
asset_item: 'drain'
-}));
+});
// The "whole street asset" layer indicates who is responsible for maintaining
// a road via the 'feature_ty' attribute on features.
@@ -301,7 +301,7 @@ $(fixmystreet).on('report_new:highways_change', function() {
});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "Whole_Street"
@@ -360,7 +360,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
},
filter_key: 'feature_ty',
filter_value: types_to_show,
-}));
+});
// As with the road found/not_found above, we want to change the destination
// depending upon the answer to the extra question shown when on a road
@@ -374,7 +374,7 @@ $("#problem_form").on("change", "#form_road-placement", function() {
}
});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "WinterRoutes"
@@ -407,7 +407,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
$("#category_meta .js-gritting-notice").hide();
}
}
-}));
+});
fixmystreet.message_controller.register_category({
body: defaults.body,
diff --git a/web/cobrands/buckinghamshire/js.js b/web/cobrands/buckinghamshire/js.js
index a5d4969d9..6be03f91f 100644
--- a/web/cobrands/buckinghamshire/js.js
+++ b/web/cobrands/buckinghamshire/js.js
@@ -6,13 +6,13 @@ if (!fixmystreet.maps) {
var org_id = '1016';
var body = "Buckinghamshire County Council";
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_future, {
+fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
http_options: { params: { organisation_id: org_id } },
body: body
-}));
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_planned, {
+});
+fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
http_options: { params: { organisation_id: org_id } },
body: body
-}));
+});
})();
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index ad14b9390..d367eae8c 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -513,7 +513,9 @@ fixmystreet.assets = {
return selected_feature;
},
- add: function(options) {
+ add: function(default_options, options) {
+ options = $.extend(true, {}, default_options, options);
+
var asset_fault_layer = null;
// An interactive layer for selecting an asset (e.g. street light)
diff --git a/web/cobrands/highways/assets.js b/web/cobrands/highways/assets.js
index 5f361e491..8f4734131 100644
--- a/web/cobrands/highways/assets.js
+++ b/web/cobrands/highways/assets.js
@@ -31,7 +31,7 @@ var highways_stylemap = new OpenLayers.StyleMap({
})
});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "Highways"
@@ -72,7 +72,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
$('#highways').remove();
}
}
-}));
+});
function add_highways_warning(road_name) {
var $warning = $('<div class="box-warning" id="highways"><p>It looks like you clicked on the <strong>' + road_name + '</strong> which is managed by <strong>Highways England</strong>. ' +
diff --git a/web/cobrands/lincolnshire/assets.js b/web/cobrands/lincolnshire/assets.js
index f4b1861a9..b36b04b64 100644
--- a/web/cobrands/lincolnshire/assets.js
+++ b/web/cobrands/lincolnshire/assets.js
@@ -29,7 +29,7 @@ var defaults = {
body: "Lincolnshire County Council"
};
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "SL_Bollards"
@@ -37,9 +37,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
},
asset_category: "Bollards (lit)",
asset_item: 'bollard'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "SL_Street_Light_Units"
@@ -51,9 +51,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
filter_value: [
"SL: Bulkhead Lighting", "SL: Refuge Beacon", "SL: Street Lighting Unit"
]
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "SL_Street_Light_Units"
@@ -63,7 +63,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
asset_item: 'light',
filter_key: 'Type',
filter_value: "SL: Subway Lighting Unit"
-}));
+});
function get_barrier_stylemap() {
return new OpenLayers.StyleMap({
@@ -86,7 +86,7 @@ function get_barrier_stylemap() {
});
}
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "Safety_Barriers"
@@ -98,9 +98,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
filter_value: "ST: Safety Barrier",
stylemap: get_barrier_stylemap(),
max_resolution: 1.194328566789627
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "LCC_Drainage-GulliesOffletsManholes"
@@ -108,9 +108,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
},
asset_category: "Blocked drain",
asset_item: 'drain'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "ST_All_Structures"
@@ -122,9 +122,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
filter_value: [
"ST: Culvert 1 Cell", "ST: Culvert 2+ Cells", "ST: Culvert/Pipe"
]
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "SL_Lit_Signs"
@@ -132,9 +132,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
},
asset_category: "Sign (lit)",
asset_item: 'street sign'
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "ST_All_Structures"
@@ -151,9 +151,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
"ST: Bridge Ped/Cycle 2+ Spans", "ST: Bridge Vehicular 1 Span",
"ST: Bridge Vehicular 2-3 Spans", "ST: Bridge Vehicular 4+ Spans"
]
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "Carriageway"
@@ -179,9 +179,9 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
stroke: false
})
})
-}));
+});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "NSG"
@@ -200,7 +200,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
})
})
-}));
+});
var llpg_stylemap = new OpenLayers.StyleMap({
'default': new OpenLayers.Style({
@@ -218,7 +218,7 @@ var llpg_stylemap = new OpenLayers.StyleMap({
})
});
-fixmystreet.assets.add($.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
http_options: {
params: {
TYPENAME: "LLPG"
@@ -229,6 +229,6 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
stylemap: llpg_stylemap,
non_interactive: true,
always_visible: true
-}));
+});
})();
diff --git a/web/cobrands/lincolnshire/roadworks.js b/web/cobrands/lincolnshire/roadworks.js
index 760e8f00e..0e8923607 100644
--- a/web/cobrands/lincolnshire/roadworks.js
+++ b/web/cobrands/lincolnshire/roadworks.js
@@ -4,10 +4,10 @@ if (!fixmystreet.maps) {
return;
}
-fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_future, {
+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.
diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index c6632de5c..cae4c26a5 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -385,7 +385,7 @@ var northants_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaults, {
$.each(layers, function(index, layer) {
if ( layer.categories ) {
- fixmystreet.assets.add($.extend(true, {}, northants_defaults, {
+ fixmystreet.assets.add(northants_defaults, {
http_options: {
layerid: layer.layer,
layerVersion: layer.version,
@@ -393,7 +393,7 @@ $.each(layers, function(index, layer) {
asset_type: layer.asset_type || 'spot',
asset_category: layer.categories,
asset_item: layer.item_name || layer.layer_name.toLowerCase(),
- }));
+ });
}
});
@@ -422,7 +422,7 @@ var northants_road_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaul
});
-fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
+fixmystreet.assets.add(northants_road_defaults, {
http_options: {
layerid: 221,
layerVersion: '221.4-',
@@ -433,7 +433,7 @@ fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
asset_category: [
"Damaged Speed Humps",
]
-}));
+});
var barrier_style = new OpenLayers.Style({
fill: false,
@@ -442,7 +442,7 @@ var barrier_style = new OpenLayers.Style({
strokeWidth: 4
});
-fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
+fixmystreet.assets.add(northants_road_defaults, {
http_options: {
layerid: is_live ? 1068 : 230,
layerVersion: is_live ? '1068.1-' : '230.4-',
@@ -456,7 +456,7 @@ fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
asset_category: [
"Pedestrian Barriers - Damaged / Missing",
]
-}));
+});
var highways_style = new OpenLayers.Style({
fill: false,
@@ -465,7 +465,7 @@ var highways_style = new OpenLayers.Style({
strokeWidth: 7
});
-fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
+fixmystreet.assets.add(northants_road_defaults, {
protocol_class: OpenLayers.Protocol.Alloy,
http_options: {
layerid: is_live ? 20 : 308,
@@ -503,7 +503,7 @@ fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
"Restricted Visibility / Overgrown / Overhanging",
"Restricted Visibility",
]
-}));
+});
var prow_style = new OpenLayers.Style({
@@ -513,7 +513,7 @@ var prow_style = new OpenLayers.Style({
strokeWidth: 7
});
-fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
+fixmystreet.assets.add(northants_road_defaults, {
http_options: {
layerid: 173,
layerVersion: '173.1-',
@@ -527,7 +527,7 @@ fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, {
"Livestock",
"Passage-Obstructed/Overgrown"
]
-}));
+});
fixmystreet.message_controller.register_category({
body: northants_defaults.body,
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 17:53:19 +0000