+
+ {error ? (
+
+ );
+}
+
+
diff --git a/windwatts-ssr/app/components/RightPaneSimple.tsx b/windwatts-ssr/app/components/RightPaneSimple.tsx
new file mode 100644
index 00000000..47936c21
--- /dev/null
+++ b/windwatts-ssr/app/components/RightPaneSimple.tsx
@@ -0,0 +1,129 @@
+const POWER_CURVE_LABELS: Record
+ {error}
+
+ ) : null}
+
+
+ );
+}
+
diff --git a/windwatts-ssr/app/components/SettingsSimple.tsx b/windwatts-ssr/app/components/SettingsSimple.tsx
new file mode 100644
index 00000000..6e163be2
--- /dev/null
+++ b/windwatts-ssr/app/components/SettingsSimple.tsx
@@ -0,0 +1,247 @@
+import { useState, useEffect } from "react";
+import { useNavigate } from "@remix-run/react";
+
+const HUB_HEIGHTS = [30, 40, 50, 60, 80, 100];
+const MODELS = ["era5", "wtk"];
+const POWER_CURVES = [
+ { value: "nrel-reference-2.5kW", label: "NREL Reference 2.5kW" },
+ { value: "nrel-reference-100kW", label: "NREL Reference 100kW" },
+ { value: "nrel-reference-250kW", label: "NREL Reference 250kW" },
+ { value: "nrel-reference-2000kW", label: "NREL Reference 2000kW" },
+];
+
+type SettingsSimpleProps = {
+ onClose: () => void;
+ params: { lat: number; lng: number; hubHeight: number; model: string; powerCurve: string };
+};
+
+export function SettingsSimple({ onClose, params }: SettingsSimpleProps) {
+ const navigate = useNavigate();
+ const [localParams, setLocalParams] = useState(params);
+ const [scrolled, setScrolled] = useState(false);
+
+ useEffect(() => {
+ setLocalParams(params);
+ }, [params]);
+
+ const handleSave = () => {
+ const searchParams = new URLSearchParams({
+ lat: String(localParams.lat),
+ lng: String(localParams.lng),
+ hubHeight: String(localParams.hubHeight),
+ model: localParams.model,
+ powerCurve: localParams.powerCurve,
+ });
+ navigate(`/?${searchParams.toString()}`, { replace: true });
+ onClose();
+ };
+
+ return (
+
+ Summary Results Based on
+
+
+ {/* Settings Cards */}
+
+
+
+ {/* Edit Settings Button */}
+
+
+ {/* Error */}
+ {error && (
+
+
+ Location
+ {lat.toFixed(3)}, {lng.toFixed(3)}
+
+
+ Hub height
+ {hubHeight} meters
+
+
+ Power curve
+ {POWER_CURVE_LABELS[powerCurve] || powerCurve}
+
+ Error: {error}
+
+ )}
+
+ {/* Wind Speed Card */}
+ {windData && (
+
+
+ )}
+
+ {/* Production Card */}
+ {productionData && avgProduction && (
+ Average Wind Speed *
+
+ {windData.global_avg.toFixed(2)} m/s
+
+ Average wind speed at selected height
+
+
+ )}
+
+ {!windData && !productionData && !error && (
+
+
+ Production
+
+ Primary Analysis
+
+
+ Estimated annual production potential
+
+
+
+
+
+
+
+ Average
+ {Math.round(avgProduction).toLocaleString()}
+ kWh
+
+
+ Highest Year
+ {Math.round(highProduction).toLocaleString()}
+ kWh
+
+
+ Lowest Year
+ {Math.round(lowProduction).toLocaleString()}
+ kWh
+
+ Wind energy production can vary significantly from year to year. Understanding both the average resource and its variability is key to setting realistic expectations.
+
+
+ Select a location and settings to view analysis results.
+
+ )}
+
+
+ );
+}
+
diff --git a/windwatts-ssr/app/entry.client.tsx b/windwatts-ssr/app/entry.client.tsx
new file mode 100644
index 00000000..2c5743b2
--- /dev/null
+++ b/windwatts-ssr/app/entry.client.tsx
@@ -0,0 +1,13 @@
+import { RemixBrowser } from "@remix-run/react";
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+
+startTransition(() => {
+ hydrateRoot(
+ document,
+ e.stopPropagation()}
+ style={{
+ width: 600,
+ maxHeight: "80vh",
+ backgroundColor: "white",
+ borderRadius: 8,
+ display: "flex",
+ flexDirection: "column",
+ overflow: "hidden",
+ }}
+ >
+ {/* Header */}
+
+
+
+
+
+ {/* Content */}
+ Settings
+ setScrolled(e.currentTarget.scrollTop > 0)}
+ >
+
+
+
+
+
+
+ Location
+
+
+
+
+ setLocalParams({ ...localParams, lat: Number(e.target.value) })}
+ style={{
+ width: "100%",
+ padding: "10px 12px",
+ border: "1px solid #ddd",
+ borderRadius: 4,
+ fontSize: "1rem",
+ boxSizing: "border-box",
+ }}
+ />
+
+
+
+ setLocalParams({ ...localParams, lng: Number(e.target.value) })}
+ style={{
+ width: "100%",
+ padding: "10px 12px",
+ border: "1px solid #ddd",
+ borderRadius: 4,
+ fontSize: "1rem",
+ boxSizing: "border-box",
+ }}
+ />
+
+
+
+
+ Turbine Settings
+
+
+
+
+
+
+
+
+
+
+
+
+ Data Model
+ + +
+
+
+
+
+ {/* Header */}
+ setSettingsOpen(false)}
+ params={params}
+ />
+ )}
+
+ {/* Debug Info (bottom-right corner) */}
+
+ );
+}
diff --git a/windwatts-ssr/app/utils/lossAdjustment.ts b/windwatts-ssr/app/utils/lossAdjustment.ts
new file mode 100644
index 00000000..97fa81ec
--- /dev/null
+++ b/windwatts-ssr/app/utils/lossAdjustment.ts
@@ -0,0 +1,115 @@
+/**
+ * Apply loss assumption to production value
+ * Matches the original UI's loss adjustment logic
+ */
+export function applyLoss(
+ value: number,
+ lossFactor: number,
+ options?: { mode?: "floor" | "round" }
+): number {
+ const adjusted = value * lossFactor;
+ if (options?.mode === "floor") {
+ return Math.floor(adjusted);
+ }
+ return Math.round(adjusted);
+}
+
+/**
+ * Apply loss assumption to all production data
+ */
+export function applyLossToProductionData(data: any, lossFactor: number): any {
+ if (!data) return data;
+
+ try {
+ const clone = JSON.parse(JSON.stringify(data));
+
+ console.log("🔧 Applying loss to data:", {
+ lossFactor,
+ hasSummary: !!clone.summary_avg_energy_production,
+ before:
+ clone.summary_avg_energy_production?.["Average year"]?.["kWh produced"],
+ });
+
+ // Apply to summary data
+ if (clone.summary_avg_energy_production) {
+ ["Average year", "Lowest year", "Highest year"].forEach((key) => {
+ const row = clone.summary_avg_energy_production[key];
+ if (row && row["kWh produced"] != null) {
+ const before = row["kWh produced"];
+ row["kWh produced"] = applyLoss(
+ Number(row["kWh produced"]),
+ lossFactor,
+ { mode: "floor" }
+ );
+ console.log(` ${key}: ${before} → ${row["kWh produced"]}`);
+ }
+ });
+ }
+
+ console.log(
+ "✅ After loss:",
+ clone.summary_avg_energy_production?.["Average year"]?.["kWh produced"]
+ );
+
+ // Apply to yearly data
+ if (
+ clone.yearly_avg_energy_production &&
+ Array.isArray(clone.yearly_avg_energy_production)
+ ) {
+ clone.yearly_avg_energy_production =
+ clone.yearly_avg_energy_production.map((row: any) => ({
+ ...row,
+ kWh:
+ row.kWh != null
+ ? applyLoss(Number(row.kWh), lossFactor, { mode: "floor" })
+ : row.kWh,
+ }));
+ } else if (
+ clone.yearly_avg_energy_production &&
+ typeof clone.yearly_avg_energy_production === "object"
+ ) {
+ // Handle object format
+ Object.keys(clone.yearly_avg_energy_production).forEach((key) => {
+ const row = clone.yearly_avg_energy_production[key];
+ if (row && row.kWh != null) {
+ row.kWh = applyLoss(Number(row.kWh), lossFactor, { mode: "floor" });
+ }
+ });
+ }
+
+ // Apply to monthly data
+ if (clone.monthly_avg_energy_production) {
+ Object.keys(clone.monthly_avg_energy_production).forEach((key) => {
+ const row = clone.monthly_avg_energy_production[key];
+ if (row && row["kWh produced"] != null) {
+ row["kWh produced"] = applyLoss(
+ Number(row["kWh produced"]),
+ lossFactor,
+ { mode: "floor" }
+ );
+ }
+ });
+ }
+
+ return clone;
+ } catch (error) {
+ console.error("❌ Error applying loss:", error);
+ return data;
+ }
+}
+
+/**
+ * Convert loss percentage to factor
+ * e.g., 17% loss → 0.83 factor
+ */
+export function percentToFactor(percent: number): number {
+ return 1 - percent / 100;
+}
+
+/**
+ * Convert loss factor to percentage
+ * e.g., 0.83 factor → 17% loss
+ */
+export function factorToPercent(factor: number): number {
+ return Math.round((1 - factor) * 100);
+}
diff --git a/windwatts-ssr/app/utils/urlParams.ts b/windwatts-ssr/app/utils/urlParams.ts
new file mode 100644
index 00000000..73fb0c72
--- /dev/null
+++ b/windwatts-ssr/app/utils/urlParams.ts
@@ -0,0 +1,225 @@
+// Constants
+export const DEFAULT_LAT = 39.7392;
+export const DEFAULT_LNG = -104.9903;
+export const DEFAULT_HUB = 40;
+export const DEFAULT_MODEL = "era5";
+export const DEFAULT_POWER_CURVE = "nrel-reference-100kW";
+
+export const VALID_MODELS = ["era5", "wtk"];
+export const VALID_HUB_HEIGHTS = [30, 40, 50, 60, 80, 100, 120, 140];
+export const VALID_POWER_CURVES = [
+ "nrel-reference-2.5kW",
+ "nrel-reference-100kW",
+ "nrel-reference-250kW",
+ "nrel-reference-2000kW",
+];
+
+// Model coordinate bounds
+export const MODEL_COORDINATES_BOUNDS: Record<
+ string,
+ {
+ minLat: number;
+ maxLat: number;
+ minLng: number;
+ maxLng: number;
+ }
+> = {
+ era5: {
+ minLat: 23.402,
+ maxLat: 51.403,
+ minLng: -137.725,
+ maxLng: -44.224,
+ },
+ wtk: {
+ minLat: 7.75129,
+ maxLat: 78.392685,
+ minLng: -179.99918,
+ maxLng: 180.0,
+ },
+};
+
+// Validation helpers
+function isValidLatitude(lat: number): boolean {
+ return !isNaN(lat) && lat >= -90 && lat <= 90;
+}
+
+function isValidLongitude(lng: number): boolean {
+ return !isNaN(lng) && lng >= -180 && lng <= 180;
+}
+
+function isValidHubHeight(height: number): boolean {
+ return VALID_HUB_HEIGHTS.includes(height);
+}
+
+function isValidModel(model: string): boolean {
+ return VALID_MODELS.includes(model);
+}
+
+function isValidPowerCurve(curve: string): boolean {
+ return VALID_POWER_CURVES.includes(curve);
+}
+
+export interface LocationParams {
+ lat: number;
+ lng: number;
+ hubHeight: number;
+ model: string;
+ powerCurve: string;
+ lossAssumption: number; // Loss factor (0-1), default 0.83 (17% loss)
+}
+
+/**
+ * Check if coordinates are within model bounds
+ */
+export function isOutOfBounds(
+ lat: number,
+ lng: number,
+ model: string
+): boolean {
+ const bounds = MODEL_COORDINATES_BOUNDS[model];
+ if (!bounds) return false;
+ return (
+ lat < bounds.minLat ||
+ lat > bounds.maxLat ||
+ lng < bounds.minLng ||
+ lng > bounds.maxLng
+ );
+}
+
+/**
+ * Get user-friendly out of bounds message
+ */
+export function getOutOfBoundsMessage(
+ lat: number,
+ lng: number,
+ model: string
+): string {
+ const bounds = MODEL_COORDINATES_BOUNDS[model];
+ if (!bounds) return "Location is out of bounds.";
+
+ const modelName = model.toUpperCase();
+ return `The selected location (${lat.toFixed(2)}, ${lng.toFixed(
+ 2
+ )}) is outside the ${modelName} data coverage area. ${modelName} data is available for latitudes ${
+ bounds.minLat
+ }° to ${bounds.maxLat}° and longitudes ${bounds.minLng}° to ${
+ bounds.maxLng
+ }°.`;
+}
+
+/**
+ * Parse and validate URL parameters for location and settings
+ * Supports both query params (?lat=40&lng=-105) and path params (/:lat/:lng)
+ */
+export function parseLocationParams(url: URL): LocationParams {
+ // Try query params first
+ const latParam = url.searchParams.get("lat");
+ const lngParam = url.searchParams.get("lng");
+ const hubParam = url.searchParams.get("hubHeight");
+ const modelParam = url.searchParams.get("model");
+ const powerCurveParam = url.searchParams.get("powerCurve");
+ const lossParam = url.searchParams.get("lossAssumption");
+
+ // Parse and validate latitude
+ let lat = latParam ? Number(latParam) : DEFAULT_LAT;
+ if (!isValidLatitude(lat)) {
+ console.warn(
+ `Invalid latitude: ${latParam}, using default: ${DEFAULT_LAT}`
+ );
+ lat = DEFAULT_LAT;
+ }
+
+ // Parse and validate longitude
+ let lng = lngParam ? Number(lngParam) : DEFAULT_LNG;
+ if (!isValidLongitude(lng)) {
+ console.warn(
+ `Invalid longitude: ${lngParam}, using default: ${DEFAULT_LNG}`
+ );
+ lng = DEFAULT_LNG;
+ }
+
+ // Parse and validate hub height
+ let hubHeight = hubParam ? Number(hubParam) : DEFAULT_HUB;
+ if (!isValidHubHeight(hubHeight)) {
+ console.warn(
+ `Invalid hub height: ${hubParam}, using default: ${DEFAULT_HUB}`
+ );
+ hubHeight = DEFAULT_HUB;
+ }
+
+ // Validate model
+ let model = modelParam || DEFAULT_MODEL;
+ if (!isValidModel(model)) {
+ console.warn(
+ `Invalid model: ${modelParam}, using default: ${DEFAULT_MODEL}`
+ );
+ model = DEFAULT_MODEL;
+ }
+
+ // Validate power curve
+ let powerCurve = powerCurveParam || DEFAULT_POWER_CURVE;
+ if (!isValidPowerCurve(powerCurve)) {
+ console.warn(
+ `Invalid power curve: ${powerCurveParam}, using default: ${DEFAULT_POWER_CURVE}`
+ );
+ powerCurve = DEFAULT_POWER_CURVE;
+ }
+
+ // Parse loss assumption (default 0.83 = 17% loss, matching original UI)
+ let lossAssumption = lossParam ? Number(lossParam) : 0.83;
+ if (isNaN(lossAssumption) || lossAssumption < 0 || lossAssumption > 1) {
+ console.warn(`Invalid loss assumption: ${lossParam}, using default: 0.83`);
+ lossAssumption = 0.83;
+ }
+
+ return { lat, lng, hubHeight, model, powerCurve, lossAssumption };
+}
+
+/**
+ * Generate a shareable URL with current location and settings
+ */
+export function generateShareableUrl(
+ params: LocationParams,
+ baseUrl?: string
+): string {
+ const base = baseUrl || "";
+ const urlParams = new URLSearchParams();
+
+ // Always include required params
+ urlParams.set("lat", params.lat.toFixed(4));
+ urlParams.set("lng", params.lng.toFixed(4));
+ urlParams.set("hubHeight", String(params.hubHeight));
+ urlParams.set("model", params.model);
+ urlParams.set("powerCurve", params.powerCurve);
+
+ // Only include loss assumption if not default (0.83)
+ if (params.lossAssumption !== 0.83) {
+ urlParams.set("lossAssumption", params.lossAssumption.toFixed(2));
+ }
+
+ return `${base}?${urlParams.toString()}`;
+}
+
+/**
+ * Parse legacy URL formats for backwards compatibility
+ * Example: /location/40.5/-105.2/hub/80
+ */
+export function parseLegacyPathParams(
+ pathname: string
+): Partial
+
+
+ {/* Main Content */}
+
+
+
+
+ Wind Watts
+
+
+
+
+ 
+
+
+
+ {/* Map Area */}
+
+
+ {/* Settings Modal */}
+ {settingsOpen && (
+
+
+
+ {/* Right Pane */}
+
+ setSettingsOpen(true)}
+ />
+
+
+{JSON.stringify(data, null, 2)}
+
+
-{JSON.stringify(data, null, 2)}
+ {JSON.stringify(data, null, 2)}
- {JSON.stringify(data, null, 2)}
+{JSON.stringify(data, null, 2)}
+{JSON.stringify(wind, null, 2)}
+
+
+{JSON.stringify(production, null, 2)}
+
+
-{JSON.stringify(data, null, 2)}
+ {JSON.stringify(data, null, 2)}
-{JSON.stringify(wind, null, 2)}
+ {JSON.stringify(wind, null, 2)}
-{JSON.stringify(production, null, 2)}
+ {JSON.stringify(production, null, 2)}
diff --git a/windwatts-ui-ssr/src/providers/SettingsContext.tsx b/windwatts-ui-ssr/src/providers/SettingsContext.tsx
index 787ef918..a6cd4a98 100644
--- a/windwatts-ui-ssr/src/providers/SettingsContext.tsx
+++ b/windwatts-ui-ssr/src/providers/SettingsContext.tsx
@@ -52,14 +52,14 @@ export const defaultValues: StoredSettings = {
export const SettingsContext = createContext
+{JSON.stringify(wind, null, 2)}
+
+
+{JSON.stringify(production, null, 2)}
+
-{JSON.stringify(wind, null, 2)}
+ {JSON.stringify(wind, null, 2)}
-
-{JSON.stringify(production, null, 2)}
+ {JSON.stringify(production, null, 2)}
From 48f6cc74b8f6fb762a9736420c2ee3d1a7c050c7 Mon Sep 17 00:00:00 2001
From: Shawn Petros <9226624+shawnpetros@users.noreply.github.com>
Date: Mon, 27 Oct 2025 20:09:13 -0700
Subject: [PATCH 12/31] feat(ssr): normalize and preserve full query params;
build URL with all core params and replace only when different; defaults
always present
---
.../src/providers/SettingsProvider.tsx | 33 ++++++++--------
windwatts-ui-ssr/src/utils/urlParams.ts | 38 +++++++++----------
2 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/windwatts-ui-ssr/src/providers/SettingsProvider.tsx b/windwatts-ui-ssr/src/providers/SettingsProvider.tsx
index 994c32e0..4077169a 100644
--- a/windwatts-ui-ssr/src/providers/SettingsProvider.tsx
+++ b/windwatts-ui-ssr/src/providers/SettingsProvider.tsx
@@ -18,23 +18,20 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
const [settings, setSettings] = useState
{JSON.stringify(wind, null, 2)}
diff --git a/windwatts-ui-ssr/package-lock.json b/windwatts-ui-ssr/package-lock.json
index ce8dbb1c..dbec18dc 100644
--- a/windwatts-ui-ssr/package-lock.json
+++ b/windwatts-ui-ssr/package-lock.json
@@ -16,6 +16,7 @@
"@mui/material": "5.15.20",
"@mui/system": "5.15.20",
"next": "14.2.7",
+ "prettier": "^3.6.2",
"react": "18.3.1",
"react-dom": "18.3.1"
},
@@ -4904,6 +4905,21 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/prettier": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+ "license": "MIT",
+ "bin": {
+ "prettier": "bin/prettier.cjs"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
+ }
+ },
"node_modules/process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
diff --git a/windwatts-ui-ssr/package.json b/windwatts-ui-ssr/package.json
index 31e2d360..bcef73d6 100644
--- a/windwatts-ui-ssr/package.json
+++ b/windwatts-ui-ssr/package.json
@@ -6,7 +6,8 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
- "lint": "next lint"
+ "lint": "next lint",
+ "format": "prettier --check --ignore-path .gitignore \"**/*.+(js|jsx|ts|tsx|json)\""
},
"dependencies": {
"@emotion/cache": "11.11.0",
@@ -17,6 +18,7 @@
"@mui/material": "5.15.20",
"@mui/system": "5.15.20",
"next": "14.2.7",
+ "prettier": "^3.6.2",
"react": "18.3.1",
"react-dom": "18.3.1"
},
diff --git a/windwatts-ui-ssr/src/ThemeRegistry.tsx b/windwatts-ui-ssr/src/ThemeRegistry.tsx
index 754c3015..1bee0a4c 100644
--- a/windwatts-ui-ssr/src/ThemeRegistry.tsx
+++ b/windwatts-ui-ssr/src/ThemeRegistry.tsx
@@ -10,23 +10,28 @@ function createEmotionCache() {
const cache = createCache({ key: "mui", prepend: true });
// compat helps with MUI style specificity and insertion order
// See MUI + Emotion Next.js App Router examples
- // @ts-expect-error compat is not in types
cache.compat = true;
return cache;
}
const lightTheme = createTheme({
- palette: { mode: "light" }
+ palette: { mode: "light" },
});
-export default function ThemeRegistry({ children }: { children: React.ReactNode }) {
+export default function ThemeRegistry({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
const [cache] = React.useState(() => createEmotionCache());
useServerInsertedHTML(() => (
));
diff --git a/windwatts-ui-ssr/src/providers/SettingsContext.tsx b/windwatts-ui-ssr/src/providers/SettingsContext.tsx
index a6cd4a98..186e9c17 100644
--- a/windwatts-ui-ssr/src/providers/SettingsContext.tsx
+++ b/windwatts-ui-ssr/src/providers/SettingsContext.tsx
@@ -46,20 +46,20 @@ export const defaultValues: StoredSettings = {
powerCurve: "nrel-reference-2.5kW",
preferredModel: "era5",
ensemble: false,
- lossAssumptionFactor: 1.0
+ lossAssumptionFactor: 1.0,
};
export const SettingsContext = createContext({
...defaultValues,
lossAssumptionPercent: 0,
- toggleSettings: () => { },
- toggleResults: () => { },
- setCurrentPosition: () => { },
- setZoom: () => { },
- setHubHeight: () => { },
- setPowerCurve: () => { },
- setPreferredModel: () => { },
- setEnsemble: () => { },
- setLossAssumptionFactor: () => { },
- setLossAssumptionPercent: () => { }
+ toggleSettings: () => {},
+ toggleResults: () => {},
+ setCurrentPosition: () => {},
+ setZoom: () => {},
+ setHubHeight: () => {},
+ setPowerCurve: () => {},
+ setPreferredModel: () => {},
+ setEnsemble: () => {},
+ setLossAssumptionFactor: () => {},
+ setLossAssumptionPercent: () => {},
});
diff --git a/windwatts-ui-ssr/src/providers/SettingsProvider.tsx b/windwatts-ui-ssr/src/providers/SettingsProvider.tsx
index 4077169a..8eb678f5 100644
--- a/windwatts-ui-ssr/src/providers/SettingsProvider.tsx
+++ b/windwatts-ui-ssr/src/providers/SettingsProvider.tsx
@@ -6,10 +6,15 @@ import {
SettingsContext,
defaultValues,
type CurrentPosition,
- type StoredSettings
+ type StoredSettings,
} from "./SettingsContext";
import type { DataModel } from "../types/DataModel";
-import { buildUrlFromSettings, parseUrlParams, hasLaunchParams, URL_PARAM_DEFAULTS } from "../utils/urlParams";
+import {
+ buildUrlFromSettings,
+ parseUrlParams,
+ hasLaunchParams,
+ URL_PARAM_DEFAULTS,
+} from "../utils/urlParams";
export function SettingsProvider({ children }: { children: React.ReactNode }) {
const searchParams = useSearchParams();
@@ -21,13 +26,17 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
const hasPos = hasLaunchParams(params);
return {
...defaultValues,
- currentPosition: hasPos && params.lat && params.lng ? { lat: params.lat, lng: params.lng } : { lat: 39.7392, lng: -104.9903 },
+ currentPosition:
+ hasPos && params.lat && params.lng
+ ? { lat: params.lat, lng: params.lng }
+ : { lat: 39.7392, lng: -104.9903 },
zoom: params.zoom ?? URL_PARAM_DEFAULTS.zoom,
hubHeight: params.hubHeight ?? URL_PARAM_DEFAULTS.hubHeight,
powerCurve: params.powerCurve ?? URL_PARAM_DEFAULTS.powerCurve,
preferredModel: params.dataModel ?? URL_PARAM_DEFAULTS.dataModel,
ensemble: params.ensemble ?? URL_PARAM_DEFAULTS.ensemble,
- lossAssumptionFactor: 1 - (params.lossAssumption ?? URL_PARAM_DEFAULTS.lossAssumption) / 100
+ lossAssumptionFactor:
+ 1 - (params.lossAssumption ?? URL_PARAM_DEFAULTS.lossAssumption) / 100,
};
});
@@ -39,7 +48,9 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
powerCurve: settings.powerCurve,
preferredModel: settings.preferredModel,
ensemble: settings.ensemble,
- lossAssumptionPercent: Math.round((1 - settings.lossAssumptionFactor) * 100)
+ lossAssumptionPercent: Math.round(
+ (1 - settings.lossAssumptionFactor) * 100
+ ),
});
const current = `${pathname}${searchParams?.toString() ? `?${searchParams.toString()}` : ""}`;
@@ -48,11 +59,17 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
const setCurrentPosition = useCallback(
(
- position: CurrentPosition | null | ((prev: CurrentPosition | null) => CurrentPosition | null)
+ position:
+ | CurrentPosition
+ | null
+ | ((prev: CurrentPosition | null) => CurrentPosition | null)
) => {
setSettings((current) => ({
...current,
- currentPosition: typeof position === "function" ? position(current.currentPosition) : position || { lat: 39.7392, lng: -104.9903 }
+ currentPosition:
+ typeof position === "function"
+ ? position(current.currentPosition)
+ : position || { lat: 39.7392, lng: -104.9903 },
}));
},
[]
@@ -83,18 +100,27 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
setSettings((current) => ({ ...current, lossAssumptionFactor: clamped }));
}, []);
- const setLossAssumptionPercent = useCallback((percent: number) => {
- const num = Math.max(0, Math.min(100, Number(percent)));
- const factor = (100 - num) / 100;
- setLossAssumptionFactor(factor);
- }, [setLossAssumptionFactor]);
+ const setLossAssumptionPercent = useCallback(
+ (percent: number) => {
+ const num = Math.max(0, Math.min(100, Number(percent)));
+ const factor = (100 - num) / 100;
+ setLossAssumptionFactor(factor);
+ },
+ [setLossAssumptionFactor]
+ );
const toggleSettings = useCallback(() => {
- setSettings((current) => ({ ...current, settingsOpen: !current.settingsOpen }));
+ setSettings((current) => ({
+ ...current,
+ settingsOpen: !current.settingsOpen,
+ }));
}, []);
const toggleResults = useCallback(() => {
- setSettings((current) => ({ ...current, resultsOpen: !current.resultsOpen }));
+ setSettings((current) => ({
+ ...current,
+ resultsOpen: !current.resultsOpen,
+ }));
}, []);
const contextValue = useMemo(
@@ -115,13 +141,35 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
setPreferredModel,
ensemble: settings.ensemble,
setEnsemble,
- lossAssumptionFactor: settings.lossAssumptionFactor ?? defaultValues.lossAssumptionFactor,
- lossAssumptionPercent: Math.round((1 - (settings.lossAssumptionFactor ?? defaultValues.lossAssumptionFactor)) * 100),
+ lossAssumptionFactor:
+ settings.lossAssumptionFactor ?? defaultValues.lossAssumptionFactor,
+ lossAssumptionPercent: Math.round(
+ (1 -
+ (settings.lossAssumptionFactor ??
+ defaultValues.lossAssumptionFactor)) *
+ 100
+ ),
setLossAssumptionFactor,
- setLossAssumptionPercent
+ setLossAssumptionPercent,
}),
- [settings, setCurrentPosition, setZoom, setHubHeight, setPowerCurve, setPreferredModel, setEnsemble, setLossAssumptionFactor, setLossAssumptionPercent, toggleSettings, toggleResults]
+ [
+ settings,
+ setCurrentPosition,
+ setZoom,
+ setHubHeight,
+ setPowerCurve,
+ setPreferredModel,
+ setEnsemble,
+ setLossAssumptionFactor,
+ setLossAssumptionPercent,
+ toggleSettings,
+ toggleResults,
+ ]
);
- return {children} ;
+ return (
+
+ {children}
+
+ );
}
diff --git a/windwatts-ui-ssr/src/providers/UnitsContext.tsx b/windwatts-ui-ssr/src/providers/UnitsContext.tsx
index 8b3f21d8..96c36e75 100644
--- a/windwatts-ui-ssr/src/providers/UnitsContext.tsx
+++ b/windwatts-ui-ssr/src/providers/UnitsContext.tsx
@@ -14,14 +14,14 @@ export interface Units {
export const defaultUnitValues: StoredUnits = {
windspeed: "mph",
- output: "kWh"
+ output: "kWh",
};
export const defaultValues: Units = {
units: defaultUnitValues,
setUnits: () => {},
updateUnit: () => {},
- updateUnits: () => {}
+ updateUnits: () => {},
};
export const UnitsContext = createContext(defaultValues);
diff --git a/windwatts-ui-ssr/src/providers/UnitsProvider.tsx b/windwatts-ui-ssr/src/providers/UnitsProvider.tsx
index ef1b1c63..439fc204 100644
--- a/windwatts-ui-ssr/src/providers/UnitsProvider.tsx
+++ b/windwatts-ui-ssr/src/providers/UnitsProvider.tsx
@@ -8,8 +8,11 @@ export function UnitsProvider({ children }: { children: React.ReactNode }) {
const router = useRouter();
const pathname = usePathname();
- const windspeed = (searchParams.get("windspeedUnit") as string) || defaultUnitValues.windspeed;
- const output = (searchParams.get("outputUnit") as string) || defaultUnitValues.output;
+ const windspeed =
+ (searchParams.get("windspeedUnit") as string) ||
+ defaultUnitValues.windspeed;
+ const output =
+ (searchParams.get("outputUnit") as string) || defaultUnitValues.output;
const units = { windspeed, output };
diff --git a/windwatts-ui-ssr/src/providers/useLocalStorage.ts b/windwatts-ui-ssr/src/providers/useLocalStorage.ts
index b4ae1c5f..6a7e43ef 100644
--- a/windwatts-ui-ssr/src/providers/useLocalStorage.ts
+++ b/windwatts-ui-ssr/src/providers/useLocalStorage.ts
@@ -22,7 +22,8 @@ export function useLocalStorage(
const setValue = useCallback(
(value: T | ((val: T) => T)) => {
setStoredValue((currentValue) => {
- const valueToStore = value instanceof Function ? value(currentValue) : value;
+ const valueToStore =
+ value instanceof Function ? value(currentValue) : value;
try {
if (isMountedRef.current) {
window.localStorage.setItem(key, JSON.stringify(valueToStore));
diff --git a/windwatts-ui-ssr/tsconfig.json b/windwatts-ui-ssr/tsconfig.json
index 810db439..13a8b464 100644
--- a/windwatts-ui-ssr/tsconfig.json
+++ b/windwatts-ui-ssr/tsconfig.json
@@ -1,11 +1,7 @@
{
"compilerOptions": {
"target": "ES2022",
- "lib": [
- "ES2022",
- "DOM",
- "DOM.Iterable"
- ],
+ "lib": ["ES2022", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
"resolveJsonModule": true,
@@ -25,13 +21,6 @@
}
]
},
- "include": [
- "next-env.d.ts",
- "**/*.ts",
- "**/*.tsx",
- ".next/types/**/*.ts"
- ],
- "exclude": [
- "node_modules"
- ]
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+ "exclude": ["node_modules"]
}
diff --git a/windwatts-ui/.prettierignore b/windwatts-ui/.prettierignore
new file mode 100644
index 00000000..875017f9
--- /dev/null
+++ b/windwatts-ui/.prettierignore
@@ -0,0 +1,12 @@
+.next/
+node_modules/
+dist/
+dist-ssr/
+*.local
+*.log
+*.log.*
+*.log.*.*
+*.log.*.*.*
+*.log.*.*.*.*
+*.log.*.*.*.*.*
+*.log.*.*.*.*.*.*
\ No newline at end of file
From a9e76b550cc2d7430b517536a418e99751eb42c7 Mon Sep 17 00:00:00 2001
From: Shawn Petros <9226624+shawnpetros@users.noreply.github.com>
Date: Mon, 27 Oct 2025 20:28:16 -0700
Subject: [PATCH 15/31] feat(ssr): consolidate to single route; add URL-bound
Controls and WindDataCard; basic error handling
---
windwatts-ui-ssr/app/denver/page.tsx | 24 -------
windwatts-ui-ssr/app/page.tsx | 48 +++++++-------
windwatts-ui-ssr/app/wind/page.tsx | 66 -------------------
windwatts-ui-ssr/src/components/Controls.tsx | 48 ++++++++++++++
.../src/components/WindDataCard.tsx | 35 ++++++++++
5 files changed, 108 insertions(+), 113 deletions(-)
delete mode 100644 windwatts-ui-ssr/app/denver/page.tsx
delete mode 100644 windwatts-ui-ssr/app/wind/page.tsx
create mode 100644 windwatts-ui-ssr/src/components/Controls.tsx
create mode 100644 windwatts-ui-ssr/src/components/WindDataCard.tsx
diff --git a/windwatts-ui-ssr/app/denver/page.tsx b/windwatts-ui-ssr/app/denver/page.tsx
deleted file mode 100644
index 64320806..00000000
--- a/windwatts-ui-ssr/app/denver/page.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Stack, Typography } from "@mui/material";
-import { era5 } from "../../src/server/api";
-
-export const dynamic = "force-dynamic";
-
-const DENVER = { lat: 39.7392, lng: -104.9903 };
-
-async function getEra5Wind(lat: number, lng: number) {
- return era5.windspeed({ lat, lng, height: 40, source: "athena_era5" });
-}
-
-export default async function DenverPage() {
- const data = await getEra5Wind(DENVER.lat, DENVER.lng);
- return (
-
-
- ERA5 Windspeed @40m — Denver, CO
-
- {JSON.stringify(data, null, 2)}
-
-
-
- );
-}
diff --git a/windwatts-ui-ssr/app/page.tsx b/windwatts-ui-ssr/app/page.tsx
index 78faa8d6..65f63e1e 100644
--- a/windwatts-ui-ssr/app/page.tsx
+++ b/windwatts-ui-ssr/app/page.tsx
@@ -1,11 +1,13 @@
import { Stack, Typography } from "@mui/material";
+import Controls from "../src/components/Controls";
+import WindDataCard from "../src/components/WindDataCard";
import { era5 } from "../src/server/api";
import { URL_PARAM_DEFAULTS } from "../src/utils/urlParams";
export const dynamic = "force-dynamic";
export default async function Page({
- searchParams,
+ searchParams
}: {
searchParams: { [key: string]: string | string[] | undefined };
}) {
@@ -18,21 +20,23 @@ export default async function Page({
const powerCurve =
(searchParams.powerCurve as string) || URL_PARAM_DEFAULTS.powerCurve;
- const wind = await era5.windspeed({
- lat,
- lng,
- height,
- source: "athena_era5",
- });
+ let wind: any = null;
+ let production: any = null;
+ let error: string | null = null;
- const production = await era5.energyProduction({
- lat,
- lng,
- height,
- powerCurve,
- source: "athena_era5",
- time_period: "all",
- });
+ try {
+ wind = await era5.windspeed({ lat, lng, height, source: "athena_era5" });
+ production = await era5.energyProduction({
+ lat,
+ lng,
+ height,
+ powerCurve,
+ source: "athena_era5",
+ time_period: "all"
+ });
+ } catch (e: any) {
+ error = e?.message || "Failed to load";
+ }
return (
@@ -42,14 +46,12 @@ export default async function Page({
lat={lat.toFixed(4)}, lng={lng.toFixed(4)}, height={height}m,
powerCurve={powerCurve}
- ERA5 Windspeed
-
- {JSON.stringify(wind, null, 2)}
-
- Energy Production (all)
-
- {JSON.stringify(production, null, 2)}
-
+ {error}
+ ) : (
+
- {JSON.stringify(wind, null, 2)}
-
-
- {JSON.stringify(production, null, 2)}
-
-