major restructuring of chart-world-map code