Change map setting of trajectory fragment
Merge remote-tracking branch 'origin/master'
Change data dispatch method