fix(wea): Add country to header

Author: mikkelkp

ladybug/epw.py

@@ -1698,7 +1698,7 @@ def to_mos(self, file_path):
         return file_path
 
     def _get_wea_header(self):
-        return "place %s\n" % self.location.city + \
+        return "place %s_%s\n" % (self.location.city, self.location.country) + \
             "latitude %.2f\n" % self.location.latitude + \
             "longitude %.2f\n" % -self.location.longitude + \
             "time_zone %d\n" % (-self.location.time_zone * 15) + \

ladybug/wea.py

@@ -607,7 +607,7 @@ def is_annual(self):
     @property
     def header(self):
         """Get the Wea header as a string."""
-        return "place %s\n" % self.location.city + \
+        return "place %s_%s\n" % (self.location.city, self.location.country) + \
             "latitude %.2f\n" % self.location.latitude + \
             "longitude %.2f\n" % -self.location.longitude + \
             "time_zone %d\n" % (-self.location.time_zone * 15) + \
@@ -1125,7 +1125,14 @@ def _parse_wea_header(weaf, wea_file_name):
         assert first_line.startswith('place'), 'Failed to find place in .wea header.\n' \
             '{} is not a valid wea file.'.format(wea_file_name)
         location = Location()
-        location.city = ' '.join(first_line.split()[1:])
+        place_info = ' '.join(first_line.split()[1:])
+        if '_' in place_info:
+            city, country = place_info.rsplit('_', 1)
+        else:
+            city = place_info
+            country = '-'
+        location.city = city
+        location.country = country
         location.latitude = float(weaf.readline().split()[-1])
         location.longitude = -float(weaf.readline().split()[-1])
         location.time_zone = -int(weaf.readline().split()[-1]) / 15