Updated map polylines to 2.0 colours

Refactored R2RConstants to make it static