Skip to content

Commit 11eedcc

Browse files
Apply suggestions from code review
Co-authored-by: Adam R. Jensen <39184289+AdamRJensen@users.noreply.github.com>
1 parent d726591 commit 11eedcc

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

pvlib/iotools/nasa_power.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'ALLSKY_SFC_SW_DIFF': 'dhi',
1111
'ALLSKY_SFC_SW_DNI': 'dni',
1212
'CLRSKY_SFC_SW_DWN': 'ghi_clear',
13-
'T2M': 'temp_air_2m',
13+
'T2M': 'temp_air',
1414
'WS2M': 'wind_speed_2m',
1515
'WS10M': 'wind_speed_10m',
1616
}
@@ -99,6 +99,10 @@ def get_nasa_power(latitude, longitude, start, end, parameters,
9999
start = pd.Timestamp(start)
100100
end = pd.Timestamp(end)
101101

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+
102106
params = {
103107
'latitude': latitude,
104108
'longitude': longitude,
@@ -126,9 +130,10 @@ def get_nasa_power(latitude, longitude, start, end, parameters,
126130
df = pd.DataFrame(hourly_data)
127131
df.index = pd.to_datetime(df.index, format='%Y%m%d%H').tz_localize('UTC')
128132

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']
132137

133138
meta['longitude'] = data['geometry']['coordinates'][0]
134139
meta['latitude'] = data['geometry']['coordinates'][1]

0 commit comments

Comments
 (0)