Improved intersection rotation and rectangular road network generation