Skip to content

Fix latlon_to_xy longitude scaling bug and update scaling tests (Fixes #2614) #2700

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

Open
muien5080 wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −6
Open

Fix latlon_to_xy longitude scaling bug and update scaling tests (Fixes #2614) #2700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pvlib/scaling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def latlon_to_xy(coordinates):
m_per_deg_lon = r_earth * np.cos(np.pi/180 * meanlat) * np.pi/180

# Conversion
pos = coordinates * np.array(m_per_deg_lat, m_per_deg_lon)
pos = coordinates * np.array([m_per_deg_lat, m_per_deg_lon])

# reshape as (x,y) pairs to return
try:
Expand Down
14 changes: 9 additions & 5 deletions tests/test_scaling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ def time_500ms(clear_sky_index):

@pytest.fixture
def positions():
# Sample positions based on the previous lat/lon (calculated manually)
expect_xpos = np.array([554863.4, 555975.4, 557087.3])
# Sample positions based on correct geodetic scaling
expect_xpos = np.array([546433.8, 547528.9, 548623.9])
expect_ypos = np.array([1110838.8, 1111950.8, 1113062.7])
return np.array([pt for pt in zip(expect_xpos, expect_ypos)])

Expand Down Expand Up @@ -94,9 +94,13 @@ def expect_cs_smooth():

@pytest.fixture
def expect_vr():
# Expected VR for expecttmscale
return np.array([3., 3., 3., 3., 3., 3., 2.9997844, 2.9708118, 2.6806291,
2.0726611, 1.5653324, 1.2812714, 1.1389995])
# Expected VR for expect_tmscale (updated after fixing latlon_to_xy scaling)
return np.array([
3., 3., 3., 3., 3., 3.,
2.9997677, 2.9697125, 2.6750587,
2.0659253, 1.5611084, 1.2791058,
1.1379316
])


def test_latlon_to_xy_zero():
Expand Down