Vinos display on map
Merge branch '0007-vinos-map-draw' into develop