[core] Remove unused SourceData code

4 files changed, 1 insertions, 21 deletions

diff --git a/include/mbgl/style/source_data.hpp b/include/mbgl/style/source_data.hpp
index 2095e75cf8..c71a5ed827 100644
--- a/include/mbgl/style/source_data.hpp
+++ b/include/mbgl/style/source_data.hpp
@@ -13,15 +13,8 @@ class GeoJSONData;
 
 struct SourceData {
     SourceData() = default;
-    explicit SourceData(std::string url_) : url(std::move(url_)) {}
     explicit SourceData(PremultipliedImage image_) : image(std::move(image_)) {}
-    explicit SourceData(GeoJSON geoJSON_) : geoJSON(std::move(geoJSON_)) {}
-    explicit SourceData(std::shared_ptr<GeoJSONData> data) : geoJSONData(std::move(data)) {}
-
-    optional<std::string> url;
     optional<PremultipliedImage> image;
-    optional<GeoJSON> geoJSON;
-    std::shared_ptr<GeoJSONData> geoJSONData;
 };
 
 } // namespace style
diff --git a/include/mbgl/style/sources/geojson_source.hpp b/include/mbgl/style/sources/geojson_source.hpp
index f6c0771734..122b5cfbb9 100644
--- a/include/mbgl/style/sources/geojson_source.hpp
+++ b/include/mbgl/style/sources/geojson_source.hpp
@@ -64,7 +64,6 @@ public:
     void setURL(const std::string& url);
     void setGeoJSON(const GeoJSON&);
     void setGeoJSONData(std::shared_ptr<GeoJSONData>);
-    void setSourceData(SourceData data) override;
     optional<Resource> getResource() const override;
     const GeoJSONData* getGeoJSONData() const override;
 
diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp
index f48e818b12..f73661d820 100644
--- a/src/mbgl/style/sources/geojson_source.cpp
+++ b/src/mbgl/style/sources/geojson_source.cpp
@@ -62,16 +62,6 @@ void GeoJSONSource::setGeoJSONData(std::shared_ptr<GeoJSONData> geoJSONData) {
     observer->onSourceChanged(*this);
 }
 
-void GeoJSONSource::setSourceData(SourceData data) {
-    if (data.url) {
-        setURL(*data.url);
-    } else if (data.geoJSON) {
-        setGeoJSON(*data.geoJSON);
-    } else if (data.geoJSONData) {
-        setGeoJSONData(std::move(data.geoJSONData));
-    }
-}
-
 optional<Resource> GeoJSONSource::getResource() const {
     if (!url) return nullopt;
     return Resource::source(*url);
diff --git a/src/mbgl/style/sources/image_source.cpp b/src/mbgl/style/sources/image_source.cpp
index b30f220520..622f65027c 100644
--- a/src/mbgl/style/sources/image_source.cpp
+++ b/src/mbgl/style/sources/image_source.cpp
@@ -54,9 +54,7 @@ void ImageSource::setImage(PremultipliedImage&& image_) {
 }
 
 void ImageSource::setSourceData(SourceData data) {
-    if (data.url) {
-        setURL(*data.url);
-    } else if (data.image) {
+    if (data.image) {
         setImage(std::move(*data.image));
     }
 }