# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1648354824 14400
# Node ID 2039df59c47b6a3af7f6e1636b5eeabc66dc3bd3
# Parent  ee3eaf902b835afed87559d4e4bc18a25e8b3ee1
correcting bug for concatenation caused when saving velocities (1 fewer positions)

diff -r ee3eaf902b83 -r 2039df59c47b trafficintelligence/moving.py
--- a/trafficintelligence/moving.py	Sat Mar 26 22:50:38 2022 -0400
+++ b/trafficintelligence/moving.py	Sun Mar 27 00:20:24 2022 -0400
@@ -1327,7 +1327,7 @@
             newNum = num
         commonTimeInterval = obj1.commonTimeInterval(obj2)
         emptyInterval = TimeInterval(min(obj1.getLastInstant(),obj2.getLastInstant()), max(obj1.getFirstInstant(),obj2.getFirstInstant()))
-        if commonTimeInterval.empty() and emptyInterval.length() >= 3:
+        if commonTimeInterval.empty() and emptyInterval.length() >= 2: # 2 to include situations successive positions, but issues with missing last velocity and reloading
             if newFeatureNum is None:
                 print('Not merging objects {} and {}, missing new feature number'.format(obj1.getNum(),obj2.getNum()))
                 return None, None