diff --git a/pkg/ambient/ambientgrpc/mapupdate_test.go b/pkg/ambient/ambientgrpc/mapupdate_test.go index 67ec41e..f7e1aa8 100644 --- a/pkg/ambient/ambientgrpc/mapupdate_test.go +++ b/pkg/ambient/ambientgrpc/mapupdate_test.go @@ -52,10 +52,8 @@ var mockUpdate = &weather.WeatherUpdate{ TempHumiditySensors: []*weather.TempHumiditySensor{ {Name: "sensor1", TempF: ptr.To(99.999), Humidity: nil}, }, - LightningData: &weather.LightningData{ - LightningDay: ptr.To(1), - LightningDistance: ptr.To(20), - }, + LightningDay: ptr.To(1), + LightningDistance: ptr.To(20), } func TestUpdateToPbUpdate(t *testing.T) { diff --git a/pkg/provider/awn/provider.go b/pkg/provider/awn/provider.go index 3edf0dc..f1399e1 100644 --- a/pkg/provider/awn/provider.go +++ b/pkg/provider/awn/provider.go @@ -143,11 +143,9 @@ func MapAwnUpdate(awnUpdate *AmbientWeatherUpdate) *weather.WeatherUpdate { {Name: THSensor + "7", TempF: awnUpdate.Temp7F, Humidity: awnUpdate.Humidity7}, {Name: THSensor + "8", TempF: awnUpdate.Temp8F, Humidity: awnUpdate.Humidity8}, }, - LightningData: &weather.LightningData{ - LightningDay: awnUpdate.LightningDay, - LightningDistance: awnUpdate.LightningDistance, - LightningTime: awnUpdate.LightningTime, - }, + LightningDay: awnUpdate.LightningDay, + LightningDistance: awnUpdate.LightningDistance, + LightningTime: awnUpdate.LightningTime, } } diff --git a/pkg/weather/types.go b/pkg/weather/types.go index 8623a5d..40bbd29 100644 --- a/pkg/weather/types.go +++ b/pkg/weather/types.go @@ -41,10 +41,6 @@ type WeatherUpdate struct { // Extra Temp+Humidity Sensors TempHumiditySensors []*TempHumiditySensor `json:"tempHumiditySensors,omitempty"` // Lightning Data - *LightningData -} - -type LightningData struct { LightningDay *int `json:"lightningDay,omitempty"` // Count of detections LightningDistance *int `json:"lightningDistance,omitempty"` // Last detection distance [kilometers] LightningTime *int `json:"lightningTime,omitempty"` // Last detection time