Moved OSM related bits into city exporter