Models for Joining Consumer Trips and Goods Movements at Urban Scale