updated to latest mapsforge rewrite branch commits