enums addedin Road, and colors added in MapViewer
conflict resolved