From ed2495ee5c6e37115f371f5fa8481a2b514d3d8a Mon Sep 17 00:00:00 2001
From: Alex Savin <alex@savin.nyc>
Date: Thu, 29 May 2025 10:58:00 -0400
Subject: [PATCH] Fixed windows trim

---
 mysubaru.go | 70 ++++++++++++++++++++++++++---------------------------
 vehicle.go  |  4 +--
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/mysubaru.go b/mysubaru.go
index 3f83052..79ccdb3 100644
--- a/mysubaru.go
+++ b/mysubaru.go
@@ -199,41 +199,41 @@ type VehicleStatus struct {
 // "dataName":"remoteServiceStatus"
 // "remoteServiceType":"condition"
 type VehicleCondition struct {
-	VehicleStateType           string  `json:"vehicleStateType"`           // "IGNITION_OFF",
-	AvgFuelConsumption         float64 `json:"avgFuelConsumption"`         // null,
-	AvgFuelConsumptionUnit     string  `json:"avgFuelConsumptionUnit"`     // "MPG",
-	DistanceToEmptyFuel        int     `json:"distanceToEmptyFuel"`        // null,
-	DistanceToEmptyFuelUnit    string  `json:"distanceToEmptyFuelUnit"`    // "MILES",
-	RemainingFuelPercent       int     `json:"remainingFuelPercent"`       // "66",
-	Odometer                   int     `json:"odometer"`                   // 92,
-	OdometerUnit               string  `json:"odometerUnit"`               // "MILES",
-	TirePressureFrontLeft      float64 `json:"tirePressureFrontLeft"`      // null,
-	TirePressureFrontLeftUnit  string  `json:"tirePressureFrontLeftUnit"`  // "PSI",
-	TirePressureFrontRight     float64 `json:"tirePressureFrontRight"`     // null,
-	TirePressureFrontRightUnit string  `json:"tirePressureFrontRightUnit"` // "PSI",
-	TirePressureRearLeft       float64 `json:"tirePressureRearLeft"`       // null,
-	TirePressureRearLeftUnit   string  `json:"tirePressureRearLeftUnit"`   // "PSI",
-	TirePressureRearRight      float64 `json:"tirePressureRearRight"`      // null,
-	TirePressureRearRightUnit  string  `json:"tirePressureRearRightUnit"`  // "PSI",
-	DoorBootPosition           string  `json:"doorBootPosition"`           // "CLOSED",
-	DoorEngineHoodPosition     string  `json:"doorEngineHoodPosition"`     // "CLOSED",
-	DoorFrontLeftPosition      string  `json:"doorFrontLeftPosition"`      // "CLOSED",
-	DoorFrontRightPosition     string  `json:"doorFrontRightPosition"`     // "CLOSED",
-	DoorRearLeftPosition       string  `json:"doorRearLeftPosition"`       // "CLOSED",
-	DoorRearRightPosition      string  `json:"doorRearRightPosition"`      // "CLOSED"
-	WindowFrontLeftStatus      string  `json:"windowFrontLeftStatus"`      // "CLOSE",
-	WindowFrontRightStatus     string  `json:"windowFrontRightStatus"`     // "CLOSE",
-	WindowRearLeftStatus       string  `json:"windowRearLeftStatus"`       // "CLOSE",
-	WindowRearRightStatus      string  `json:"windowRearRightStatus"`      // "CLOSE",
-	WindowSunroofStatus        string  `json:"windowSunroofStatus"`        // "CLOSE",
-	EvDistanceToEmpty          int     `json:"evDistanceToEmpty"`          // null,
-	EvDistanceToEmptyUnit      string  `json:"evDistanceToEmptyUnit"`      // null,
-	EvChargerStateType         string  `json:"evChargerStateType"`         // null,
-	EvIsPluggedIn              bool    `json:"evIsPluggedIn"`              // null,
-	EvStateOfChargeMode        string  `json:"evStateOfChargeMode"`        // null,
-	EvTimeToFullyCharged       string  `json:"evTimeToFullyCharged"`       // null,
-	EvStateOfChargePercent     int     `json:"evStateOfChargePercent"`     // null,
-	LastUpdatedTime            string  `json:"lastUpdatedTime,string"`     // "2023-04-10T17:50:54+0000",
+	VehicleStateType           string  `json:"vehicleStateType"`                 // "IGNITION_OFF",
+	AvgFuelConsumption         float64 `json:"avgFuelConsumption,omitempty"`     // null,
+	AvgFuelConsumptionUnit     string  `json:"avgFuelConsumptionUnit"`           // "MPG",
+	DistanceToEmptyFuel        int     `json:"distanceToEmptyFuel,omitempty"`    // null,
+	DistanceToEmptyFuelUnit    string  `json:"distanceToEmptyFuelUnit"`          // "MILES",
+	RemainingFuelPercent       int     `json:"remainingFuelPercent"`             // "66",
+	Odometer                   int     `json:"odometer"`                         // 92,
+	OdometerUnit               string  `json:"odometerUnit"`                     // "MILES",
+	TirePressureFrontLeft      float64 `json:"tirePressureFrontLeft,omitempty"`  // null,
+	TirePressureFrontLeftUnit  string  `json:"tirePressureFrontLeftUnit"`        // "PSI",
+	TirePressureFrontRight     float64 `json:"tirePressureFrontRight,omitempty"` // null,
+	TirePressureFrontRightUnit string  `json:"tirePressureFrontRightUnit"`       // "PSI",
+	TirePressureRearLeft       float64 `json:"tirePressureRearLeft,omitempty"`   // null,
+	TirePressureRearLeftUnit   string  `json:"tirePressureRearLeftUnit"`         // "PSI",
+	TirePressureRearRight      float64 `json:"tirePressureRearRight,omitempty"`  // null,
+	TirePressureRearRightUnit  string  `json:"tirePressureRearRightUnit"`        // "PSI",
+	DoorBootPosition           string  `json:"doorBootPosition"`                 // "CLOSED",
+	DoorEngineHoodPosition     string  `json:"doorEngineHoodPosition"`           // "CLOSED",
+	DoorFrontLeftPosition      string  `json:"doorFrontLeftPosition"`            // "CLOSED",
+	DoorFrontRightPosition     string  `json:"doorFrontRightPosition"`           // "CLOSED",
+	DoorRearLeftPosition       string  `json:"doorRearLeftPosition"`             // "CLOSED",
+	DoorRearRightPosition      string  `json:"doorRearRightPosition"`            // "CLOSED"
+	WindowFrontLeftStatus      string  `json:"windowFrontLeftStatus"`            // "CLOSE",
+	WindowFrontRightStatus     string  `json:"windowFrontRightStatus"`           // "CLOSE",
+	WindowRearLeftStatus       string  `json:"windowRearLeftStatus"`             // "CLOSE",
+	WindowRearRightStatus      string  `json:"windowRearRightStatus"`            // "CLOSE",
+	WindowSunroofStatus        string  `json:"windowSunroofStatus"`              // "CLOSE",
+	EvDistanceToEmpty          int     `json:"evDistanceToEmpty,omitempty"`      // null,
+	EvDistanceToEmptyUnit      string  `json:"evDistanceToEmptyUnit,omitempty"`  // null,
+	EvChargerStateType         string  `json:"evChargerStateType,omitempty"`     // null,
+	EvIsPluggedIn              bool    `json:"evIsPluggedIn,omitempty"`          // null,
+	EvStateOfChargeMode        string  `json:"evStateOfChargeMode,omitempty"`    // null,
+	EvTimeToFullyCharged       string  `json:"evTimeToFullyCharged,omitempty"`   // null,
+	EvStateOfChargePercent     int     `json:"evStateOfChargePercent,omitempty"` // null,
+	LastUpdatedTime            string  `json:"lastUpdatedTime,string"`           // "2023-04-10T17:50:54+0000",
 }
 
 // ClimateSettings .
diff --git a/vehicle.go b/vehicle.go
index 7e839f5..2f9e9c7 100644
--- a/vehicle.go
+++ b/vehicle.go
@@ -629,7 +629,7 @@ func (v *Vehicle) GetVehicleStatus() {
 				}
 			}
 			if strings.HasPrefix(key, "window") && strings.HasSuffix(key, "Status") {
-				pos := strings.TrimPrefix(key, "door")
+				pos := strings.TrimPrefix(key, "window")
 				pos = strings.TrimSuffix(pos, "Status")
 				submatchall := re.FindAllString(pos, -1)
 				v.client.logger.Debug("VEHICLE COND", "key", key, "data", child.Data(), "number", len(submatchall))
@@ -801,7 +801,7 @@ func (v *Vehicle) GetVehicleCondition() {
 				}
 			}
 			if strings.HasPrefix(key, "window") && strings.HasSuffix(key, "Status") {
-				pos := strings.TrimPrefix(key, "door")
+				pos := strings.TrimPrefix(key, "window")
 				pos = strings.TrimSuffix(pos, "Status")
 				submatchall := re.FindAllString(pos, -1)
 				v.client.logger.Debug("VEHICLE COND", "key", key, "data", child.Data(), "number", len(submatchall))