Models for joining consumer trips and goods movements at urban scale