new d3 and leaflet versions