refactored things into Map class
Merge branch 'master' of https://github.com/tdubourg/geobombing