fix(roofmodel): emit rated watts after si-core-units

Derived arrays pre-fill weather.pv_arrays, which now stores rated_w.
The Python module and Go host speak watts; kWp stays a test helper.

Author: frahlg

go/internal/roofmodel/roofmodel.go

@@ -53,7 +53,7 @@ const (
 // the document can pre-fill weather.pv_arrays directly.
 type Array struct {
 	Name       string  `json:"name"`
-	KWp        float64 `json:"kwp"`
+	RatedW     float64 `json:"rated_w"`
 	TiltDeg    float64 `json:"tilt_deg"`
 	AzimuthDeg float64 `json:"azimuth_deg"`
 	AreaM2     float64 `json:"area_m2"`
@@ -285,7 +285,7 @@ func (m *Model) ToPVArrays() []config.PVArray {
 		tiltDeg, azimuthDeg := a.TiltDeg, a.AzimuthDeg
 		out = append(out, config.PVArray{
 			Name:       a.Name,
-			KWp:        a.KWp,
+			RatedW:     a.RatedW,
 			TiltDeg:    &tiltDeg,
 			AzimuthDeg: &azimuthDeg,
 		})

go/internal/roofmodel/roofmodel_test.go

@@ -208,7 +208,7 @@ func TestDeriveParsesAModel(t *testing.T) {
 	doc := `{"schema_version":1,"planes_found":3,` +
 		`"site":{"latitude":59.33,"longitude":18.07,"radius_m":40},` +
 		`"source":{"provider":"lantmateriet","item_count":2,"dataset_datetime":"2018-03-01T00:00:00+00:00"},` +
-		`"arrays":[{"name":"Roof south","kwp":7.2,"tilt_deg":35,"azimuth_deg":180,"area_m2":51.4,"segment_id":"seg-0"}],` +
+		`"arrays":[{"name":"Roof south","rated_w":7200,"tilt_deg":35,"azimuth_deg":180,"area_m2":51.4,"segment_id":"seg-0"}],` +
 		`"captured_at_ms":1519862400000,"derived_at_ms":1785456000000}`
 	cmd := stubModule(t, "stdout", doc)
 	s := svc(t, &config.RoofModel{Enabled: true, Command: cmd, GeotorgetUsername: "u", GeotorgetToken: "t"})
@@ -482,8 +482,8 @@ func TestDeriveIsTimeBoxed(t *testing.T) {
 
 func TestToPVArraysMatchesConfigShape(t *testing.T) {
 	m := &Model{Arrays: []Array{
-		{Name: "Roof south", KWp: 7.2, TiltDeg: 35, AzimuthDeg: 180, AreaM2: 51.4},
-		{Name: "Roof west", KWp: 4.1, TiltDeg: 35, AzimuthDeg: 270, AreaM2: 29.3},
+		{Name: "Roof south", RatedW: 7200, TiltDeg: 35, AzimuthDeg: 180, AreaM2: 51.4},
+		{Name: "Roof west", RatedW: 4100, TiltDeg: 35, AzimuthDeg: 270, AreaM2: 29.3},
 	}}
 	got := m.ToPVArrays()
 	if len(got) != 2 {
@@ -492,7 +492,7 @@ func TestToPVArraysMatchesConfigShape(t *testing.T) {
 	if got[0].TiltDeg == nil || got[0].AzimuthDeg == nil {
 		t.Fatalf("derived array must carry both angles, got %+v", got[0])
 	}
-	if got[0].Name != "Roof south" || got[0].KWp != 7.2 ||
+	if got[0].Name != "Roof south" || got[0].RatedW != 7200 ||
 		*got[0].TiltDeg != 35 || *got[0].AzimuthDeg != 180 {
 		t.Errorf("array 0 = %+v tilt=%v az=%v", got[0], *got[0].TiltDeg, *got[0].AzimuthDeg)
 	}

go/internal/units/consistency_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/srcfl/ftw/go/internal/loadpoint"
 	"github.com/srcfl/ftw/go/internal/mpc"
 	"github.com/srcfl/ftw/go/internal/pvperf"
+	"github.com/srcfl/ftw/go/internal/roofmodel"
 	"github.com/srcfl/ftw/go/internal/telemetry"
 	"github.com/srcfl/ftw/go/internal/units"
 	"github.com/srcfl/ftw/go/internal/v2x"
@@ -54,6 +55,16 @@ func TestPVPerfArrayHasNoKWp(t *testing.T) {
 	}
 }
 
+func TestRoofmodelArrayHasNoKWp(t *testing.T) {
+	typ := reflect.TypeOf(roofmodel.Array{})
+	if _, ok := typ.FieldByName("KWp"); ok {
+		t.Fatal("roofmodel.Array must not have KWp; store RatedW")
+	}
+	if _, ok := typ.FieldByName("RatedW"); !ok {
+		t.Fatal("roofmodel.Array must store RatedW (watts)")
+	}
+}
+
 func TestMPCParamsSoCIsFraction(t *testing.T) {
 	typ := reflect.TypeOf(mpc.Params{})
 	for _, banned := range []string{"SoCMinPct", "SoCMaxPct", "InitialSoCPct"} {
@@ -255,6 +266,7 @@ func TestCoreBannedSoCPercentFieldNames(t *testing.T) {
 		reflect.TypeOf(mpc.SlotDirective{}),
 		reflect.TypeOf(forecast.Array{}),
 		reflect.TypeOf(pvperf.Array{}),
+		reflect.TypeOf(roofmodel.Array{}),
 	}
 	banned := []string{"CurrentSoCPct", "TargetSoCPct", "PluginSoCPct", "VehicleSoCPct", "SoCPct", "SoCMinPct", "SoCMaxPct", "SoCTargetPct", "LivePVSurplusSoCCapPct", "LoadpointSoCTargetPct", "KWp"}
 	for _, typ := range types {

roofmodel/ftw_roofmodel/pipeline.py

@@ -64,7 +64,7 @@ class RoofModelError(RuntimeError):
 @dataclasses.dataclass
 class DerivedArray:
     name: str
-    kwp: float
+    rated_w: float
     tilt_deg: float
     azimuth_deg: float
     area_m2: float
@@ -73,7 +73,7 @@ class DerivedArray:
     def to_json(self) -> dict[str, Any]:
         return {
             "name": self.name,
-            "kwp": round(self.kwp, 2),
+            "rated_w": round(self.rated_w),
             "tilt_deg": round(self.tilt_deg, 1),
             "azimuth_deg": round(self.azimuth_deg, 1),
             "area_m2": round(self.area_m2, 1),
@@ -122,7 +122,7 @@ def planes_to_arrays(
         arrays.append(
             DerivedArray(
                 name=name,
-                kwp=plane.kwp(packing_factor, module_w_per_m2),
+                rated_w=plane.rated_w(packing_factor, module_w_per_m2),
                 tilt_deg=plane.tilt_deg,
                 azimuth_deg=plane.azimuth_deg,
                 area_m2=plane.area_m2,

roofmodel/ftw_roofmodel/segment.py

@@ -53,13 +53,21 @@ class RoofPlane:
     point_count: int
     mean_height_m: float
 
+    def rated_w(
+        self,
+        packing_factor: float = DEFAULT_PACKING_FACTOR,
+        module_w_per_m2: float = DEFAULT_MODULE_W_PER_M2,
+    ) -> float:
+        """Installable DC capacity for this surface, in watts."""
+        return self.area_m2 * packing_factor * module_w_per_m2
+
     def kwp(
         self,
         packing_factor: float = DEFAULT_PACKING_FACTOR,
         module_w_per_m2: float = DEFAULT_MODULE_W_PER_M2,
     ) -> float:
-        """Installable DC capacity for this surface, in kWp."""
-        return self.area_m2 * packing_factor * module_w_per_m2 / 1000.0
+        """Installable DC capacity for this surface, in kWp (test helper)."""
+        return self.rated_w(packing_factor, module_w_per_m2) / 1000.0
 
 
 def _fit_plane(points: np.ndarray) -> np.ndarray:

roofmodel/tests/test_pipeline.py

@@ -188,8 +188,8 @@ def test_array_json_matches_the_config_field_names():
     """The document pre-fills weather.pv_arrays, so the keys must line up."""
     planes = [RoofPlane(tilt_deg=35, azimuth_deg=180, area_m2=60, point_count=200, mean_height_m=6)]
     payload = planes_to_arrays(planes)[0].to_json()
-    assert set(payload) >= {"name", "kwp", "tilt_deg", "azimuth_deg"}
-    assert payload["kwp"] > 0
+    assert set(payload) >= {"name", "rated_w", "tilt_deg", "azimuth_deg"}
+    assert payload["rated_w"] > 0
 
 
 # --- end to end ------------------------------------------------------------
@@ -221,7 +221,7 @@ def test_derive_produces_a_versioned_document(monkeypatch):
     south = model["arrays"][0]
     assert south["azimuth_deg"] == pytest.approx(180.0, abs=3.0)
     assert south["tilt_deg"] == pytest.approx(35.0, abs=3.0)
-    assert south["kwp"] > 0
+    assert south["rated_w"] > 0
     # Must be JSON-serialisable for the subprocess contract.
     json.dumps(model)
 

web/settings/tabs/weather.js

@@ -477,8 +477,12 @@
         // Fill the form rather than saving: the operator sees the numbers and
         // presses Save, so the panel config never changes behind their back.
         ctx.config.weather.pv_arrays = arrays.map(function (a) {
+          var rated = Number(a.rated_w);
+          if (!(rated > 0) && Number(a.kwp) > 0) {
+            rated = ratedWattsFromLegacyKwp(a.kwp);
+          }
           return {
-            name: a.name || "", kwp: a.kwp,
+            name: a.name || "", rated_w: rated || 0,
             tilt_deg: a.tilt_deg, azimuth_deg: a.azimuth_deg,
           };
         });