Cleanup locationd msg building (#1972)

* cleanup locationd msg building

* remove that

selfdrive/locationd/locationd.py

@@ -113,47 +113,31 @@ class Localizer():
     #ned_vel_std = self.converter.ecef2ned(fix_ecef + vel_ecef + vel_ecef_std) - self.converter.ecef2ned(fix_ecef + vel_ecef)
 
     fix = messaging.log.LiveLocationKalman.new_message()
-    fix.positionGeodetic.value = to_float(fix_pos_geo)
-    fix.positionGeodetic.std = to_float(np.nan*np.zeros(3))
-    fix.positionGeodetic.valid = True
-    fix.positionECEF.value = to_float(fix_ecef)
-    fix.positionECEF.std = to_float(fix_ecef_std)
-    fix.positionECEF.valid = True
-    fix.velocityECEF.value = to_float(vel_ecef)
-    fix.velocityECEF.std = to_float(vel_ecef_std)
-    fix.velocityECEF.valid = True
-    fix.velocityNED.value = to_float(ned_vel)
-    fix.velocityNED.std = to_float(np.nan*np.zeros(3))
-    fix.velocityNED.valid = True
-    fix.velocityDevice.value = to_float(vel_device)
-    fix.velocityDevice.std = to_float(vel_device_std)
-    fix.velocityDevice.valid = True
-    fix.accelerationDevice.value = to_float(predicted_state[States.ACCELERATION])
-    fix.accelerationDevice.std = to_float(predicted_std[States.ACCELERATION_ERR])
-    fix.accelerationDevice.valid = True
-
-    fix.orientationECEF.value = to_float(orientation_ecef)
-    fix.orientationECEF.std = to_float(orientation_ecef_std)
-    fix.orientationECEF.valid = True
-    fix.calibratedOrientationECEF.value = to_float(calibrated_orientation_ecef)
-    fix.calibratedOrientationECEF.std = to_float(np.nan*np.zeros(3))
-    fix.calibratedOrientationECEF.valid = True
-    fix.orientationNED.value = to_float(orientation_ned)
-    fix.orientationNED.std = to_float(np.nan*np.zeros(3))
-    fix.orientationNED.valid = True
-    fix.angularVelocityDevice.value = to_float(predicted_state[States.ANGULAR_VELOCITY])
-    fix.angularVelocityDevice.std = to_float(predicted_std[States.ANGULAR_VELOCITY_ERR])
-    fix.angularVelocityDevice.valid = True
-
-    fix.velocityCalibrated.value = to_float(vel_calib)
-    fix.velocityCalibrated.std = to_float(vel_calib_std)
-    fix.velocityCalibrated.valid = True
-    fix.angularVelocityCalibrated.value = to_float(ang_vel_calib)
-    fix.angularVelocityCalibrated.std = to_float(ang_vel_calib_std)
-    fix.angularVelocityCalibrated.valid = True
-    fix.accelerationCalibrated.value = to_float(acc_calib)
-    fix.accelerationCalibrated.std = to_float(acc_calib_std)
-    fix.accelerationCalibrated.valid = True
+
+    # write measurements to msg
+    measurements = [
+      # measurement field, value, std, valid
+      (fix.positionGeodetic, fix_pos_geo, np.nan*np.zeros(3), True),
+      (fix.positionECEF, fix_ecef, fix_ecef_std, True),
+      (fix.velocityECEF, vel_ecef, vel_ecef_std, True),
+      (fix.velocityNED, ned_vel, np.nan*np.zeros(3), True),
+      (fix.velocityDevice, vel_device, vel_device_std, True),
+      (fix.accelerationDevice, predicted_state[States.ACCELERATION], predicted_std[States.ACCELERATION_ERR], True),
+      (fix.orientationECEF, orientation_ecef, orientation_ecef_std, True),
+      (fix.calibratedOrientationECEF, calibrated_orientation_ecef, np.nan*np.zeros(3), True),
+      (fix.orientationNED, orientation_ned, np.nan*np.zeros(3), True),
+      (fix.angularVelocityDevice, predicted_state[States.ANGULAR_VELOCITY], predicted_std[States.ANGULAR_VELOCITY_ERR], True),
+      (fix.velocityCalibrated, vel_calib, vel_calib_std, True),
+      (fix.angularVelocityCalibrated, ang_vel_calib, ang_vel_calib_std, True),
+      (fix.accelerationCalibrated, acc_calib, acc_calib_std, True),
+    ]
+
+    for field, value, std, valid in measurements:
+      # TODO: can we write the lists faster?
+      field.value = to_float(value)
+      field.std = to_float(std)
+      field.valid = valid
+
     return fix
 
   def liveLocationMsg(self):