Refactor|Map Renderer: Consolidated more map geometry construction logic