Work on worldmap, better svg + new data definition