andythenorth Merge branch 'road-and-tram-types' into can-build-vehicle-infrastructure