Skip to content

Commit

Permalink
Fix conversion errors for rain rates (#10)
Browse files Browse the repository at this point in the history 
* Fix conversion errors for rain rates

* Fix unit tests with new test data.
  • Loading branch information
@erenken
erenken authored Mar 4, 2023
1 parent 3d893d7 commit be4870c
Show file tree
Hide file tree
Showing 4 changed files with 235 additions and 235 deletions.
8 changes: 4 additions & 4 deletions src/myNOC.WeatherLink/Models/Sensors/Data/AirLink.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ public AirLink() : base(sensorType: 323, "AirLink") { }
[JsonPropertyName("pm_1")]
public float? PM1 { get; set; }
[JsonPropertyName("pct_pm_data_nowcast")]
public int? PercentPMDataNowCast { get; set; }
public float? PercentPMDataNowCast { get; set; }
[JsonPropertyName("pct_pm_data_24_hour")]
public int? PCTPMDatra_24Hour { get; set; }
public float? PctPMData_24Hour { get; set; }
[JsonPropertyName("wet_bulb")]
public float? WetBulb { get; set; }
[JsonPropertyName("aqi_val")]
Expand All @@ -42,7 +42,7 @@ public AirLink() : base(sensorType: 323, "AirLink") { }
[JsonPropertyName("pm_2p5_3_hour")]
public float? PM2p5_3Hour { get; set; }
[JsonPropertyName("pct_pm_data_3_hour")]
public int? pct_pm_data_3_hour { get; set; }
public float? PctPMData_3Hour { get; set; }
[JsonPropertyName("last_report_time")]
public int? UnixLastReportTime { get; set; }
public DateTimeOffset LastReportTime => DateTimeOffset.FromUnixTimeSeconds(UnixLastReportTime ?? 0);
Expand All @@ -61,7 +61,7 @@ public AirLink() : base(sensorType: 323, "AirLink") { }
[JsonPropertyName("pm_10")]
public float? PM10 { get; set; }
[JsonPropertyName("pct_pm_data_1_hour")]
public int? PCTPMData_1Hhour { get; set; }
public float? PctPMData_1Hhour { get; set; }
[JsonPropertyName("ts")]
public int? UnixTimeStamp { get; set; }
public DateTimeOffset TimeStamp => DateTimeOffset.FromUnixTimeSeconds(UnixTimeStamp ?? 0);
Expand Down
26 changes: 13 additions & 13 deletions src/myNOC.WeatherLink/Models/Sensors/Data/DavisVantagePro2Plus.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public DavisVantagePro2Plus() : base(46, "Vantage Pro2 Plus /w 24-hr-Fan-Aspirat
[JsonPropertyName("wind_dir_scalar_avg_last_10_min")]
public float? WindDirectionScalarAvgLast_10Min { get; set; }
[JsonPropertyName("rain_size")]
public int? RainCupSize { get; set; }
public float? RainCupSize { get; set; }
[JsonPropertyName("uv_index")]
public int? UVIndex { get; set; }
public float? UVIndex { get; set; }
[JsonPropertyName("wind_speed_last")]
public int? WindSpeed { get; set; }
[JsonPropertyName("rainfall_last_60_min_clicks")]
Expand Down Expand Up @@ -53,23 +53,23 @@ public DavisVantagePro2Plus() : base(46, "Vantage Pro2 Plus /w 24-hr-Fan-Aspirat
[JsonPropertyName("rain_rate_hi_clicks")]
public int? RainRateHiClicks { get; set; }
[JsonPropertyName("rainfall_last_15_min_in")]
public int? RainfallLast_15Min_in { get; set; }
public float? RainfallLast_15Min_in { get; set; }
[JsonPropertyName("rainfall_daily_clicks")]
public int? RainfallDailyClicks { get; set; }
[JsonPropertyName("dew_point?")]
public float? DewPoint { get; set; }
[JsonPropertyName("rainfall_last_15_min_mm")]
public int? RainfallLast_15Min_mm { get; set; }
public float? RainfallLast_15Min_mm { get; set; }
[JsonPropertyName("rain_rate_hi_in")]
public int? RainRateHi_in { get; set; }
public float? RainRateHi_in { get; set; }
[JsonPropertyName("rain_storm_clicks")]
public int? RainStormClicks { get; set; }
[JsonPropertyName("rain_rate_hi_mm")]
public int? RainRateHi_mm { get; set; }
public float? RainRateHi_mm { get; set; }
[JsonPropertyName("rainfall_year_clicks")]
public int? RainfallYearClicks { get; set; }
[JsonPropertyName("rain_storm_in")]
public float? RainStorm_n { get; set; }
public float? RainStorm_in { get; set; }
[JsonPropertyName("rain_storm_last_end_at")]
public int? UnixRainStormLastEndAt { get; set; }
public DateTimeOffset RainStormLastEndAt => DateTimeOffset.FromUnixTimeSeconds(UnixRainStormLastEndAt ?? 0);
Expand All @@ -82,11 +82,11 @@ public DavisVantagePro2Plus() : base(46, "Vantage Pro2 Plus /w 24-hr-Fan-Aspirat
[JsonPropertyName("rainfall_last_24_hr_in")]
public float? RainfallLast_24Hr_in { get; set; }
[JsonPropertyName("rainfall_last_60_min_mm")]
public int? RainfallLast_60Min_mm { get; set; }
public float? RainfallLast_60Min_mm { get; set; }
[JsonPropertyName("trans_battery_flag")]
public int? TransmitterBatteryFlag { get; set; }
[JsonPropertyName("rainfall_last_60_min_in")]
public int? RainfallLast_60Min_in { get; set; }
public float? RainfallLast_60Min_in { get; set; }
[JsonPropertyName("rain_storm_start_time")]
public int? UnixRainStormStartTime { get; set; }
public DateTimeOffset RainStormStartTime => DateTimeOffset.FromUnixTimeSeconds(UnixRainStormStartTime ?? 0);
Expand Down Expand Up @@ -119,19 +119,19 @@ public DavisVantagePro2Plus() : base(46, "Vantage Pro2 Plus /w 24-hr-Fan-Aspirat
[JsonPropertyName("rainfall_monthly_in")]
public float? RainfallMonthly_in { get; set; }
[JsonPropertyName("rain_rate_last_mm")]
public int? RainRateLast_mm { get; set; }
public float? RainRateLast_mm { get; set; }
[JsonPropertyName("rain_rate_last_clicks")]
public int? RainRateLastClicks { get; set; }
[JsonPropertyName("rainfall_last_24_hr_clicks")]
public int? RainfallLast_24HrClicks { get; set; }
[JsonPropertyName("rain_storm_last_in")]
public float? RainStormLast_in { get; set; }
[JsonPropertyName("rain_rate_last_in")]
public int? RainRateLast_in { get; set; }
public float? RainRateLast_in { get; set; }
[JsonPropertyName("rain_rate_hi_last_15_min_mm")]
public int? RainRateHiLast_15Min_mm { get; set; }
public float? RainRateHiLast_15Min_mm { get; set; }
[JsonPropertyName("rain_rate_hi_last_15_min_in")]
public int? RainRateHiLast_15Min_in { get; set; }
public float? RainRateHiLast_15Min_in { get; set; }
[JsonPropertyName("ts")]
public int? UnixTimeStamp { get; set; }
public DateTimeOffset TimeStamp => DateTimeOffset.FromUnixTimeSeconds(UnixTimeStamp ?? 0);
Expand Down
8 changes: 4 additions & 4 deletions tests/myNOC.Tests.WeatherLink/JsonConverters/SensorJsonConverterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ public void Deserialize_CurrentJson_ReturnCurrent()

// Assert
Assert.IsNotNull(result);
Assert.AreEqual(1671769064, result.UnixGeneratedAt);
Assert.AreEqual(88769, result.StationId);
Assert.AreEqual(1677903687, result.UnixGeneratedAt);
Assert.AreEqual(152788, result.StationId);
Assert.AreEqual(6, result.Sensors.Count());

var airlink = result?.Sensors.FirstOrDefault(x => x?.Type == 323) as Sensor<AirLink>;
var davis = result?.Sensors.FirstOrDefault(x => x?.Type == 46) as Sensor<DavisVantagePro2Plus>;

Assert.AreEqual(75, airlink?.Data?.FirstOrDefault()?.Humidity);
Assert.AreEqual(12.1f, davis?.Data?.FirstOrDefault()?.Temperature);
Assert.AreEqual(90.5f, airlink?.Data?.FirstOrDefault()?.Humidity);
Assert.AreEqual(32.2f, davis?.Data?.FirstOrDefault()?.Temperature);
}
}
}
Loading

0 comments on commit be4870c

Please sign in to comment.