Integrated with Jon's map view code and tour generation succesfully tested with that.