Updating to Leaflet 2