Merge pull request #55 from tbpyro/master

Support for windspeed in km/h and mph

Author: squix78

WundergroundClient.cpp

@@ -174,7 +174,7 @@ void WundergroundClient::key(String key) {
 	isForecast = false;
 	isAlerts = true;
   }
-// end fowlerk add 
+// end fowlerk add
 }
 
 void WundergroundClient::value(String value) {
@@ -252,7 +252,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") {
@@ -268,7 +268,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
@@ -277,8 +277,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") {
@@ -287,15 +291,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;
   }
@@ -328,15 +336,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++;
@@ -400,9 +408,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;
   }
@@ -421,7 +429,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);
@@ -437,13 +445,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;
@@ -476,19 +484,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() {
@@ -549,6 +557,9 @@ String WundergroundClient::getSeconds() {
 String WundergroundClient::getDate() {
   return date;
 }
+String WundergroundClient::getObservationDate() {
+  return observationDate;
+}
 long WundergroundClient::getCurrentEpoch() {
   return localEpoc + ((millis() - localMillisAtUpdate) / 1000);
 }
@@ -699,17 +710,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];
 }
 

WundergroundClient.h

@@ -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 /////////////////////////////////
@@ -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
@@ -108,12 +109,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();
@@ -146,9 +148,9 @@ class WundergroundClient: public JsonListener {
     String getPrecipitationToday();
 	// fowlerk added...
 	String getFeelsLike();
-	
+
 	String getUV();
-	
+
 	String getObservationTime();			// fowlerk add, 04-Dec-2016
 	// end fowlerk add
 
@@ -161,33 +163,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);