Convert to 4326 first for OSM based maps
Merge remote-tracking branch 'origin/d3_api' into d3_api