Location.get_sun_rise_set_transit outputs dataframe from _geometric method

Author: cwhanse

pvlib/location.py

@@ -308,10 +308,14 @@ def get_sun_rise_set_transit(self, times, method='pyephem', **kwargs):
                                                             self.longitude,
                                                             **kwargs)
         elif method == 'geometric':
-            result = solarposition.sun_rise_set_transit_geometric(times,
+            sr, ss, tr = solarposition.sun_rise_set_transit_geometric(times,
                                                             self.latitude,
                                                             self.longitude,
                                                             **kwargs)
+            result = pd.DataFrame(index=times,
+                                  data={'sunrise': sr,
+                                        'sunset': ss,
+                                        'transit': tr})
         else:
             raise ValueError('{} is not a valid method. Must be '
                              'one of pyephem, spa, geometric'

pvlib/test/test_location.py

@@ -327,12 +327,10 @@ def test_get_sun_rise_set_transit(golden):
     dayofyear = 1
     declination = declination_spencer71(dayofyear)
     eot = equation_of_time_spencer71(dayofyear)
-    (sr, ss, tr) = golden.get_sun_rise_set_transit(times, method='geometric',
+    result = golden.get_sun_rise_set_transit(times, method='geometric',
                                                    declination=declination,
                                                    equation_of_time=eot)
-    assert all([isinstance(sr, pd.DatetimeIndex),
-                isinstance(ss, pd.DatetimeIndex),
-                isinstance(tr, pd.DatetimeIndex)])
+    assert all(result.columns == ['sunrise', 'sunset', 'transit'])
 
 
 def test_get_sun_rise_set_transit_valueerror(golden):