Merge pull request #107 from matrix-io/lm/demographicFix

Fixing demographics data

Author: lucasmoraisdev

lib/device/drivers/detection.js

@@ -50,18 +50,24 @@ module.exports = {
           // translate from { tag: 'EMOTION', emotion: 'HAPPY' to { emotion: 'happy' }
           debug('v:', v);
 
-          if (_.has(v, tag)) {
+          if (_.has(v, "tag")) {
             // simple values
-	    var tag = v.tag.toLowerCase();
+            var tag = v.tag.toLowerCase();
             r[tag] = v[tag];
-          } else {
+
             // complex values
             if (tag === 'head_pose') {
               r.pose = {};
               r.pose.yaw = v.poseYaw;
               r.pose.roll = v.poseRoll;
               r.pose.pitch = v.posePitch;
+            } else if (tag === 'gender' && _.has(v, 'gender')) {
+              r.gender = v.gender;
+            } else if (tag === 'emotion' && _.has(v, 'emotion')) {
+              r.emotion = v.emotion;
             }
+          } else  if (_.has(v, 'age')) { // age is being received with only the age property, not the  tag
+            r.age = v.age;
           }
           return r;
         }, {});