Move map.js into main.js.
[fix] intersection weight calculation
Merge remote-tracking branch 'origin/master'