# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1580397530 18000
# Node ID 2682b4696cdf0e39be8a83eb1b4e82253c9e299c
# Parent  b358bed29ab44dd2b5fd1a373032c5366184f73a# Parent  91faf679e8986f38e61bba4fc27cf7ed3f98833c
merged

diff -r 91faf679e898 -r 2682b4696cdf c/feature-based-tracking.cpp
diff -r 91faf679e898 -r 2682b4696cdf trafficintelligence/cvutils.py
--- a/trafficintelligence/cvutils.py	Fri Nov 29 00:59:46 2019 -0500
+++ b/trafficintelligence/cvutils.py	Thu Jan 30 10:18:50 2020 -0500
@@ -266,7 +266,7 @@
         ymax = max(y)
         xMm = px * (xmax - xmin)
         yMm = py * (ymax - ymin)
-        a = max(ymax - ymin + (2 * yMm), xmax - (xmin + 2 * xMm))
+        a = max(ymax - ymin + (2 * yMm), xmax - xmin + (2 * xMm))
         yCropMin = int(max(0, .5 * (ymin + ymax - a)))
         yCropMax = int(min(height - 1, .5 * (ymin + ymax + a)))
         xCropMin = int(max(0, .5 * (xmin + xmax - a)))
@@ -276,7 +276,7 @@
     def imageBox(img, obj, frameNum, width, height, px = 0.2, py = 0.2, minNPixels = 800):
         'Computes the bounding box of object at frameNum'
         yCropMin, yCropMax, xCropMin, xCropMax = imageBoxSize(obj, frameNum, width, height, px, py)
-        if yCropMax != yCropMin and xCropMax != xCropMin and (yCropMax - yCropMin) * (xCropMax - xCropMin) > minNPixels:
+        if yCropMax > yCropMin and xCropMax > xCropMin and (yCropMax - yCropMin) * (xCropMax - xCropMin) > minNPixels:
             return img[yCropMin : yCropMax, xCropMin : xCropMax]
         else:
             return None
diff -r 91faf679e898 -r 2682b4696cdf trafficintelligence/indicators.py
diff -r 91faf679e898 -r 2682b4696cdf trafficintelligence/moving.py
--- a/trafficintelligence/moving.py	Fri Nov 29 00:59:46 2019 -0500
+++ b/trafficintelligence/moving.py	Thu Jan 30 10:18:50 2020 -0500
@@ -1216,7 +1216,8 @@
                  'motorcycle',
                  'bicycle',
                  'bus',
-                 'truck']
+                 'truck',
+                 'automated']
 
 userType2Num = utils.inverseEnumeration(userTypeNames)