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

Bugfix: Don't crash if no data could be found for a specific reading type

Browse source
This commit is contained in:
Starbeamrainbowlabs 2019-06-30 21:41:28 +01:00
parent 902b17eed4
commit 659af6cf5d
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client_src/js/Overlay/OverlaySpecs.mjs
View file

@ -87,12 +87,20 @@ var pressure = {
"1100": "#BFED91" "1100": "#BFED91"
} }
}; };
var unknown = {
max: 100,
gradient: {
"0": "green",
"100": "red"
}
}
var specs = { var specs = {
PM10, PM25, PM10, PM25,
humidity, humidity,
temperature, temperature,
pressure pressure,
unknown
}; };
export default specs; export default specs;
@ -100,5 +108,6 @@ export {
PM10, PM25, PM10, PM25,
humidity, humidity,
temperature, temperature,
pressure pressure,
unknown
}; };

13
client_src/js/Overlay/VoronoiManager.mjs
View file

@ -52,16 +52,25 @@ class VoronoiManager {
this.last_datetime = datetime; this.last_datetime = datetime;
this.last_reading_type = reading_type; this.last_reading_type = reading_type;
this.spec = Specs[reading_type]; this.spec = Specs[reading_type] || Specs["unknown"];
if(typeof this.spec.chroma == "undefined") if(typeof this.spec.chroma == "undefined")
this.spec.chroma = chroma.scale(Object.values(this.spec.gradient)) this.spec.chroma = chroma.scale(Object.values(this.spec.gradient))
.domain(Object.keys(this.spec.gradient)); .domain(Object.keys(this.spec.gradient));
this.guage.set_spec(this.spec); this.guage.set_spec(this.spec);
this.guage.render(); this.guage.render();
let dataset = JSON.parse(await GetFromUrl(
let dataset = null;
try {
dataset = JSON.parse(await GetFromUrl(
`${Config.api_root}?action=fetch-data&datetime=${encodeURIComponent(datetime.toISOString())}&reading_type=${encodeURIComponent(reading_type)}` `${Config.api_root}?action=fetch-data&datetime=${encodeURIComponent(datetime.toISOString())}&reading_type=${encodeURIComponent(reading_type)}`
)); ));
}
catch(error) { // string
document.querySelector("main").classList.remove("working-visual");
alert(error);
throw new Error(error);
}
let result = []; let result = [];
for(let row of dataset) { for(let row of dataset) {