angular/leaflet refactor begun