map.js fixes to share
merge conflict fixed