Fixed interpolation generating invalid times

vesavlad · Mar 5, 2022 · 336734d · 336734d
1 parent db4e594
commit 336734d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/libs/gtfs/src/gtfs/time.cpp b/src/libs/gtfs/src/gtfs/time.cpp
@@ -40,7 +40,7 @@ time::time(const std::string & raw_time_str) : raw_time(raw_time_str)
     mm = static_cast<uint16_t>(std::stoi(raw_time.substr(len - 5, 2)));
     ss = static_cast<uint16_t>(std::stoi(raw_time.substr(len - 2)));
 
-    if (mm > 60 || ss > 60)
+    if (mm > 59 || ss > 59)
         throw invalid_field_format("time minutes/seconds wrong value: " + std::to_string(mm) +
                                  " minutes, " + std::to_string(ss) + " seconds");
 
@@ -55,7 +55,7 @@ time::time(size_t seconds)
     mm = seconds / 60;
     ss = seconds % 60;
 
-    if (mm > 60 || ss > 60)
+    if (mm > 59 || ss > 59)
         throw invalid_field_format("time is out of range: " + std::to_string(mm) + "minutes " +
                                    std::to_string(ss) + "seconds");
 
@@ -68,7 +68,7 @@ time::time(size_t seconds)
 time::time(uint16_t hours, uint16_t minutes, uint16_t seconds)
         : hh(hours), mm(minutes), ss(seconds)
 {
-    if (mm > 60 || ss > 60)
+    if (mm > 59 || ss > 59)
         throw invalid_field_format("time is out of range: " + std::to_string(mm) + "minutes " +
                                  std::to_string(ss) + "seconds");
 
@@ -92,14 +92,14 @@ time& time::add_seconds(size_t seconds)
     auto s = seconds % 60;
 
     ss += s;
-    if (ss > 60)
+    if (ss > 59)
     {
         ss = ss % 60;
         mm++;
     }
 
     mm += m;
-    if (mm > 60)
+    if (mm >= 59)
     {
         mm = mm % 60;
         hh++;