diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/bathnes/assets.js | 2 | ||||
-rw-r--r-- | web/cobrands/bristol/assets.js | 6 | ||||
-rw-r--r-- | web/cobrands/bromley/assets.js | 2 | ||||
-rw-r--r-- | web/cobrands/buckinghamshire/assets.js | 2 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/assets.js | 7 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 4 | ||||
-rw-r--r-- | web/js/map-OpenLayers.js | 4 |
7 files changed, 22 insertions, 5 deletions
diff --git a/web/cobrands/bathnes/assets.js b/web/cobrands/bathnes/assets.js index e455d78e9..16ecb3076 100644 --- a/web/cobrands/bathnes/assets.js +++ b/web/cobrands/bathnes/assets.js @@ -23,7 +23,7 @@ fixmystreet.maps.banes_defaults = { asset_category: "", asset_item: "asset", asset_type: 'spot', - max_resolution: 2.388657133579254, + max_resolution: 4.777314267158508, min_resolution: 0.5971642833948135, asset_id_field: 'feature_no', attributes: null, diff --git a/web/cobrands/bristol/assets.js b/web/cobrands/bristol/assets.js index 6d2020bfe..1b32379dc 100644 --- a/web/cobrands/bristol/assets.js +++ b/web/cobrands/bristol/assets.js @@ -7,7 +7,10 @@ if (!fixmystreet.maps) { var options = { wfs_url: "https://maps.bristol.gov.uk/arcgis/services/ext/FixMyStreetSupportData/MapServer/WFSServer", wfs_feature: "COD_ASSETS_POINT", - max_resolution: 0.33072982812632296, + max_resolution: { + 'bristol': 0.33072982812632296, + 'fixmystreet': 4.777314267158508 + }, min_resolution: 0.00001, asset_id_field: 'COD_ASSET_ID', asset_type: 'spot', @@ -17,6 +20,7 @@ var options = { usrn: 'COD_USRN' }, body: "Bristol City Council", + srsName: "EPSG:27700", geometryName: 'SHAPE' }; diff --git a/web/cobrands/bromley/assets.js b/web/cobrands/bromley/assets.js index 959148e5d..32c00d32d 100644 --- a/web/cobrands/bromley/assets.js +++ b/web/cobrands/bromley/assets.js @@ -16,7 +16,7 @@ var defaults = { }, format_class: OpenLayers.Format.GML.v3.MultiCurveFix, asset_type: 'spot', - max_resolution: 2.388657133579254, + max_resolution: 4.777314267158508, min_resolution: 0.5971642833948135, asset_id_field: 'CENTRAL_AS', geometryName: 'msGeometry', diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js index 3f22774fc..57b2317a4 100644 --- a/web/cobrands/buckinghamshire/assets.js +++ b/web/cobrands/buckinghamshire/assets.js @@ -16,7 +16,7 @@ var defaults = { }, format_class: OpenLayers.Format.GML.v3.MultiCurveFix, asset_type: 'spot', - max_resolution: 2.388657133579254, + max_resolution: 4.777314267158508, min_resolution: 0.5971642833948135, asset_id_field: 'central_as', attributes: { diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js index f53d26bbb..31dcaec07 100644 --- a/web/cobrands/fixmystreet/assets.js +++ b/web/cobrands/fixmystreet/assets.js @@ -491,12 +491,17 @@ fixmystreet.assets = { options.asset_category = [ options.asset_category ]; } + var max_resolution = options.max_resolution; + if (typeof max_resolution === 'object') { + max_resolution = max_resolution[fixmystreet.cobrand]; + } + var layer_options = { fixmystreet: options, strategies: [new StrategyClass()], protocol: protocol, visibility: false, - maxResolution: options.max_resolution, + maxResolution: max_resolution, minResolution: options.min_resolution, styleMap: options.stylemap || get_asset_stylemap(), assets: true diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 1b863625f..7d7a51d4a 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -1168,6 +1168,10 @@ fixmystreet.display = { fixmystreet.maps.click_control.activate(); } + if (fixmystreet.maps.setup_inspector) { + fixmystreet.maps.setup_inspector(); + } + if (typeof callback === 'function') { callback(); } diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index b2b74648c..d95103f82 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -178,6 +178,10 @@ $.extend(fixmystreet.utils, { return lonlat; }, + setup_inspector: function() { + setup_inspector_marker_drag(); + }, + markers_list: function(pins, transform) { var markers = []; var size = fixmystreet.maps.marker_size(); |