refactor marker placements
Merge pull request #2388 from mapycz/3.x-refactor-markers-placement

refactor marker placements