diff --git a/js/beestat/setting.js b/js/beestat/setting.js index 447b7b0..cdc10c6 100644 --- a/js/beestat/setting.js +++ b/js/beestat/setting.js @@ -74,11 +74,11 @@ beestat.setting = function(argument_1, opt_value, opt_callback) { .format('MM/DD/YYYY'), 'visualize.range_static.end': moment() .format('MM/DD/YYYY'), - 'visualize.heat_map_values': 'relative', - 'visualize.heat_map_absolute.temperature.min': 70, - 'visualize.heat_map_absolute.temperature.max': 80, - 'visualize.heat_map_absolute.occupancy.min': 0, - 'visualize.heat_map_absolute.occupancy.max': 100, + 'visualize.heat_map_values': 'dynamic', + 'visualize.heat_map_static.temperature.min': 70, + 'visualize.heat_map_static.temperature.max': 80, + 'visualize.heat_map_static.occupancy.min': 0, + 'visualize.heat_map_static.occupancy.max': 100, 'visualize.hide_affiliate': false, 'visualize.three_d.show_labels': false, 'visualize.three_d.auto_rotate': false, diff --git a/js/component/card/three_d.js b/js/component/card/three_d.js index 1452970..07055a9 100644 --- a/js/component/card/three_d.js +++ b/js/component/card/three_d.js @@ -10,10 +10,10 @@ beestat.component.card.three_d = function() { [ 'setting.visualize.data_type', 'setting.visualize.heat_map_values', - 'setting.visualize.heat_map_absolute.temperature.min', - 'setting.visualize.heat_map_absolute.temperature.max', - 'setting.visualize.heat_map_absolute.occupancy.min', - 'setting.visualize.heat_map_absolute.occupancy.max' + 'setting.visualize.heat_map_static.temperature.min', + 'setting.visualize.heat_map_static.temperature.max', + 'setting.visualize.heat_map_static.occupancy.min', + 'setting.visualize.heat_map_static.occupancy.max' ], function() { self.update_scene_(); self.update_hud_(); @@ -1114,11 +1114,11 @@ beestat.component.card.three_d.prototype.set_floor_plan_id = function(floor_plan * @return {number} */ beestat.component.card.three_d.prototype.get_heat_map_min_ = function() { - if (beestat.setting('visualize.heat_map_values') === 'relative') { + if (beestat.setting('visualize.heat_map_values') === 'dynamic') { return this.data_.metadata.series[beestat.setting('visualize.data_type')].min; } return beestat.setting( - 'visualize.heat_map_absolute.' + + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.min' ) / (beestat.setting('visualize.data_type') === 'occupancy' ? 100 : 1); @@ -1130,11 +1130,11 @@ beestat.component.card.three_d.prototype.get_heat_map_min_ = function() { * @return {number} */ beestat.component.card.three_d.prototype.get_heat_map_max_ = function() { - if (beestat.setting('visualize.heat_map_values') === 'relative') { + if (beestat.setting('visualize.heat_map_values') === 'dynamic') { return this.data_.metadata.series[beestat.setting('visualize.data_type')].max; } return beestat.setting( - 'visualize.heat_map_absolute.' + + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.max' ) / (beestat.setting('visualize.data_type') === 'occupancy' ? 100 : 1); diff --git a/js/component/card/visualize_settings.js b/js/component/card/visualize_settings.js index 1f75a96..e840583 100644 --- a/js/component/card/visualize_settings.js +++ b/js/component/card/visualize_settings.js @@ -163,7 +163,7 @@ beestat.component.card.visualize_settings.prototype.decorate_heat_map_values_ = }); tile_group.render($(container)); - if (beestat.setting('visualize.heat_map_values') === 'absolute') { + if (beestat.setting('visualize.heat_map_values') === 'static') { const min_max_container = document.createElement('div'); container.appendChild(min_max_container); @@ -190,14 +190,14 @@ beestat.component.card.visualize_settings.prototype.decorate_heat_map_values_ = }) .set_value( beestat.temperature(beestat.setting( - 'visualize.heat_map_absolute.' + beestat.setting('visualize.data_type') + '.min' + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.min' )) ) .set_width(50); min.addEventListener('change', function() { if (min.meets_requirements() === true) { beestat.setting( - 'visualize.heat_map_absolute.' + beestat.setting('visualize.data_type') + '.min', + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.min', beestat.temperature({ 'temperature': min.get_value(), 'input_temperature_unit': beestat.setting('units.temperature'), @@ -207,7 +207,7 @@ beestat.component.card.visualize_settings.prototype.decorate_heat_map_values_ = } else { min.set_value( beestat.temperature(beestat.setting( - 'visualize.heat_map_absolute.' + beestat.setting('visualize.data_type') + '.min' + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.min' )), false ); @@ -223,7 +223,7 @@ beestat.component.card.visualize_settings.prototype.decorate_heat_map_values_ = }) .set_value( beestat.temperature(beestat.setting( - 'visualize.heat_map_absolute.' + beestat.setting('visualize.data_type') + '.max' + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.max' )), false ) @@ -235,7 +235,7 @@ beestat.component.card.visualize_settings.prototype.decorate_heat_map_values_ = max.set_value(value, false); beestat.setting( - 'visualize.heat_map_absolute.' + beestat.setting('visualize.data_type') + '.max', + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.max', beestat.temperature({ 'temperature': max.get_value(), 'input_temperature_unit': beestat.setting('units.temperature'), @@ -245,7 +245,7 @@ beestat.component.card.visualize_settings.prototype.decorate_heat_map_values_ = } else { max.set_value( beestat.temperature(beestat.setting( - 'visualize.heat_map_absolute.' + beestat.setting('visualize.data_type') + '.max' + 'visualize.heat_map_static.' + beestat.setting('visualize.data_type') + '.max' )), false );