Refactor|Map Renderer: Began extracting geometry construction from the map renderer