Only draw intersections for {high,water,rail,aero}way lines

Fixes #1471