Map Renderer|Refactor: Consolidated more map geometry construction logic