From 073ff8916432713807b7d96df9ab42755816474a Mon Sep 17 00:00:00 2001 From: Chase Porter Date: Wed, 3 Nov 2021 12:55:25 -0700 Subject: [PATCH] FEATURE: Add ability to show marker labels by default. --- fdds/js/components/timeSeriesController.js | 7 ++++++- fdds/js/components/timeSeriesMarker.js | 4 +++- fdds/js/simVars.js | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fdds/js/components/timeSeriesController.js b/fdds/js/components/timeSeriesController.js index 0d1abac..c55e381 100644 --- a/fdds/js/components/timeSeriesController.js +++ b/fdds/js/components/timeSeriesController.js @@ -4,7 +4,7 @@ import { simVars } from '../simVars.js'; import { map } from '../map.js'; import { Marker } from './timeSeriesMarker.js'; import { TimeSeriesButton } from './timeSeriesButton.js'; -import { doubleClick } from '../util.js'; +import { buildCheckBox, doubleClick } from '../util.js'; const TIMESERIES_BATCHSIZE = 10; const TIMEOUT_MS = 80; @@ -44,7 +44,12 @@ export class TimeSeriesController extends LayerController { timeSeriesDiv.id = 'timeseries-layer-group'; const h4 = document.createElement('h4'); h4.innerText = 'Timeseries over all Markers'; + const showMarkersCallback = () => { + simVars.showMarkers = !simVars.showMarkers; + } + const checkbox = buildCheckBox('show-markers', 'checkbox', 'show-markers', true, showMarkersCallback); timeSeriesDiv.appendChild(h4); + timeSeriesDiv.appendChild(checkbox); timeSeriesDiv.appendChild(this.timeSeriesButton); container.appendChild(timeSeriesDiv); } diff --git a/fdds/js/components/timeSeriesMarker.js b/fdds/js/components/timeSeriesMarker.js index 1bce1a2..c546159 100644 --- a/fdds/js/components/timeSeriesMarker.js +++ b/fdds/js/components/timeSeriesMarker.js @@ -2,6 +2,7 @@ import { isolateFocus, rgbToHex } from '../util.js'; import { map } from '../map.js'; import { controllers } from './Controller.js'; import { TimeSeriesButton } from './timeSeriesButton.js'; +import { simVars } from '../simVars.js'; export class TimeSeriesMarker extends HTMLElement { constructor(latLon) { @@ -134,7 +135,8 @@ export class Marker { this.timeSeriesMarker = new TimeSeriesMarker(latLon, coords); this.timeSeriesMarker.bindHide(() => this.hideMarkerInfo()); this.popup.setContent(this.timeSeriesMarker); - this.popup.getElement().style.display = 'none'; + let display = simVars.showMarkers ? 'block' : 'none'; + this.popup.getElement().style.display = display; let svgString = ` diff --git a/fdds/js/simVars.js b/fdds/js/simVars.js index 2913fa6..053472e 100644 --- a/fdds/js/simVars.js +++ b/fdds/js/simVars.js @@ -55,6 +55,7 @@ export const simVars = (function createSimVars() { startTime: null, endTime: null, displayedColorbar: null, + showMarkers: true, organization: 'WIRC', overlayList: ['WINDVEC', 'WINDVEC1000FT', 'WINDVEC4000FT', 'WINDVEC6000FT', 'SMOKE1000FT', 'SMOKE4000FT', 'SMOKE6000FT', 'FIRE_AREA', 'SMOKE_INT', 'FGRNHFX', 'FLINEINT'], baseLayerDict: { -- 2.11.4.GIT