This property really should be 'conditions', like in the Period class.

Keep both for BC.
horde · Aug 13, 2016 · 5840f23 · 5840f23
1 parent b652410
commit 5840f23
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/framework/Service_Weather/lib/Horde/Service/Weather/Current/Base.php b/framework/Service_Weather/lib/Horde/Service/Weather/Current/Base.php
@@ -27,7 +27,8 @@
  * @property string heat_index        Heat index.
  * @property string temp              The temperature.
  * @property string icon              Icon name to represent conditions.
- * @property string condition         The condition string.
+ * @property string condition         The condition string (for BC).
+ * @property string conditions        The condition string.
  * @property string humidity          The humidity.
  * @property string wind              Full wind description string.
  * @property string icon_url          Url to icon.

diff --git a/framework/Service_Weather/lib/Horde/Service/Weather/Current/Metar.php b/framework/Service_Weather/lib/Horde/Service/Weather/Current/Metar.php
@@ -65,6 +65,7 @@ public function __get($property)
                 ? $this->_properties['remark']['presschg']
                 : null;
         case 'condition':
+        case 'conditions':
             // Not really translatable from METAR data...but try to generate
             // some sensible human readable data.
             $units = $this->_weather->getUnits();

diff --git a/framework/Service_Weather/lib/Horde/Service/Weather/Current/Owm.php b/framework/Service_Weather/lib/Horde/Service/Weather/Current/Owm.php
@@ -44,6 +44,7 @@ public function __get($property)
             return null;
 
         case 'condition':
+        case 'conditions':
             return Horde_Service_Weather_Translation::t($this->_properties->weather[0]->main);
 
         case 'time':

diff --git a/framework/Service_Weather/lib/Horde/Service/Weather/Current/WeatherUnderground.php b/framework/Service_Weather/lib/Horde/Service/Weather/Current/WeatherUnderground.php
@@ -22,6 +22,7 @@ class Horde_Service_Weather_Current_WeatherUnderground extends Horde_Service_Wea
  {
     protected $_map = array(
         'condition' => 'weather',
+        'conditions' => 'weather',
         'humidity' => 'relative_humidity',
         'wind_direction' => 'wind_dir',
         'wind_degrees' => 'wind_degrees',

diff --git a/framework/Service_Weather/lib/Horde/Service/Weather/Current/Wwo.php b/framework/Service_Weather/lib/Horde/Service/Weather/Current/Wwo.php
@@ -45,6 +45,7 @@ public function __get($property)
             return null;
 
         case 'condition':
+        case 'conditions':
             return Horde_Service_Weather_Translation::t($this->_properties->weatherDesc[0]->value);
 
         // Note that even though this is "localObsDateTime", the timezone set