sbrl-github/Air-Quality-Web
1
0
Fork 0
mirror of https://github.com/ConnectedHumber/Air-Quality-Web synced 2024-12-22 10:25:01 +00:00
Code Issues Releases Wiki Activity

Rewire the UI to updaate the device markers, nott he old heatmap

Browse source
This commit is contained in:
Starbeamrainbowlabs 2021-01-30 21:16:02 +00:00
parent 3fe326b02d
commit 79064955a5
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
2 changed files with 2 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
client_src/js/MapManager.mjs
View file

@ -8,8 +8,6 @@ import 'leaflet-easyprint';
import Config from './Config.mjs'; import Config from './Config.mjs';
import LayerDeviceMarkers from './LayerDeviceMarkers.mjs'; import LayerDeviceMarkers from './LayerDeviceMarkers.mjs';
// import LayerHeatmap from './LayerHeatmap.mjs';
// import LayerHeatmapGlue from './LayerHeatmapGlue.mjs';
import DeviceData from './DeviceData.mjs'; import DeviceData from './DeviceData.mjs';
import ReadingsData from './ReadingsData.mjs'; import ReadingsData from './ReadingsData.mjs';
import UI from './UI.mjs'; import UI from './UI.mjs';
@ -58,50 +56,9 @@ class MapManager {
.then(() => console.info("[map] Device markers loaded successfully.")), .then(() => console.info("[map] Device markers loaded successfully.")),
]).then(() => document.querySelector("main").classList.remove("working-visual")); ]).then(() => document.querySelector("main").classList.remove("working-visual"));
// Add the heatmap
// console.info("[map] Loading heatmap....");
// this.setup_heatmap()
// .then(() => console.info("[map] Heatmap loaded successfully."))
// // ...and the time dimension
// .then(this.setup_time_dimension.bind(this))
// .then(() => console.info("[map] Time dimension initialised."));
} }
setup_time_dimension() { // NOTE: We tried leaflet-time-dimension for changing the time displayed, but it didn't work out
// FUTURE: Replace leaflet-time-dimension with our own solution that's got a better ui & saner API?
this.layer_time = new L.TimeDimension({
period: "PT1H", // 1 hour
timeInterval: `2019-01-01T12:00:00Z/${new Date().toISOString()}`
});
//this.layer_time.on("timeloading", console.log.bind(null, "timeloading"));
this.layer_time_player = new L.TimeDimension.Player({
transitionTime: 500,
loop: false,
startOver: true,
buffer: 10 // Default: 5
}, this.layer_time);
this.layer_time_control = new L.Control.TimeDimension({
player: this.layer_time_player,
timeDimension: this.layer_time,
position: "bottomright",
autoplay: false,
minSpeed: 1,
speedStep: 0.25,
maxSpeed: 15,
timeSliderDragUpdate: false
});
this.map.addControl(this.layer_time_control);
// Create the time dimension <---> heatmap glue object
this.layer_heatmap_glue = new LayerHeatmapGlue(
this.layer_time,
this.heatmap
);
this.layer_heatmap_glue.attachTo(this.map);
}
async setup_device_markers() { async setup_device_markers() {
this.device_markers = new LayerDeviceMarkers(this, this.device_data); this.device_markers = new LayerDeviceMarkers(this, this.device_data);

2
client_src/js/UI.mjs
View file

@ -63,7 +63,7 @@ class UI {
document.querySelector("main").classList.add("working-visual"); document.querySelector("main").classList.add("working-visual");
await this.map_manager.overlay.update_reading_type(new_type); await this.map_manager.device_markers.update_markers(new_type);
document.querySelector("main").classList.remove("working-visual"); document.querySelector("main").classList.remove("working-visual");
}).bind(this) }).bind(this)
}, },