probably dont need aliases for country, state, and county

NREL · May 12, 2024 · d3253c3 · d3253c3
1 parent 227e1af
commit d3253c3
Show file tree

Hide file tree

Showing 5 changed files with 677 additions and 446 deletions.
diff --git a/reV/SAM/generation.py b/reV/SAM/generation.py
@@ -528,8 +528,8 @@ class AbstractSamGenerationFromWeatherFile(AbstractSamGeneration, ABC):
     """Base class for running sam generation with a weather file on disk."""
 
     WF_META_DROP_COLS = {MetaKeyName.ELEVATION, MetaKeyName.TIMEZONE,
-                         MetaKeyName.COUNTRY, MetaKeyName.STATE,
-                         MetaKeyName.COUNTY, 'urban', 'population',
+                         'country', 'state',
+                         'county', 'urban', 'population',
                          'landcover', MetaKeyName.LATITUDE,
                          MetaKeyName.LONGITUDE}
 
@@ -605,9 +605,9 @@ def _create_pysam_wfile(self, resource, meta):
         m['Source'] = 'NSRDB'
         m['Location ID'] = meta.name
         m['City'] = '-'
-        m['State'] = m[MetaKeyName.STATE].apply(
+        m['State'] = m['state'].apply(
             lambda x: '-' if x == 'None' else x)
-        m['Country'] = m[MetaKeyName.COUNTRY].apply(
+        m['Country'] = m['country'].apply(
             lambda x: '-' if x == 'None' else x)
         m['Latitude'] = m[MetaKeyName.LATITUDE]
         m['Longitude'] = m[MetaKeyName.LONGITUDE]