Upgraded to Leaflet for Map