* Change for permitting the creation of location object from epw metadata with function from_epw

Author: tylunel

pvlib/location.py

@@ -124,7 +124,42 @@ def from_tmy(cls, tmy_metadata, tmy_data=None, **kwargs):
 
         # not sure if this should be assigned regardless of input.
         if tmy_data is not None:
-            new_object.tmy_data = tmy_data
+            new_object.weather_data = tmy_data
+
+        return new_object
+
+    @classmethod
+    def from_epw(cls, epw_metadata, epw_data=None, **kwargs):
+        """
+        Create a Location object based on a metadata
+        dictionary from epw data readers.
+
+        Parameters
+        ----------
+        epw_metadata : dict
+            Returned from epw.read_epw
+        epw_data : None or DataFrame, default None
+            Optionally attach the epw data to this object.
+
+        Returns
+        -------
+        Location object (or the child class of Location that you
+        called this method from).
+        """
+
+        latitude = epw_metadata['latitude']
+        longitude = epw_metadata['longitude']
+
+        name = epw_metadata['city']
+
+        tz = epw_metadata['TZ']
+        altitude = epw_metadata['altitude']
+
+        new_object = cls(latitude, longitude, tz=tz, altitude=altitude,
+                         name=name, **kwargs)
+
+        if epw_data is not None:
+            new_object.weather_data = epw_data
 
         return new_object
 

pvlib/test/test_location.py

@@ -218,7 +218,7 @@ def test_from_tmy_3():
     assert loc.name is not None
     assert loc.altitude != 0
     assert loc.tz != 'UTC'
-    assert_frame_equal(loc.tmy_data, data)
+    assert_frame_equal(loc.weather_data, data)
 
 
 def test_from_tmy_2():
@@ -229,7 +229,18 @@ def test_from_tmy_2():
     assert loc.name is not None
     assert loc.altitude != 0
     assert loc.tz != 'UTC'
-    assert_frame_equal(loc.tmy_data, data)
+    assert_frame_equal(loc.weather_data, data)
+
+
+def test_from_epw():
+    from test_epw import epw_testfile
+    from pvlib.iotools import read_epw
+    data, meta = read_epw(epw_testfile)
+    loc = Location.from_epw(meta, data)
+    assert loc.name is not None
+    assert loc.altitude != 0
+    assert loc.tz != 'UTC'
+    assert_frame_equal(loc.weather_data, data)
 
 
 def test_get_solarposition(expected_solpos, golden_mst):