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

Jump to bottom

Schedule Criteria: weather "clear sky" condition does not match #2740

Merged
merged 5 commits into from
Oct 2, 2024
Merged

Schedule Criteria: weather "clear sky" condition does not match #2740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e7f76d
Schedule Criteria: weather "clear sky" condition does not match (#3487)
nadzpogi Sep 18, 2024
18adf0f
Schedule Criteria: weather "clear sky" condition does not match (#3487)
nadzpogi Sep 19, 2024
94071ae
Schedule Criteria: weather "clear sky" condition does not match (#3487)
nadzpogi Sep 20, 2024
c1b4017
Schedule Criteria: weather "clear sky" condition does not match (#3487)
nadzpogi Oct 1, 2024
94f7506
Schedule Criteria: weather "clear sky" condition does not match (#3487)
nadzpogi Oct 2, 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
128 changes: 58 additions & 70 deletions lib/Connector/OpenWeatherMapConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
$sign = $offsetHours < 0 ? '-' : '+';

// Ensure the format is as follows: +/-hh:mm
$formattedOffset = sprintf("%s%02d:%02d", $sign, abs($offsetHours), abs($offsetMinutes));

Check failure on line 184 in lib/Connector/OpenWeatherMapConnector.php

View workflow job for this annotation

GitHub Actions / phpcs 

String "%s%02d:%02d" does not require double quotes; use single quotes instead

// Get the timezone name
$this->timezone = (new \DateTimeZone($formattedOffset))->getName();
Expand Down Expand Up @@ -665,55 +665,44 @@
{
// Initialize Open Weather Schedule Criteria parameters
$event->addType('weather', __('Weather'))
->addMetric('weather_condition', __('Weather Condition'))
->addValues('dropdown', [
'clear_sky' => __('Clear Sky'),
'few_clouds' => __('Few Clouds'),
'scattered_clouds' => __('Scattered Clouds'),
'broken_clouds' => __('Broken Clouds'),
'shower_rain' => __('Shower Rain'),
'rain' => __('Rain'),
'thunderstorm' => __('Thunderstorm'),
'snow' => __('Snow'),
'mist' => __('Mist')
])
->addMetric('temperature_imperial', __('Temperature (Imperial)'))
->addValues('number', [])
->addMetric('temperature_metric', __('Temperature (Metric)'))
->addValues('number', [])
->addMetric('apparent_temperature_imperial', __('Apparent Temperature (Imperial)'))
->addValues('number', [])
->addMetric('apparent_temperature_metric', __('Apparent Temperature (Metric)'))
->addValues('number', [])
->addMetric('wind_speed', __('Wind Speed'))
->addValues('number', [])
->addMetric('wind_direction', __('Wind Direction'))
->addValues('dropdown', [
'N' => __('North'),
'NNE ' => __('North-Northeast'),
'NE' => __('Northeast'),
'ENE' => __('East-Northeast'),
'E' => __('East'),
'ESE' => __('East-Southeast'),
'SE' => __('Southeast'),
'SSE' => __('South-Southeast'),
'S' => __('South'),
'SSW' => __('South-Southwest'),
'SW' => __('Southwest'),
'WSW' => __('West-Southwest'),
'W' => __('West'),
'WNW' => __('West-Northwest'),
'NW' => __('Northwest'),
'NNW' => __('North-Northwest'),
])
->addMetric('wind_bearing', __('Wind Bearing'))
->addValues('number', [])
->addMetric('humidity', __('Humidity (Percent)'))
->addValues('number', [])
->addMetric('pressure', __('Pressure'))
->addValues('number', [])
->addMetric('visibility', __('Visibility'))
->addValues('number', []);
->addMetric('condition', __('Weather Condition'))
->addValues('dropdown', [
'thunderstorm' => __('Thunderstorm'),
'drizzle' => __('Drizzle'),
'rain' => __('Rain'),
'snow' => __('Snow'),
'clear' => __('Clear'),
'clouds' => __('Clouds')
])
->addMetric('temp_imperial', __('Temperature (Imperial)'))
->addValues('number', [])
->addMetric('temp_metric', __('Temperature (Metric)'))
->addValues('number', [])
->addMetric('feels_like_imperial', __('Apparent Temperature (Imperial)'))
->addValues('number', [])
->addMetric('feels_like_metric', __('Apparent Temperature (Metric)'))
->addValues('number', [])
->addMetric('wind_speed', __('Wind Speed'))
->addValues('number', [])
->addMetric('wind_direction', __('Wind Direction'))
->addValues('dropdown', [
'N' => __('North'),
'NE' => __('Northeast'),
'E' => __('East'),
'SE' => __('Southeast'),
'S' => __('South'),
'SW' => __('Southwest'),
'W' => __('West'),
'NW' => __('Northwest'),
])
->addMetric('wind_degrees', __('Wind Direction (degrees)'))
->addValues('number', [])
->addMetric('humidity', __('Humidity (Percent)'))
->addValues('number', [])
->addMetric('pressure', __('Pressure'))
->addValues('number', [])
->addMetric('visibility', __('Visibility (meters)'))
->addValues('number', []);
}

/**
Expand Down Expand Up @@ -744,50 +733,49 @@
$apparentTempMetric = ($apparentTempImperial - 32) * 5 / 9;

// Round those temperature values
$data['temperature_imperial'] = round($tempImperial, 0);
$data['apparent_temperature_imperial'] = round($apparentTempImperial, 0);
$data['temperature_metric'] = round($tempMetric, 0);
$data['apparent_temperature_metric'] = round($apparentTempMetric, 0);

$data['weather_temp_imperial'] = round($tempImperial, 0);
$data['weather_feels_like_imperial'] = round($apparentTempImperial, 0);
$data['weather_temp_metric'] = round($tempMetric, 0);
$data['weather_feels_like_metric'] = round($apparentTempMetric, 0);

// Humidity
$data['humidity'] = $item['humidity'];
$data['weather_humidity'] = $item['humidity'];

// Pressure
// received in hPa, display in mB
$data['pressure'] = $item['pressure'] / 100;
$data['weather_pressure'] = $item['pressure'] / 100;

// Wind
// metric = meters per second
// imperial = miles per hour
$data['wind_speed'] = $item['wind_speed'] ?? $item['speed'] ?? null;
$data['wind_bearing'] = $item['wind_deg'] ?? $item['deg'] ?? null;
$data['weather_wind_speed'] = $item['wind_speed'] ?? $item['speed'] ?? null;
$data['weather_wind_degrees'] = $item['wind_deg'] ?? $item['deg'] ?? null;

if ($requestUnit === 'metric' && $windSpeedUnit !== 'MPS') {
// We have MPS and need to go to something else
if ($windSpeedUnit === 'MPH') {
// Convert MPS to MPH
$data['wind_speed'] = round($data['wind_speed'] * 2.237, 2);
$data['weather_wind_degrees'] = round($data['weather_wind_degrees'] * 2.237, 2);
} else if ($windSpeedUnit === 'KPH') {
// Convert MPS to KPH
$data['wind_speed'] = round($data['wind_speed'] * 3.6, 2);
$data['weather_wind_degrees'] = round($data['weather_wind_degrees'] * 3.6, 2);
}
} else if ($requestUnit === 'imperial' && $windSpeedUnit !== 'MPH') {
if ($windSpeedUnit === 'MPS') {
// Convert MPH to MPS
$data['wind_speed'] = round($data['wind_speed'] / 2.237, 2);
$data['weather_wind_degrees'] = round($data['weather_wind_degrees'] / 2.237, 2);
} else if ($windSpeedUnit === 'KPH') {
// Convert MPH to KPH
$data['wind_speed'] = round($data['wind_speed'] * 1.609344, 2);
$data['weather_wind_degrees'] = round($data['weather_wind_degrees'] * 1.609344, 2);
}
}

// Wind direction
$data['wind_direction'] = '--';
if ($data['wind_bearing'] !== null && $data['wind_bearing'] !== 0) {
$data['weather_wind_direction'] = '--';
if ($data['weather_wind_degrees'] !== null && $data['weather_wind_degrees'] !== 0) {
foreach (self::cardinalDirections() as $dir => $angles) {
if ($data['wind_bearing'] >= $angles[0] && $data['wind_bearing'] < $angles[1]) {
$data['wind_direction'] = $dir;
if ($data['weather_wind_degrees'] >= $angles[0] && $data['weather_wind_degrees'] < $angles[1]) {
$data['weather_wind_direction'] = $dir;
break;
}
}
Expand All @@ -796,17 +784,17 @@
// Visibility
// metric = meters
// imperial = meters?
$data['visibility'] = $item['visibility'] ?? '--';
$data['weather_visibility'] = $item['visibility'] ?? '--';

if ($data['visibility'] !== '--') {
if ($data['weather_visibility'] !== '--') {
// Always in meters
if ($visibilityDistanceUnit === 'mi') {
// Convert meters to miles
$data['visibility'] = $data['visibility'] / 1609;
$data['weather_visibility'] = $data['weather_visibility'] / 1609;
} else {
if ($visibilityDistanceUnit === 'km') {
// Convert meters to KM
$data['visibility'] = $data['visibility'] / 1000;
$data['weather_visibility'] = $data['weather_visibility'] / 1000;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Xmds/Soap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ protected function doSchedule($serverKey, $hardwareKey, $options = [])

foreach ($schedule->criteria as $scheduleCriteria) {
$criteriaNode = $scheduleXml->createElement('criteria');
$criteriaNode->setAttribute('metric', $scheduleCriteria->metric);
$criteriaNode->setAttribute('metric', $scheduleCriteria->type . '_' . $scheduleCriteria->metric);
$criteriaNode->setAttribute('condition', $scheduleCriteria->condition);
$criteriaNode->setAttribute('type', $scheduleCriteria->type);
$criteriaNode->textContent = $scheduleCriteria->value;
Expand Down
Loading