This is great work.  My only comment is that your tab spacing is a little aggressive.  I can fix this for you if you like, but I typically like to set my tab spacing to 2 spaces per tab.  Other than that, this looks good and I will take it.  I will also add this to the <a href="http://github.com/mediafront/osmplayer">OSM Player</a> once it is accepted.  

Again, thanks for your work on this.