fixed when change from polygon to point map render both polygons and points fixed CDB-1420
Merge remote-tracking branch 'origin/feature/CDB-1265' into release/2.8.0