Moved infrastructure layers to GeoJSON

Would it be alright if I deleted this commented out code before merging these changes in?