Skip to content

Patch clean up old nrel traces-287 #296

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
RLiNREL merged 2 commits into from
Aug 3, 2026
Merged

Patch clean up old nrel traces-287 #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
407fc00
patch: update old nrel links to nlr
RLiNREL Jul 30, 2026
2753aed
CORS-CSP: clean nrel traces from config
RLiNREL Jul 31, 2026
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 windwatts-api/app/config/model_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"spatial_resolution": "2 km",
"temporal_resolution": "1 hour",
},
"links": ["https://www.nrel.gov/grid/wind-toolkit"],
"links": ["https://www.nlr.gov/grid/wind-toolkit"],
"references": [
"Draxl, C., B.M. Hodge, A. Clifton, and J. McCaa. 2015. Overview and Meteorological Validation of the Wind Integration National Dataset Toolkit (Technical Report, NREL/TP-5000-61740). Golden, CO: National Laboratory of the Rockies",
'Draxl, C., B.M. Hodge, A. Clifton, and J. McCaa. 2015. "The Wind Integration National Dataset (WIND) Toolkit." Applied Energy 151: 355366',
Expand Down
6 changes: 1 addition & 5 deletions windwatts-api/app/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

- Rate limits: tiered - 10 / 100 / 1000 requests per minute per IP.
- Base path: `/api`
- Contact: windwatts@nrel.gov
- Contact: windwatts@nlr.gov

Comment on lines 20 to 23
## API

Expand All @@ -43,13 +43,9 @@

origins = [
"http://localhost",
"https://windwatts-dev.stratus.nrel.gov",
"https://windwatts-stage.stratus.nrel.gov",
"https://windwatts-prod.stratus.nrel.gov",
"https://windwatts-dev.stratus.nlr.gov",
"https://windwatts-stage.stratus.nlr.gov",
"https://windwatts-prod.stratus.nlr.gov",
"https://windwatts.nrel.gov",
"https://windwatts.nlr.gov",
]
app.add_middleware(
Expand Down
2 changes: 1 addition & 1 deletion windwatts-api/proxy/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ server {
}

add_header X-Content-Type-Options "nosniff" always;
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' blob: https://maps.googleapis.com https://polyfill.io https://unpkg.com https://cdn.jsdelivr.net; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://cdn.jsdelivr.net; img-src 'self' data: https://maps.googleapis.com https://maps.gstatic.com https://windwatts.nrel.gov https://windwatts.nlr.gov https://www.nrel.gov https://www.nlr.gov; font-src 'self' https://fonts.gstatic.com; connect-src 'self' https://maps.googleapis.com https://maps.gstatic.com; frame-src 'self'; object-src 'none';" always;
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' blob: https://maps.googleapis.com https://polyfill.io https://unpkg.com https://cdn.jsdelivr.net; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://cdn.jsdelivr.net; img-src 'self' data: https://maps.googleapis.com https://maps.gstatic.com https://windwatts.nlr.gov https://www.nlr.gov; font-src 'self' https://fonts.gstatic.com; connect-src 'self' https://maps.googleapis.com https://maps.gstatic.com; frame-src 'self'; object-src 'none';" always;
}

server_tokens off;
2 changes: 1 addition & 1 deletion windwatts-ui/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ server {

add_header X-Content-Type-Options "nosniff" always;
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' https://maps.googleapis.com https://maps.gstatic.com https://polyfill.io https://*.googletagmanager.com https://dap.digitalgov.gov https://*.clarity.ms; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' data: https://maps.googleapis.com https://maps.gstatic.com https://windwatts.nrel.gov https://windwatts.nlr.gov https://www.nrel.gov https://www.nlr.gov https://*.google-analytics.com https://*.googletagmanager.com https://*.clarity.ms https://*.bing.com; connect-src 'self' https://maps.googleapis.com https://maps.gstatic.com https://windwatts-dev.stratus.nrel.gov https://windwatts-stage.stratus.nrel.gov https://windwatts-prod.stratus.nrel.gov https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com https://www.google.com https://*.clarity.ms https://dap.digitalgov.gov; frame-src 'self' https://www.googletagmanager.com; object-src 'none'; frame-ancestors 'none'; base-uri 'self'; form-action 'self'; upgrade-insecure-requests;" always;
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' https://maps.googleapis.com https://maps.gstatic.com https://polyfill.io https://*.googletagmanager.com https://dap.digitalgov.gov https://*.clarity.ms; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' data: https://maps.googleapis.com https://maps.gstatic.com https://windwatts.nlr.gov https://www.nlr.gov https://*.google-analytics.com https://*.googletagmanager.com https://*.clarity.ms https://*.bing.com; connect-src 'self' https://maps.googleapis.com https://maps.gstatic.com https://windwatts-dev.stratus.nlr.gov https://windwatts-stage.stratus.nlr.gov https://windwatts-prod.stratus.nlr.gov https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com https://www.google.com https://*.clarity.ms https://dap.digitalgov.gov; frame-src 'self' https://www.googletagmanager.com; object-src 'none'; frame-ancestors 'none'; base-uri 'self'; form-action 'self'; upgrade-insecure-requests;" always;
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;

location / {
Expand Down
2 changes: 1 addition & 1 deletion windwatts-ui/src/components/resultPane/Disclaimer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const Disclaimer = () => {
wind installers who may share insights from nearby projects. To access
alternative wind models, visit 
<Link
href="https://wrdb.nrel.gov"
href="https://wrdb.nlr.gov"
target="_blank"
rel="noopener noreferrer"
underline="hover"
Expand Down
12 changes: 6 additions & 6 deletions windwatts-ui/src/constants/footer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ export const QUICK_LINKS: FooterLink[] = [
content: "Site Feedback",
href: "https://www.nlr.gov/webmaster",
},
{ content: "Developers", href: "https://developer.nrel.gov" },
{ content: "Employees", href: "https://thesource.nrel.gov" },
{ content: "Developers", href: "https://developer.nlr.gov" },
{ content: "Employees", href: "https://thesource.nlr.gov" },
];

// Social media links (content will be icons, added in component)
Expand All @@ -51,12 +51,12 @@ export const SOCIAL_LINKS = [
},
{
name: "instagram",
href: "https://www.instagram.com/nationalrenewableenergylab",
href: "https://www.instagram.com/natlabrockies/",
ariaLabel: "Follow NLR on Instagram",
},
{
name: "linkedin",
href: "https://www.linkedin.com/company/national-renewable-energy-laboratory",
href: "https://www.linkedin.com/company/national-lab-of-the-rockies",
ariaLabel: "Follow NLR on LinkedIn",
},
{
Expand All @@ -66,12 +66,12 @@ export const SOCIAL_LINKS = [
},
{
name: "x",
href: "https://twitter.com/NatLabRockies",
href: "https://x.com/natlabrockies",
ariaLabel: "Follow NLR on X",
},
{
name: "threads",
href: "https://threads.net/@nationalrenewableenergylab",
href: "https://www.threads.com/@natlabrockies",
ariaLabel: "Follow NLR on Threads",
},
];
Expand Down
8 changes: 4 additions & 4 deletions windwatts-ui/src/constants/turbines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const TURBINE_DATA: Record<string, TurbineInfo> = {
info: "Residential reference turbines (0-20 kW): system size 2.5 kW, rotor diameter 2.2m, allowable hub heights 20, 30, 40 m (Lantz et al., 2016). Also see https://doi.org/10.2172/1333625",
// Source: Lantz et al. (2016)
// Lantz, E., Sigrin, B., Gleason, M., Preus, R., & Baring-Gould, I. (2016). Assessing the Future of Distributed Wind: Opportunities for Behind-the-Meter Projects (NREL/TP--6A20-67337, 1333625; p. NREL/TP--6A20-67337, 1333625). https://doi.org/10.2172/1333625
// For more information, refer to https://atb.nrel.gov/electricity/2024b/distributed_wind
// For more information, refer to https://atb.nlr.gov/electricity/2024b/distributed_wind
// Note: residential turbines (0 - 20 kW): system size 2.5 kW, rotor diameter 2.2m, allowable hub heights 20, 30, 40 m
},
"nlr-reference-100kW": {
Expand All @@ -31,7 +31,7 @@ export const TURBINE_DATA: Record<string, TurbineInfo> = {
info: "Commercial reference turbines (20-100 kW): system size 100 kW, rotor diameter 13.8m, allowable hub heights 40, 50 m (Lantz et al., 2016). Also see https://doi.org/10.2172/1333625",
// Source: Lantz et al. (2016)
// Lantz, E., Sigrin, B., Gleason, M., Preus, R., & Baring-Gould, I. (2016). Assessing the Future of Distributed Wind: Opportunities for Behind-the-Meter Projects (NREL/TP--6A20-67337, 1333625; p. NREL/TP--6A20-67337, 1333625). https://doi.org/10.2172/1333625
// For more information, refer to https://atb.nrel.gov/electricity/2024b/distributed_wind
// For more information, refer to https://atb.nlr.gov/electricity/2024b/distributed_wind
// Note: commercial turbines (20-100 kW): system size 100 kW, rotor diameter 13.8m, allowable hub heights 40, 50 m
},
"nlr-reference-250kW": {
Expand All @@ -41,7 +41,7 @@ export const TURBINE_DATA: Record<string, TurbineInfo> = {
info: "Mid-size reference turbines (100 kW - 1 MW): system size 250 kW, rotor diameter 21.9m, allowable hub heights 50 m (Lantz et al., 2016). Also see https://doi.org/10.2172/1333625",
// Source: Lantz et al. (2016)
// Lantz, E., Sigrin, B., Gleason, M., Preus, R., & Baring-Gould, I. (2016). Assessing the Future of Distributed Wind: Opportunities for Behind-the-Meter Projects (NREL/TP--6A20-67337, 1333625; p. NREL/TP--6A20-67337, 1333625). https://doi.org/10.2172/1333625
// For more information, refer to https://atb.nrel.gov/electricity/2024b/distributed_wind
// For more information, refer to https://atb.nlr.gov/electricity/2024b/distributed_wind
// Note: mid-size turbines (100 kW - 1 MW): system size 250 kW, rotor diameter 21.9m, allowable hub heights 50 m
},
"nlr-reference-2000kW": {
Expand All @@ -51,7 +51,7 @@ export const TURBINE_DATA: Record<string, TurbineInfo> = {
maxHeight: 80,
// Source: Lantz et al. (2016)
// Lantz, E., Sigrin, B., Gleason, M., Preus, R., & Baring-Gould, I. (2016). Assessing the Future of Distributed Wind: Opportunities for Behind-the-Meter Projects (NREL/TP--6A20-67337, 1333625; p. NREL/TP--6A20-67337, 1333625). https://doi.org/10.2172/1333625
// For more information, refer to https://atb.nrel.gov/electricity/2024b/distributed_wind
// For more information, refer to https://atb.nlr.gov/electricity/2024b/distributed_wind
// Note: large-size turbines (> 1 MW): system size 1 MW, rotor diameter 43.7m, allowable hub heights 50, 80 m
},
"bergey-excel-15": {
Expand Down