Moved infrastructure layers to GeoJSON

Great, I'll clean up that code and  merge these changes in.