Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set AQI as unit for the WAQI integration, fix AirVisual bugs #68

Merged
merged 9 commits into from
Nov 19, 2024
Merged

Set AQI as unit for the WAQI integration, fix AirVisual bugs #68

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
399536a
AQI as dominant pollutant for WAQI
Chreece Nov 11, 2024
9aafca0
No default weather entity
Chreece Nov 12, 2024
b69eb58
try to fix AirVisual Classsification
Chreece Nov 12, 2024
a83ded1
Merge branch 'master' of https://github.com/Chreece/air-visual-card
Chreece Nov 12, 2024
1fc9a4a
modified: dist/air-visual-card.js
Chreece Nov 12, 2024
8760fab
modified: dist/air-visual-card.js
Chreece Nov 12, 2024
43f4ec1
some fixes
Chreece Nov 12, 2024
1459db0
Merge pull request #2 from Chreece/dev
Chreece Nov 12, 2024
97941ee
fix AirVisual
Chreece Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions dist/air-visual-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class AirVisualCard extends HTMLElement {
return { air_pollution_level: "sensor.u_s_air_pollution_level",
air_quality_index: "sensor.u_s_air_quality_index",
main_pollutant: "sensor.u_s_main_pollutant",
weather: "weather.home",
weather: "",
hide_weather: 1,
hide_title: 1,
unit_of_measurement: "AQI",
Expand Down Expand Up @@ -258,7 +258,6 @@ class AirVisualCard extends HTMLElement {
const aqiSensor = { name: 'aqiSensor', config: config.air_quality_index || null, value: 0 };
const aplSensor = { name: 'aplSensor', config: config.air_pollution_level || null, value: 0 };
const mainPollutantSensor = { name: 'mainPollutantSensor', config: config.main_pollutant || null, value: '' };
const sensorList = [aqiSensor, aplSensor, mainPollutantSensor];
const validPollutants = ['co', 'no2', 'o3', 'so2', 'pm10', 'pm25', 'neph'];
const unitOfMeasurement = config.unit_of_measurement || 'AQI';

Expand Down Expand Up @@ -377,7 +376,7 @@ class AirVisualCard extends HTMLElement {
let getAQI = function () {
switch (true) {
case (aqiSensor.value <= 50):
return '1'; // return string '1' to pull appropriate AQI icon filename ('ic-face-1.svg') in HTML
return '1';
case (aqiSensor.value <= 100):
return '2';
case (aqiSensor.value <= 150):
Expand All @@ -386,7 +385,7 @@ class AirVisualCard extends HTMLElement {
return '4';
case (aqiSensor.value <= 300):
return '5';
case (aqiSensor.value <= 9999):
case (aqiSensor.value > 300):
return '6';
default:
return '1';
Expand All @@ -404,25 +403,24 @@ class AirVisualCard extends HTMLElement {
mainPollutant = mainAirVisualPollutantValue[hass.states[mainPollutantSensor.config].attributes['pollutant_symbol']];
} else if (validPollutants.includes(mpParse)) {
mainPollutant = mainPollutantValue[mpParse];
pollutantUnit = mainPollutantUnit[mpParse];
pollutantUnit = 'AQI';
} else {
pollutantUnit = 'pollutant unit';
mainPollutant = 'main pollutant';
}
}
if (typeof hass.states[aqiSensor.config] != "undefined") {
aqiSensor.value = hass.states[aqiSensor.config].state;
}
// Check if APL is an WAQI sensor (because the state is an integer). Returns 'NaN' if it is not a number
if (typeof hass.states[aplSensor.config] != "undefined") {
let aplParse = parseInt(hass.states[aplSensor.config].state);
let aplParse = parseInt(hass.states[aqiSensor.config].state);
aqiSensor.value = aplParse;
if (!isNaN(aplParse)) {
apl = APLdescription[getAQI()];
} else {
let aplState = hass.states[aplSensor.config].state;
apl = hass.localize("component.sensor.state.airvisual__pollutant_level." + aplState)
}
} else if (aqiSensor.value != 0) {
} else if (typeof hass.states[aqiSensor.config] != "undefined") {
aqiSensor.value = hass.states[aqiSensor.config].state;
apl = APLdescription[getAQI()];
}

Expand Down