8000 Lookup altitude by nicomt · Pull Request #1518 · pvlib/pvlib-python · GitHub
[go: up one dir, main page]
Skip to content

Lookup altitude #1518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Aug 31, 2022
Merged

Lookup altitude #1518

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
302837d
Lookup altitude implementation
nicomt Aug 9, 2022
7da227b
Adding test for lookup altitude
nicomt Aug 9, 2022
bd6bfad
Updating reference for lookup altitude
nicomt Aug 9, 2022
4466433
Adding whatsnew documentation
nicomt Aug 9, 2022
133dde2
Adding myself as a contribuitor
nicomt Aug 9, 2022
f76927e
slight documentation improvemnts
nicomt Aug 9, 2022
d5c970e
Switching back to original _degrees_to_index.
nicomt Aug 18, 2022
cd2ad21
Merge branch 'master' into lookup_altitude
nicomt Aug 18, 2022
bc4c8c7
Fix style issue
nicomt Aug 18, 2022
8775b73
Merge branch 'lookup_altitude' of github.com:nicomt/pvlib-python into…
nicomt Aug 18, 2022
db728b8
Updating altitude lookup map
nicomt Aug 18, 2022
454d4e4
Update pvlib/location.py
nicomt Aug 21, 2022
651461d
Moving _degrees_to_index test to test_tools
nicomt Aug 21, 2022
53a7cc4
Update lookup_location
nicomt Aug 21, 2022
40ffe67
Merge branch 'master' into lookup_altitude
nicomt Aug 21, 2022
331cc50
Moving whatsnew to next release
nicomt Aug 21, 2022
ad58fe4
Merge branch 'master' into lookup_altitude
nicomt Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update lookup_location 
* Retuning float altitude instead of int
* Removing h5 file input
  • Loading branch information
@nicomt
nicomt committed Aug 21, 2022
commit 53a7cc41284a25008cc9ff4f0b42ac35579279fd
16 changes: 6 additions & 10 deletions pvlib/location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ def get_sun_rise_set_transit(self, times, method='pyephem', **kwargs):
return result


def lookup_altitude(latitude, longitude, filepath=None):
def lookup_altitude(latitude, longitude):
"""
Look up location altitude from low-resolution altitude map
supplied with pvlib. The data for this map comes from multiple open data
Expand All @@ -384,12 +384,9 @@ def lookup_altitude(latitude, longitude, filepath=None):
Positive is east of the prime meridian.
Use decimal degrees notation.

filepath : None or string, default None
The path to the ``.h5`` file.

Returns
-------
altitude : int
altitude : float
The altitude of the location in meters.

Notes
Expand Down Expand Up @@ -430,9 +427,8 @@ def lookup_altitude(latitude, longitude, filepath=None):

"""

if filepath is None:
pvlib_path = os.path.dirname(os.path.abspath(__file__))
filepath = os.path.join(pvlib_path, 'data', 'Altitude.h5')
pvlib_path = os.path.dirname(os.path.abspath(__file__))
filepath = os.path.join(pvlib_path, 'data', 'Altitude.h5')

latitude_index = _degrees_to_index(latitude, coordinate='latitude')
longitude_index = _degrees_to_index(longitude, coordinate='longitude')
Expand All @@ -443,8 +439,8 @@ def lookup_altitude(latitude, longitude, filepath=None):
# 255 is a special value that means nodata. Fallback to 0 if nodata.
if alt == 255:
return 0
# Altitude is encoded in 35 meter steps from -2364 meters to 6526 meters
# Altitude is encoded in 28 meter steps from -450 meters to 6561 meters
# There are 0-254 possible altitudes, with 255 reserved for nodata.
alt *= 28
alt -= 450
return int(alt)
return float(alt)
0