[dancing points] Improve performance by detecting the map in the viewport
Merge branch 'nico'