Skip to content

Support for windspeed in km/h and mph #55

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

Merged
merged 2 commits into from
Mar 2, 2017
Merged

Support for windspeed in km/h and mph #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eb3c3e
- Added support for extracting windspeed in mph and km/h depending on…
Feb 7, 2017
4846192
- Wunderground.getDate() now returns the actual locale date (key "loc…
Feb 7, 2017
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
59 changes: 35 additions & 24 deletions WundergroundClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void WundergroundClient::key(String key) {
isForecast = false;
isAlerts = true;
}
// end fowlerk add
// end fowlerk add
}

void WundergroundClient::value(String value) {
Expand Down Expand Up @@ -247,7 +247,7 @@ void WundergroundClient::value(String value) {
else isPM = false;
char tempHourBuff[3] = ""; // fowlerk add for formatting, 12/22/16
sprintf(tempHourBuff, "%2d", tempHour); // fowlerk add for formatting, 12/22/16
moonriseTime = String(tempHourBuff); // fowlerk add for formatting, 12/22/16
moonriseTime = String(tempHourBuff); // fowlerk add for formatting, 12/22/16
// moonriseTime = value;
}
if (currentKey == "minute") {
Expand All @@ -263,7 +263,7 @@ void WundergroundClient::value(String value) {
if (currentKey == "hour") {
char tempHourBuff[3] = ""; // fowlerk add for formatting, 12/22/16
sprintf(tempHourBuff, "%2d", value.toInt()); // fowlerk add for formatting, 12/22/16
moonsetTime = String(tempHourBuff); // fowlerk add for formatting, 12/22/16
moonsetTime = String(tempHourBuff); // fowlerk add for formatting, 12/22/16
}
if (currentKey == "minute") {
char tempMinBuff[3] = ""; // fowlerk add for formatting, 12/22/16
Expand All @@ -272,8 +272,12 @@ void WundergroundClient::value(String value) {
}
}

if (currentKey == "wind_mph") {
windSpeed = value;
if (currentKey == "wind_mph" && !isMetric) {
windSpeed = value + "mph";
}

if (currentKey == "wind_kph" && isMetric) {
windSpeed = value + "km/h";
}

if (currentKey == "wind_dir") {
Expand All @@ -282,15 +286,19 @@ void WundergroundClient::value(String value) {

// end JJG add ////////////////////////////////////////////////////////////////////

if (currentKey == "observation_time_rfc822") {
if (currentKey == "local_time_rfc822") {
date = value.substring(0, 16);
}
// Begin add, fowlerk...04-Dec-2016

if (currentKey == "observation_time_rfc822") {
observationDate = value.substring(0, 16);
}
// Begin add, fowlerk...04-Dec-2016
if (currentKey == "observation_time") {
observationTime = value;
}
// end add, fowlerk
// end add, fowlerk

if (currentKey == "temp_f" && !isMetric) {
currentTemp = value;
}
Expand Down Expand Up @@ -323,15 +331,15 @@ void WundergroundClient::value(String value) {
if (currentKey == "feelslike_f" && !isMetric) {
feelslike = value;
}

if (currentKey == "feelslike_c" && isMetric) {
feelslike = value;
}

if (currentKey == "UV") {
UV = value;
}

// Active alerts...added 18-Dec-2016
if (currentKey == "type" && isAlerts) {
activeAlertsCnt++;
Expand Down Expand Up @@ -395,9 +403,9 @@ void WundergroundClient::value(String value) {
activeAlertsAttribution[currentAlert-1].replace("</a>","");
activeAlertsAttribution[currentAlert-1].replace("/'>"," ");
}

// end fowlerk add

if (currentKey == "dewpoint_f" && !isMetric) {
dewPoint = value;
}
Expand All @@ -416,7 +424,7 @@ void WundergroundClient::value(String value) {
// Modified below line to add check to ensure we are processing the 10-day forecast
// before setting the forecastTitle (day of week of the current forecast day).
// (The keyword title is used in both the current observation and the 10-day forecast.)
// Modified by fowlerk
// Modified by fowlerk
// if (currentKey == "title" && currentForecastPeriod < MAX_FORECAST_PERIODS) { // Removed, fowlerk
if (currentKey == "title" && isForecast && currentForecastPeriod < MAX_FORECAST_PERIODS) {
Serial.println(String(currentForecastPeriod) + ": " + value);
Expand All @@ -432,13 +440,13 @@ void WundergroundClient::value(String value) {
forecastText[currentForecastPeriod] = value;
}
// end fowlerk add, 12/3/16

// Added PoP (probability of precipitation) key following...fowlerk, 12/22/16
if (currentKey == "pop" && isForecast && currentForecastPeriod < MAX_FORECAST_PERIODS) {
PoP[currentForecastPeriod] = value;
}
// end fowlerk add, 12/22/16

// The detailed forecast period has only one forecast per day with low/high for both
// night and day, starting at index 1.
int dailyForecastPeriod = (currentForecastPeriod - 1) * 2;
Expand Down Expand Up @@ -471,19 +479,19 @@ void WundergroundClient::value(String value) {
currentForecastPeriod = 0;
}
forecastMonth[currentForecastPeriod] = value;
}
}

if (currentKey == "day" && isSimpleForecast && currentForecastPeriod < MAX_FORECAST_PERIODS) {
// Added by fowlerk to handle transition from txtforecast to simpleforecast, as
// the key "period" doesn't appear until after some of the key values needed and is
// used as an array index.
if (isSimpleForecast && currentForecastPeriod == 19) {
currentForecastPeriod = 0;
}
}
forecastDay[currentForecastPeriod] = value;
}
// end fowlerk add

}

void WundergroundClient::endArray() {
Expand Down Expand Up @@ -544,6 +552,9 @@ String WundergroundClient::getSeconds() {
String WundergroundClient::getDate() {
return date;
}
String WundergroundClient::getObservationDate() {
return observationDate;
}
long WundergroundClient::getCurrentEpoch() {
return localEpoc + ((millis() - localMillisAtUpdate) / 1000);
}
Expand Down Expand Up @@ -694,17 +705,17 @@ String WundergroundClient::getForecastHighTemp(int period) {
}
// fowlerk added...
String WundergroundClient::getForecastDay(int period) {
// Serial.print("Day period: "); Serial.println(period);
// Serial.print("Day period: "); Serial.println(period);
return forecastDay[period];
}

String WundergroundClient::getForecastMonth(int period) {
// Serial.print("Month period: "); Serial.println(period);
// Serial.print("Month period: "); Serial.println(period);
return forecastMonth[period];
}

String WundergroundClient::getForecastText(int period) {
// Serial.print("Forecast period: "); Serial.println(period);
// Serial.print("Forecast period: "); Serial.println(period);
return forecastText[period];
}

Expand Down Expand Up @@ -757,4 +768,4 @@ String WundergroundClient::getMeteoconIcon(String iconText) {
if (iconText == "nt_tstorms") return "&";

return ")";
}
}
34 changes: 18 additions & 16 deletions WundergroundClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class WundergroundClient: public JsonListener {
int gmtOffset = 1;
long localMillisAtUpdate;
String date = "-";
String observationDate = "-";
boolean isMetric = true;
String currentTemp;
// JJG added ... ////////////////////////////////// define returns /////////////////////////////////
Expand All @@ -65,7 +66,7 @@ class WundergroundClient: public JsonListener {
String UV;
String observationTime; // fowlerk add, 04-Dec-2016
// end fowlerk add

void doUpdate(String url);

// forecast
Expand Down Expand Up @@ -107,12 +108,13 @@ class WundergroundClient: public JsonListener {
void updateAstronomy(String apiKey, String language, String country, String city);
void updateAlerts(String apiKey, String language, String country, String city); // Added by fowlerk, 18-Dec-2016
void initMetric(boolean isMetric); // Added by fowlerk, 12/22/16, as an option to change metric setting other than at instantiation

// JJG added
String getHours();
String getMinutes();
String getSeconds();
String getDate();
String getObservationDate();
// JJG added ... ///////////////////function name to string ////////////////////////////
String getMoonPctIlum();
String getMoonAge();
Expand Down Expand Up @@ -145,9 +147,9 @@ class WundergroundClient: public JsonListener {
String getPrecipitationToday();
// fowlerk added...
String getFeelsLike();

String getUV();

String getObservationTime(); // fowlerk add, 04-Dec-2016
// end fowlerk add

Expand All @@ -160,33 +162,33 @@ class WundergroundClient: public JsonListener {
String getForecastHighTemp(int period);
// fowlerk added...
String getForecastDay(int period);

String getForecastMonth(int period);

String getForecastText(int period);

String getPoP(int period);

int getActiveAlertsCnt();

String getActiveAlerts(int alertIndex);

String getActiveAlertsText(int alertIndex);

String getActiveAlertsMessage(int alertIndex);

bool getActiveAlertsMessageTrunc(int alertIndex);

String getActiveAlertsStart(int alertIndex);

String getActiveAlertsEnd(int alertIndex);

String getActiveAlertsPhenomena(int alertIndex);

String getActiveAlertsSignificance(int alertIndex);

String getActiveAlertsAttribution(int alertIndex);

// end fowlerk add

virtual void whitespace(char c);
Expand Down