refonte affichage selon carte.java
merging
merging