Redrawing the World Energy Map