Finish all logics of map view in toilet module
Merge branch 'feature-toilet' into develop