OPTIMIZED SPATIAL PLANNING AND ENERGY STORAGE FOR RENEWABLE ENERGY