update map.js
update map.js
fix conflict
Merge pull request #12 from sryoji/win

update map.js