# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1584903459 0
# Node ID e9c12982ed28d150c3ce8dd046fd22d9f625b95d
# Parent  342701cdac30456cf0aae0abf18ba973b5d44488# Parent  30171d4fd3df878476bc1d738e347009ce19ac76
Merged in Wendlasida/trafficintelligence-1/Tertuis-Ou-draogo/movingpy-issue-22-from-etienne-beauchamp-1584900380975 (pull request #20)

moving.py [Issue #22 from Etienne Beauchamp In annotationTool Correction]

Approved-by: Tertuis Ouédraogo <tertuis95@gmail.com>

diff -r 342701cdac30 -r e9c12982ed28 trafficintelligence/moving.py
--- a/trafficintelligence/moving.py	Thu Mar 05 16:53:48 2020 -0500
+++ b/trafficintelligence/moving.py	Sun Mar 22 18:57:39 2020 +0000
@@ -1250,11 +1250,11 @@
     def croppedTimeInterval(obj, value, after = True):
         newTimeInterval = TimeInterval(obj.getFirstInstant(), min(value, obj.getLastInstant())) if after else TimeInterval(max(obj.getFirstInstant(), value), obj.getLastInstant())
         if obj.positions is not None :
-            newPositions = obj.positions[slice(newTimeInterval.first, newTimeInterval.last+1)]
+            newPositions = obj.positions[slice(newTimeInterval.first - obj.getLastInstant(), newTimeInterval.last + 1 - obj.getLastInstant())]
         else:
             newPositions = None
         if obj.velocities is not None :
-            newVelocities = obj.velocities[slice(newTimeInterval.first, newTimeInterval.last+1)]
+            newVelocities = obj.velocities[slice(newTimeInterval.first - obj.getLastInstant(), newTimeInterval.last + 1 - obj.getLastInstant())]
         else:
             newVelocities = None
         if obj.hasFeatures():