Make highway track areas more consistent with tracks

Resolves #445
Merge pull request #1080 from math1985/track-areas

Make highway track areas more consistent with tracks