Fixing Cartographics mapping, adding support for polygon maps (DHH-162)