inclue country name; round coordinate values
use country names from svg
Merge branch 'map-labels'