Convert mapping data to GeoJSON.

Use a standard format rather than an arbitrary, made-up format.
Merge branch 'geojson'