Initial changes to WorldMap.cpp