Use layer tag of tunnels for rendering

The layer tag is not taken into account for the rendering of tunnels.
In other words, overlapping tunnels on different layers are now
properly ordered. This is done by using group-by.