X-Git-Url: http://git.code-monkey.de/?p=gps-watch.git;a=blobdiff_plain;f=test%2Flogger_test.rs;fp=test%2Flogger_test.rs;h=a0308218e85d576a96fc665be73a8d48c39a49ab;hp=7b0cdbd1391455d5361d9cc0672f2c4d6a84ad32;hb=8131a71527b5279bca9b80aac37596f6264ea2a1;hpb=4d7316c074f07d02bdbdff1a98f0966bafda62e4

diff --git a/test/logger_test.rs b/test/logger_test.rs
index 7b0cdbd..a030821 100644
--- a/test/logger_test.rs
+++ b/test/logger_test.rs
@@ -116,8 +116,8 @@ fn first_recording() {
     let tap = gps::TimeAndPos {
         system_time: 0,
         unix_time: 1478026311,
-        latitude: 0x73234e,
-        longitude: 0x73234f,
+        latitude_deg: 0x73234e,
+        longitude_deg: 0x73234f,
         latitude_rad: Fixed::from_f32(12.57613).to_radians(),
         longitude_rad: Fixed::from_f32(12.576131666666667).to_radians(),
     };
@@ -172,8 +172,8 @@ fn second_recording() {
     let tap = gps::TimeAndPos {
         system_time: 0,
         unix_time: 1478026312,
-        latitude: 0x73234e,
-        longitude: 0x73234f,
+        latitude_deg: 0x73234e,
+        longitude_deg: 0x73234f,
         latitude_rad: Fixed::from_f32(12.57613).to_radians(),
         longitude_rad: Fixed::from_f32(12.576131666666667).to_radians(),
     };
@@ -219,8 +219,8 @@ fn multi_sector_recording() {
     let tap = gps::TimeAndPos {
         system_time: 0,
         unix_time: 1578425250,
-        latitude: 0x73234e,
-        longitude: 0x73234f,
+        latitude_deg: 0x73234e,
+        longitude_deg: 0x73234f,
         latitude_rad: Fixed::from_f32(12.57613).to_radians(),
         longitude_rad: Fixed::from_f32(12.576131666666667).to_radians(),
     };
@@ -234,12 +234,12 @@ fn multi_sector_recording() {
         let tap = gps::TimeAndPos {
             system_time: 0,
             unix_time: prev_tap.unix_time + 1,
-            latitude: prev_tap.latitude + 1,
-            longitude: prev_tap.longitude + 1,
+            latitude_deg: prev_tap.latitude_deg + 1,
+            longitude_deg: prev_tap.longitude_deg + 1,
             latitude_rad: Fixed::from_f32(
-                (prev_tap.latitude + 1) as f32 / 600000.0).to_radians(),
+                (prev_tap.latitude_deg + 1) as f32 / 600000.0).to_radians(),
             longitude_rad: Fixed::from_f32(
-                (prev_tap.longitude + 1) as f32 / 600000.0).to_radians(),
+                (prev_tap.longitude_deg + 1) as f32 / 600000.0).to_radians(),
         };
 
         logger.log(&prev_tap, &tap);
@@ -335,8 +335,8 @@ fn get_recording_valid() {
     let tap0 = gps::TimeAndPos {
         system_time: 0,
         unix_time: 1478026311,
-        latitude: 0x73234e,
-        longitude: 0x73234f,
+        latitude_deg: 0x73234e,
+        longitude_deg: 0x73234f,
         latitude_rad: Fixed::from_f32(12.57613).to_radians(),
         longitude_rad: Fixed::from_f32(12.576131666666667).to_radians(),
     };
@@ -346,8 +346,8 @@ fn get_recording_valid() {
     let tap1 = gps::TimeAndPos {
         system_time: 0,
         unix_time: 1478026311 + 1,
-        latitude: 0x73234e + 5,
-        longitude: 0x73234f + 5,
+        latitude_deg: 0x73234e + 5,
+        longitude_deg: 0x73234f + 5,
         latitude_rad: Fixed::from_f32(12.576138333333333).to_radians(),
         longitude_rad: Fixed::from_f32(12.57614).to_radians(),
     };
@@ -357,8 +357,8 @@ fn get_recording_valid() {
     let tap2 = gps::TimeAndPos {
         system_time: 0,
         unix_time: 1478026311 + 2,
-        latitude: 0x73234e + 10,
-        longitude: 0x73234f + 10,
+        latitude_deg: 0x73234e + 10,
+        longitude_deg: 0x73234f + 10,
         latitude_rad: Fixed::from_f32(12.576146666666666).to_radians(),
         longitude_rad: Fixed::from_f32(12.576148333333334).to_radians(),
     };