diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/cobrands/bexley/js.js | 31 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/assets.js | 17 |
2 files changed, 38 insertions, 10 deletions
diff --git a/web/cobrands/bexley/js.js b/web/cobrands/bexley/js.js index 24643e4db..89f52a7fb 100644 --- a/web/cobrands/bexley/js.js +++ b/web/cobrands/bexley/js.js @@ -74,10 +74,33 @@ fixmystreet.assets.add(road_defaults, { } }, nearest_radius: 100, - usrn: { - attribute: 'NSG_REF', - field: 'NSGRef' - } + usrn: [ + { + attribute: 'NSG_REF', + field: 'NSGRef' + }, + { + attribute: 'NSG_REF', + field: 'site_code' + } + ] +}); + +fixmystreet.assets.add(defaults, { + http_options: { + url: "https://tilma.staging.mysociety.org/mapserver/bexley", + params: { + TYPENAME: "Trees" + } + }, + asset_id_field: 'central_as', + attributes: { + central_asset_id: 'central_as', + site_code: 'site_code' + }, + asset_type: 'spot', + asset_category: ['Street', 'TPO enquiry'], + asset_item: 'tree' }); fixmystreet.assets.add(labeled_defaults, { diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js index 25c1ac08e..c311b0f5f 100644 --- a/web/cobrands/fixmystreet/assets.js +++ b/web/cobrands/fixmystreet/assets.js @@ -236,14 +236,19 @@ OpenLayers.Layer.VectorNearest = OpenLayers.Class(OpenLayers.Layer.VectorAsset, updateUSRNField: function() { if (this.fixmystreet.usrn) { - var usrn_field = this.fixmystreet.usrn.field; - var selected_usrn; - if ( this.selected_feature ) { - selected_usrn = this.fixmystreet.getUSRN ? + if (!this.fixmystreet.usrn.length) { + this.fixmystreet.usrn = [this.fixmystreet.usrn]; + } + for (var i = 0; i < this.fixmystreet.usrn.length; i++) { + var usrn = this.fixmystreet.usrn[i]; + var selected_usrn; + if ( this.selected_feature ) { + selected_usrn = this.fixmystreet.getUSRN ? this.fixmystreet.getUSRN(this.selected_feature) : - this.selected_feature.attributes[this.fixmystreet.usrn.attribute]; + this.selected_feature.attributes[usrn.attribute]; + } + $("input[name=" + usrn.field + "]").val(selected_usrn); } - $("input[name=" + usrn_field + "]").val(selected_usrn); } }, |