aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/cheshireeast/assets.js29
-rw-r--r--web/js/map-OpenLayers.js12
-rw-r--r--web/js/map-cheshireeast.js33
-rw-r--r--web/js/map-wmts-bristol.js12
-rw-r--r--web/js/map-wmts-buckinghamshire.js12
-rw-r--r--web/js/map-wmts-hounslow.js12
-rw-r--r--web/js/map-wmts-isleofwight.js23
-rw-r--r--web/js/map-wmts-zurich.js12
8 files changed, 64 insertions, 81 deletions
diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js
index 1b1c254e3..435576408 100644
--- a/web/cobrands/cheshireeast/assets.js
+++ b/web/cobrands/cheshireeast/assets.js
@@ -6,8 +6,11 @@ if (!fixmystreet.maps) {
var defaults = {
wfs_url: "https://tilma.mysociety.org/mapserver/cheshireeast",
- max_resolution: 4.777314267158508,
- min_resolution: 0.5971642833948135,
+ max_resolution: {
+ fixmystreet: 4.777314267158508,
+ cheshireeast: 1.4000028000056002
+ },
+ min_resolution: 0.00001,
attributes: {
central_asset_id: 'central_as',
site_code: 'site_code'
@@ -62,29 +65,23 @@ fixmystreet.assets.add(labeled_defaults, {
asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map &raquo;'
});
-var road_defaults = $.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
stylemap: fixmystreet.assets.stylemap_invisible,
always_visible: true,
- non_interactive: true
-});
-
-fixmystreet.assets.add(road_defaults, {
+ non_interactive: true,
wfs_feature: 'AdoptedRoads',
usrn: {
attribute: 'site_code',
field: 'site_code'
- }
-});
-
-fixmystreet.assets.add(road_defaults, {
- wfs_feature: 'UnAdoptedRoads',
+ },
road: true,
+ no_asset_msg_id: '#js-not-a-road',
+ asset_item: 'road',
+ asset_type: 'road',
all_categories: true,
- no_asset_msg_id: '#js-not-council-road',
- // The functions assume allow when found, disallow when not found, so we want the reverse
actions: {
- found: fixmystreet.message_controller.road_not_found,
- not_found: fixmystreet.message_controller.road_found
+ found: fixmystreet.message_controller.road_found,
+ not_found: fixmystreet.message_controller.road_not_found
}
});
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 7781d845b..4af5e61d4 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-cheshireeast.js b/web/js/map-cheshireeast.js
new file mode 100644
index 000000000..cedc92dba
--- /dev/null
+++ b/web/js/map-cheshireeast.js
@@ -0,0 +1,33 @@
+fixmystreet.maps.config = function() {
+ fixmystreet.controls = [
+ new OpenLayers.Control.Attribution(),
+ new OpenLayers.Control.ArgParserFMS(),
+ new OpenLayers.Control.Navigation(),
+ new OpenLayers.Control.PermalinkFMS('map'),
+ new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
+ ];
+ /* Linking back to around from report page, keeping track of map moves */
+ if ( fixmystreet.page == 'report' ) {
+ fixmystreet.controls.push( new OpenLayers.Control.PermalinkFMS('key-tool-problems-nearby', '/around') );
+ }
+ fixmystreet.map_type = OpenLayers.Layer.CheshireEast;
+};
+
+OpenLayers.Layer.CheshireEast = OpenLayers.Class(OpenLayers.Layer.XYZ, {
+ url: 'https://maps-cache.cheshiresharedservices.gov.uk/maps/?wmts/CE_OS_AllBasemaps_COLOUR/oscce_grid/${z}/${x}/${y}.jpeg&KEY=3a3f5c60eca1404ea114e6941c9d3895',
+
+ initialize: function(name, options) {
+ options = OpenLayers.Util.extend({
+ units: "m",
+ projection: new OpenLayers.Projection("EPSG:27700"),
+ maxExtent: new OpenLayers.Bounds(-3276800, -3276800, 3276800, 3276800),
+ resolutions: [1792.003584007169, 896.0017920035843, 448.0008960017922, 224.0004480008961, 112.000224000448, 56.000112000224014, 28.000056000111993, 14.000028000056004, 7.000014000028002, 2.8000056000112004, 1.4000028000056002, 0.7000014000028001, 0.35000070000140004, 0.14000028000056003].slice(fixmystreet.zoomOffset || 0),
+ }, options);
+ OpenLayers.Layer.XYZ.prototype.initialize.call(this, name, this.url, options);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.CheshireEast"
+});
+
+fixmystreet.maps.zoom_for_normal_size = 7;
+fixmystreet.maps.zoom_for_small_size = 4;
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 08:41:54 +0000