simplify velocity logic in zonemaster