Revert "Added percentage of precipitation"

This reverts commit a6a8b41.

Author: squix78

WundergroundClient.cpp

@@ -151,7 +151,7 @@ void WundergroundClient::key(String key) {
 	isForecast = false;
 	isAlerts = true;
   }
-// end fowlerk add
+// end fowlerk add 
 }
 
 void WundergroundClient::value(String value) {
@@ -252,12 +252,12 @@ void WundergroundClient::value(String value) {
    if (currentKey == "observation_time_rfc822") {
     date = value.substring(0, 16);
   }
-// Begin add, fowlerk...04-Dec-2016
+// 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;
   }
@@ -290,17 +290,17 @@ void WundergroundClient::value(String value) {
   if (currentKey == "feelslike_f" && !isMetric) {
     feelslike = value;
   }
-
+  
   if (currentKey == "feelslike_c" && isMetric) {
     feelslike = value;
   }
-
+  
   if (currentKey == "UV") {
     UV = value;
   }
-
+  
   // end fowlerk add
-
+  
   if (currentKey == "dewpoint_f" && !isMetric) {
     dewPoint = value;
   }
@@ -316,14 +316,10 @@ void WundergroundClient::value(String value) {
   if (currentKey == "period") {
     currentForecastPeriod = value.toInt();
   }
-  if (currentKey == "pop" && isForecast && currentForecastPeriod < MAX_FORECAST_PERIODS) {
-    Serial.println("Pop" + String(currentForecastPeriod) + ": " + value);
-    forecastPop[currentForecastPeriod] = 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);
@@ -335,7 +331,7 @@ void WundergroundClient::value(String value) {
       forecastText[currentForecastPeriod] = value;
   }
   // end fowlerk add, 12/3/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;
@@ -368,19 +364,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() {
@@ -547,24 +543,19 @@ String WundergroundClient::getForecastLowTemp(int period) {
 String WundergroundClient::getForecastHighTemp(int period) {
   return forecastHighTemp[period];
 }
-
-String WundergroundClient::getForecastPrecipitationPercentage(int period) {
-  return forecastPop[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];
 }
 // end fowlerk add

WundergroundClient.h

@@ -58,38 +58,37 @@ class WundergroundClient: public JsonListener {
     String pressure;
     String dewPoint;
     String precipitationToday;
-	  // fowlerk added...
-	  String feelslike;
-	  String UV;
-	  String observationTime;					// fowlerk add, 04-Dec-2016
-	  // end fowlerk add
-
+	// fowlerk added...
+	String feelslike;
+	String UV;
+	String observationTime;					// fowlerk add, 04-Dec-2016
+	// end fowlerk add
+	
     void doUpdate(String url);
 
     // forecast
     boolean isForecast = false;
     boolean isSimpleForecast = false;		// true;  fowlerk
-	  boolean isCurrentObservation = false;	// Added by fowlerk
-	  boolean isAlerts = false;				// Added by fowlerk
+	boolean isCurrentObservation = false;	// Added by fowlerk
+	boolean isAlerts = false;				// Added by fowlerk
     int currentForecastPeriod;
     String forecastIcon [MAX_FORECAST_PERIODS];
     String forecastTitle [MAX_FORECAST_PERIODS];
     String forecastLowTemp [MAX_FORECAST_PERIODS];
     String forecastHighTemp [MAX_FORECAST_PERIODS];
-    String forecastPop[MAX_FORECAST_PERIODS];
-    // fowlerk added...
-    String forecastDay [MAX_FORECAST_PERIODS/2];
-    String forecastMonth [MAX_FORECAST_PERIODS/2];
-    String forecastText [MAX_FORECAST_PERIODS];
-    // end fowlerk add
+	// fowlerk added...
+	String forecastDay [MAX_FORECAST_PERIODS/2];
+	String forecastMonth [MAX_FORECAST_PERIODS/2];
+	String forecastText [MAX_FORECAST_PERIODS];
+	// end fowlerk add
 
   public:
     WundergroundClient(boolean isMetric);
     void updateConditions(String apiKey, String language, String country, String city);
     void updateConditions(String apiKey, String language, String zmwCode);
     void updateForecast(String apiKey, String language, String country, String city);
     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 updateAlerts(String apiKey, String language, String country, String city);		// Added by fowlerk, 18-Dec-2016
     // JJG added
     String getHours();
     String getMinutes();
@@ -125,13 +124,13 @@ class WundergroundClient: public JsonListener {
     String getDewPoint();
 
     String getPrecipitationToday();
-  	// fowlerk added...
-  	String getFeelsLike();
-
-  	String getUV();
-
-  	String getObservationTime();			// fowlerk add, 04-Dec-2016
-  	// end fowlerk add
+	// fowlerk added...
+	String getFeelsLike();
+	
+	String getUV();
+	
+	String getObservationTime();			// fowlerk add, 04-Dec-2016
+	// end fowlerk add
 
     String getForecastIcon(int period);
 
@@ -140,15 +139,13 @@ class WundergroundClient: public JsonListener {
     String getForecastLowTemp(int period);
 
     String getForecastHighTemp(int period);
-
-    String getForecastPrecipitationPercentage(int period);
-  	// fowlerk added...
-  	String getForecastDay(int period);
-
-  	String getForecastMonth(int period);
-
-  	String getForecastText(int period);
-  	// end fowlerk add
+	// fowlerk added...
+	String getForecastDay(int period);
+	
+	String getForecastMonth(int period);
+	
+	String getForecastText(int period);
+	// end fowlerk add
 
     virtual void whitespace(char c);