|
10 | 10 | 'ALLSKY_SFC_SW_DIFF': 'dhi', |
11 | 11 | 'ALLSKY_SFC_SW_DNI': 'dni', |
12 | 12 | 'CLRSKY_SFC_SW_DWN': 'ghi_clear', |
13 | | - 'T2M': 'temp_air_2m', |
| 13 | + 'T2M': 'temp_air', |
14 | 14 | 'WS2M': 'wind_speed_2m', |
15 | 15 | 'WS10M': 'wind_speed_10m', |
16 | 16 | } |
@@ -99,6 +99,10 @@ def get_nasa_power(latitude, longitude, start, end, parameters, |
99 | 99 | start = pd.Timestamp(start) |
100 | 100 | end = pd.Timestamp(end) |
101 | 101 |
|
| 102 | + # allow the use of pvlib parameter names |
| 103 | + parameter_dict = {v: k for k, v in VARIABLE_MAP.items()} |
| 104 | + parameters = [parameter_dict.get(p, p) for p in parameters] |
| 105 | + |
102 | 106 | params = { |
103 | 107 | 'latitude': latitude, |
104 | 108 | 'longitude': longitude, |
@@ -126,9 +130,10 @@ def get_nasa_power(latitude, longitude, start, end, parameters, |
126 | 130 | df = pd.DataFrame(hourly_data) |
127 | 131 | df.index = pd.to_datetime(df.index, format='%Y%m%d%H').tz_localize('UTC') |
128 | 132 |
|
129 | | - # Make metadata dictionary |
130 | | - meta = {key: data[key] for key in ['header', 'messages', 'parameters', |
131 | | - 'times', 'type']} |
| 133 | + # Create metadata dictionary |
| 134 | + meta = data['header'] |
| 135 | + meta['times'] = data['times'] |
| 136 | + meta['parameters'] = data['parameters'] |
132 | 137 |
|
133 | 138 | meta['longitude'] = data['geometry']['coordinates'][0] |
134 | 139 | meta['latitude'] = data['geometry']['coordinates'][1] |
|
0 commit comments