This commit is contained in:
@ -33,14 +33,18 @@ func (awn *AWNProvider) ReqToWeather(_ context.Context, r *http.Request) (
|
||||
}
|
||||
|
||||
func MapAwnUpdate(awnUpdate *AmbientWeatherUpdate) *weather.WeatherUpdate {
|
||||
updateTime, err := time.Parse(time.DateTime, awnUpdate.DateUTC)
|
||||
if err != nil {
|
||||
updateTime = time.Now()
|
||||
updateTime := time.Now()
|
||||
if awnUpdate.DateUTC != nil {
|
||||
ut, err := time.Parse(time.DateTime, *awnUpdate.DateUTC)
|
||||
if err == nil {
|
||||
updateTime = ut
|
||||
}
|
||||
}
|
||||
|
||||
return &weather.WeatherUpdate{
|
||||
StationType: awnUpdate.StationType,
|
||||
DateUTC: &updateTime,
|
||||
StationID: awnUpdate.PassKey,
|
||||
StationType: awnUpdate.StationType,
|
||||
TempOutdoorF: awnUpdate.TempF,
|
||||
HumidityOudoor: awnUpdate.Humidity,
|
||||
WindSpeedMPH: awnUpdate.WindSpeedMPH,
|
||||
|
@ -1,31 +1,31 @@
|
||||
package awn
|
||||
|
||||
type AmbientWeatherUpdate struct {
|
||||
PassKey string `json:"PASSKEY,omitempty" schema:"PASSKEY"`
|
||||
StationType string `json:"stationtype,omitempty" schema:"stationtype"`
|
||||
DateUTC string `json:"dateutc,omitempty" schema:"dateutc"`
|
||||
TempF float64 `json:"tempf,omitempty" schema:"tempf"`
|
||||
Humidity int `json:"humidity,omitempty" schema:"humidity"`
|
||||
WindSpeedMPH float64 `json:"windspeedmph,omitempty" schema:"windspeedmph"`
|
||||
WindGustMPH float64 `json:"windgustmph,omitempty" schema:"windgustmph"`
|
||||
MaxDailyGust float64 `json:"maxdailygust,omitempty" schema:"maxdailygust"`
|
||||
WindDir int `json:"winddir,omitempty" schema:"winddir"`
|
||||
WindDirAVG10m int `json:"winddir_avg10m,omitempty" schema:"winddir_avg10m"`
|
||||
UV int `json:"uv,omitempty" schema:"uv"`
|
||||
SolarRadiation float64 `json:"solarradiation,omitempty" schema:"solarradiation"`
|
||||
HourlyRainIn float64 `json:"hourlyrainin,omitempty" schema:"hourlyrainin"`
|
||||
EventRainIn float64 `json:"eventrainin,omitempty" schema:"eventrainin"`
|
||||
DailyRainIn float64 `json:"dailyrainin,omitempty" schema:"dailyrainin"`
|
||||
WeeklyRainIn float64 `json:"weeklyrainin,omitempty" schema:"weeklyrainin"`
|
||||
MonthlyRainIn float64 `json:"monthlyrainin,omitempty" schema:"monthlyrainin"`
|
||||
YearlyRainIn float64 `json:"yearlyrainin,omitempty" schema:"yearlyrainin"`
|
||||
TotalRainIn float64 `json:"totalrainin,omitempty" schema:"totalrainin"`
|
||||
BattOut int `json:"battout,omitempty" schema:"battout"`
|
||||
BattRain int `json:"battrain,omitempty" schema:"battrain"`
|
||||
TempInF float64 `json:"tempinf,omitempty" schema:"tempinf"`
|
||||
HumidityIn int `json:"humidityin,omitempty" schema:"humidityin"`
|
||||
BaromRelIn float64 `json:"baromrelin,omitempty" schema:"baromrelin"`
|
||||
BaromAbsIn float64 `json:"baromabsin,omitempty" schema:"baromabsin"`
|
||||
BattIn int `json:"battin,omitempty" schema:"battin"`
|
||||
BattCO2 int `json:"batt_co2,omitempty" schema:"batt_co2"`
|
||||
PassKey *string `json:"PASSKEY,omitempty" schema:"PASSKEY"`
|
||||
StationType *string `json:"stationtype,omitempty" schema:"stationtype"`
|
||||
DateUTC *string `json:"dateutc,omitempty" schema:"dateutc"`
|
||||
TempF *float64 `json:"tempf,omitempty" schema:"tempf"`
|
||||
Humidity *int `json:"humidity,omitempty" schema:"humidity"`
|
||||
WindSpeedMPH *float64 `json:"windspeedmph,omitempty" schema:"windspeedmph"`
|
||||
WindGustMPH *float64 `json:"windgustmph,omitempty" schema:"windgustmph"`
|
||||
MaxDailyGust *float64 `json:"maxdailygust,omitempty" schema:"maxdailygust"`
|
||||
WindDir *int `json:"winddir,omitempty" schema:"winddir"`
|
||||
WindDirAVG10m *int `json:"winddir_avg10m,omitempty" schema:"winddir_avg10m"`
|
||||
UV *int `json:"uv,omitempty" schema:"uv"`
|
||||
SolarRadiation *float64 `json:"solarradiation,omitempty" schema:"solarradiation"`
|
||||
HourlyRainIn *float64 `json:"hourlyrainin,omitempty" schema:"hourlyrainin"`
|
||||
EventRainIn *float64 `json:"eventrainin,omitempty" schema:"eventrainin"`
|
||||
DailyRainIn *float64 `json:"dailyrainin,omitempty" schema:"dailyrainin"`
|
||||
WeeklyRainIn *float64 `json:"weeklyrainin,omitempty" schema:"weeklyrainin"`
|
||||
MonthlyRainIn *float64 `json:"monthlyrainin,omitempty" schema:"monthlyrainin"`
|
||||
YearlyRainIn *float64 `json:"yearlyrainin,omitempty" schema:"yearlyrainin"`
|
||||
TotalRainIn *float64 `json:"totalrainin,omitempty" schema:"totalrainin"`
|
||||
BattOut *int `json:"battout,omitempty" schema:"battout"`
|
||||
BattRain *int `json:"battrain,omitempty" schema:"battrain"`
|
||||
TempInF *float64 `json:"tempinf,omitempty" schema:"tempinf"`
|
||||
HumidityIn *int `json:"humidityin,omitempty" schema:"humidityin"`
|
||||
BaromRelIn *float64 `json:"baromrelin,omitempty" schema:"baromrelin"`
|
||||
BaromAbsIn *float64 `json:"baromabsin,omitempty" schema:"baromabsin"`
|
||||
BattIn *int `json:"battin,omitempty" schema:"battin"`
|
||||
BattCO2 *int `json:"batt_co2,omitempty" schema:"batt_co2"`
|
||||
}
|
||||
|
Reference in New Issue
Block a user