diff options
| -rw-r--r-- | web/js/map-OpenLayers.js | 12 | ||||
| -rw-r--r-- | web/js/map-wmts-bristol.js | 12 | ||||
| -rw-r--r-- | web/js/map-wmts-buckinghamshire.js | 12 | ||||
| -rw-r--r-- | web/js/map-wmts-hounslow.js | 12 | ||||
| -rw-r--r-- | web/js/map-wmts-isleofwight.js | 23 | ||||
| -rw-r--r-- | web/js/map-wmts-zurich.js | 12 |
6 files changed, 18 insertions, 65 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index eb62904b0..c02c72bae 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -250,9 +250,11 @@ $.extend(fixmystreet.utils, { marker_size: function() { var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 15) { + var size_normal = fixmystreet.maps.zoom_for_normal_size || 15; + var size_small = fixmystreet.maps.zoom_for_small_size || 13; + if (zoom >= size_normal) { return window.selected_problem_id ? 'small' : 'normal'; - } else if (zoom >= 13) { + } else if (zoom >= size_small) { return window.selected_problem_id ? 'mini' : 'small'; } else { return 'mini'; @@ -261,9 +263,11 @@ $.extend(fixmystreet.utils, { selected_marker_size: function() { var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 15) { + var size_normal = fixmystreet.maps.zoom_for_normal_size || 15; + var size_small = fixmystreet.maps.zoom_for_small_size || 13; + if (zoom >= size_normal) { return 'big'; - } else if (zoom >= 13) { + } else if (zoom >= size_small) { return 'normal'; } else { return 'small'; diff --git a/web/js/map-wmts-bristol.js b/web/js/map-wmts-bristol.js index 757f347df..2090fa0cf 100644 --- a/web/js/map-wmts-bristol.js +++ b/web/js/map-wmts-bristol.js @@ -115,13 +115,5 @@ fixmystreet.maps.config = function() { this.setup_wmts_base_map(); }; -fixmystreet.maps.marker_size = function() { - var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 7) { - return 'normal'; - } else if (zoom >= 4) { - return 'small'; - } else { - return 'mini'; - } -}; +fixmystreet.maps.zoom_for_normal_size = 7; +fixmystreet.maps.zoom_for_small_size = 4; diff --git a/web/js/map-wmts-buckinghamshire.js b/web/js/map-wmts-buckinghamshire.js index ee5ac8753..ae44cdf13 100644 --- a/web/js/map-wmts-buckinghamshire.js +++ b/web/js/map-wmts-buckinghamshire.js @@ -130,13 +130,5 @@ fixmystreet.maps.config = function() { this.setup_wmts_base_map(); }; -fixmystreet.maps.marker_size = function() { - var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 7) { - return 'normal'; - } else if (zoom >= 4) { - return 'small'; - } else { - return 'mini'; - } -}; +fixmystreet.maps.zoom_for_normal_size = 7; +fixmystreet.maps.zoom_for_small_size = 4; diff --git a/web/js/map-wmts-hounslow.js b/web/js/map-wmts-hounslow.js index 1f8927b3f..d021fab50 100644 --- a/web/js/map-wmts-hounslow.js +++ b/web/js/map-wmts-hounslow.js @@ -177,13 +177,5 @@ fixmystreet.maps.config = function() { this.setup_wmts_base_map(); }; -fixmystreet.maps.marker_size = function() { - var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 8) { - return 'normal'; - } else if (zoom >= 4) { - return 'small'; - } else { - return 'mini'; - } -}; +fixmystreet.maps.zoom_for_normal_size = 8; +fixmystreet.maps.zoom_for_small_size = 4; diff --git a/web/js/map-wmts-isleofwight.js b/web/js/map-wmts-isleofwight.js index 464bee913..57e41e696 100644 --- a/web/js/map-wmts-isleofwight.js +++ b/web/js/map-wmts-isleofwight.js @@ -183,24 +183,5 @@ fixmystreet.maps.config = function() { this.setup_wmts_base_map(); }; -fixmystreet.maps.marker_size = function() { - var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 7) { - return 'normal'; - } else if (zoom >= 4) { - return 'small'; - } else { - return 'mini'; - } -}; - -fixmystreet.maps.selected_marker_size = function() { - var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 7) { - return 'big'; - } else if (zoom >= 4) { - return 'normal'; - } else { - return 'small'; - } -}; +fixmystreet.maps.zoom_for_normal_size = 7; +fixmystreet.maps.zoom_for_small_size = 4; diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index 346e9b89a..436dca6ff 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -152,13 +152,5 @@ fixmystreet.maps.config = function() { fixmystreet.area_format = { fillColor: 'none', strokeWidth: 4, strokeColor: 'black' }; }; -fixmystreet.maps.marker_size = function() { - var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset; - if (zoom >= 6) { - return 'normal'; - } else if (zoom >= 3) { - return 'small'; - } else { - return 'mini'; - } -}; +fixmystreet.maps.zoom_for_normal_size = 6; +fixmystreet.maps.zoom_for_small_size = 3; |