Fix heatmap bug

* Move assignment of latitude and longitude for heatmap
* Fixes problem of heatmap layering on top of itself