From 5e84581c82e171114cb8f3d0d4ec375ba09b387e Mon Sep 17 00:00:00 2001 From: royallsilwallz Date: Thu, 18 Jan 2024 14:49:44 +0545 Subject: [PATCH 1/3] Fix console error for `unsupported style property` in `Live Monitoring` --- frontend/src/views/projectLiveMonitoring.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/projectLiveMonitoring.js b/frontend/src/views/projectLiveMonitoring.js index 39404fb9f8..68a53bb0fb 100644 --- a/frontend/src/views/projectLiveMonitoring.js +++ b/frontend/src/views/projectLiveMonitoring.js @@ -330,7 +330,7 @@ export function ProjectLiveMonitoring() { Date: Thu, 18 Jan 2024 16:47:55 +0545 Subject: [PATCH 2/3] Show `Live Monitoring` button only for `PUBLISHED` projects --- frontend/src/components/projectDetail/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/projectDetail/index.js b/frontend/src/components/projectDetail/index.js index 4b55e9b794..91547cc215 100644 --- a/frontend/src/components/projectDetail/index.js +++ b/frontend/src/components/projectDetail/index.js @@ -362,8 +362,11 @@ export const ProjectDetail = (props) => { className="bg-white blue-dark ba b--grey-light pa3" /> - {/* show live view button only when the project has live monitoring feature */} - {hasLiveMonitoringFeature && ( + {/* + show live view button only for published projects & + when the project has live monitoring feature + */} + {props.project.status === 'PUBLISHED' && hasLiveMonitoringFeature && ( Date: Thu, 18 Jan 2024 16:49:14 +0545 Subject: [PATCH 3/3] Change `Bing Imagery URL` to `https` in `Live Monitoring` --- frontend/src/views/projectLiveMonitoring.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/projectLiveMonitoring.js b/frontend/src/views/projectLiveMonitoring.js index 68a53bb0fb..1b4931eff2 100644 --- a/frontend/src/views/projectLiveMonitoring.js +++ b/frontend/src/views/projectLiveMonitoring.js @@ -39,6 +39,13 @@ const config = { attribution: '© OpenStreetMap Contributors', maxzoom: 19, }, + Bing: { + type: 'raster', + tiles: ['https://ecn.t3.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=1'], + tileSize: 256, + attribution: '© OpenStreetMap Contributors', + maxzoom: 18, + }, Mapbox: { type: 'raster', tiles: [ @@ -57,13 +64,6 @@ const config = { attribution: '© OpenStreetMap Contributors © ESRI', maxzoom: 18, }, - Bing: { - type: 'raster', - tiles: ['http://ecn.t3.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=1'], - tileSize: 256, - attribution: '© OpenStreetMap Contributors', - maxzoom: 18, - }, }, };