From bbd2e42715b40ff605a265f3f54263fda451e1f9 Mon Sep 17 00:00:00 2001 From: Roland Date: Sun, 4 Oct 2026 18:25:24 -0600 Subject: [PATCH] Solar: drop the data source line under the location The attribution at the bottom of the page is enough. The line under the location now only appears to report the data's state: loading, failed to load, or replaced by the user's own values. Bumps wrolpi-help for the refreshed screenshot. Co-Authored-By: Claude Opus 5.5 --- app/src/components/calculators/SolarCalculator.js | 8 +++----- app/src/components/calculators/SolarCalculator.test.js | 4 ++-- app/src/components/calculators/solarData.js | 1 - docker/help/wrolpi-help | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/components/calculators/SolarCalculator.js b/app/src/components/calculators/SolarCalculator.js index 011ce2e8..c0e1ca42 100644 --- a/app/src/components/calculators/SolarCalculator.js +++ b/app/src/components/calculators/SolarCalculator.js @@ -41,7 +41,6 @@ import { CLIMATOLOGY_CHANGES, CLIMATOLOGY_DATA_REFERENCE, CLIMATOLOGY_LICENSE, - CLIMATOLOGY_SOURCE, lookupClimatology, useClimatology, } from "./solarData"; @@ -247,7 +246,8 @@ function LocationSection({get, set, s, climatology}) { ); }; - let source; + // The data's attribution is at the bottom of the page; this line only reports the data's state. + let source = null; if (s.ownData) { source = 'Using your own sunlight data.'; } else if (climatology.loading) { @@ -256,8 +256,6 @@ function LocationSection({get, set, s, climatology}) { source = Enter your own monthly sunlight under "Use my own sunlight data" below. ; - } else { - source = `Sunlight and temperature: ${CLIMATOLOGY_SOURCE}; see Data attribution at the bottom of the page.`; } return <> @@ -279,7 +277,7 @@ function LocationSection({get, set, s, climatology}) { {geoError && {geoError}} -
{source}
+ {source &&
{source}
} ; } diff --git a/app/src/components/calculators/SolarCalculator.test.js b/app/src/components/calculators/SolarCalculator.test.js index 81837b09..74f8799f 100644 --- a/app/src/components/calculators/SolarCalculator.test.js +++ b/app/src/components/calculators/SolarCalculator.test.js @@ -118,7 +118,8 @@ describe('SolarCalculator', () => { renderWithProviders(, {route: DENVER}); expect(await findEstimate()).toBeInTheDocument(); expect(screen.getByText(`${roundDigits(expectedAnnual(), 0)}`)).toBeInTheDocument(); - expect(screen.getByText(/Sunlight and temperature: NASA POWER/)).toBeInTheDocument(); + // The attribution is only at the bottom of the page. + expect(screen.queryByText(/Sunlight and temperature/)).not.toBeInTheDocument(); expect(global.fetch).toHaveBeenCalledWith(expect.stringMatching(/\/data\/solar-climatology\.bin$/)); }); @@ -133,7 +134,6 @@ describe('SolarCalculator', () => { // After everything else, including the last Fine-tune section. const lastControl = screen.getByText('Use my own sunlight data: off'); expect(lastControl.compareDocumentPosition(heading) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy(); - expect(screen.getByText(/see Data attribution at the bottom of the page/)).toBeInTheDocument(); }); test('typing writes the URL and leaves defaults out', async () => { diff --git a/app/src/components/calculators/solarData.js b/app/src/components/calculators/solarData.js index 3ccad825..426644cf 100644 --- a/app/src/components/calculators/solarData.js +++ b/app/src/components/calculators/solarData.js @@ -5,7 +5,6 @@ import React from "react"; // must match PARAMETERS below. The file is only fetched when the calculator opens. export const CLIMATOLOGY_URL = `${process.env.PUBLIC_URL || ''}/data/solar-climatology.bin`; -export const CLIMATOLOGY_SOURCE = 'NASA POWER 2001–2020 monthly averages (CC BY 4.0)'; // Attribution, as NASA asks (https://power.larc.nasa.gov/docs/referencing/) and CC BY 4.0 requires. The // build script writes the same text, with the API version and download date, to diff --git a/docker/help/wrolpi-help b/docker/help/wrolpi-help index e118fe46..b61bae30 160000 --- a/docker/help/wrolpi-help +++ b/docker/help/wrolpi-help @@ -1 +1 @@ -Subproject commit e118fe46c94a0f5f371b009ccc9d7fd14ca979df +Subproject commit b61bae309cf253e080824ac12eb8b4fb690b8456