From e802aedb8cf7678cacb92cd02e2e35d051310252 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 2 Jun 2016 16:18:46 -0700
Subject: [PATCH] [core, node, android] Remove used "base" parameter from
 setStyleJSON

---
 bin/render.cpp                                |  2 +-
 include/mbgl/map/map.hpp                      |  4 +--
 .../mapbox/mapboxsdk/maps/NativeMapView.java  |  9 ++----
 platform/android/src/jni.cpp                  |  8 ++----
 platform/node/src/node_map.cpp                |  2 +-
 src/mbgl/map/map.cpp                          | 20 +++++--------
 src/mbgl/style/style.cpp                      |  2 +-
 src/mbgl/style/style.hpp                      |  2 +-
 test/api/annotations.cpp                      | 28 +++++++++----------
 test/api/custom_layer.cpp                     |  2 +-
 test/api/render_missing.cpp                   |  2 +-
 test/api/repeated_render.cpp                  |  4 +--
 test/api/set_style.cpp                        |  2 +-
 test/map/map.cpp                              |  8 +++---
 test/style/style.cpp                          |  6 ++--
 15 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/bin/render.cpp b/bin/render.cpp
index 70571f7f7..a43bf32dd 100644
--- a/bin/render.cpp
+++ b/bin/render.cpp
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
     HeadlessView view(pixelRatio, width, height);
     Map map(view, fileSource, MapMode::Still);
 
-    map.setStyleJSON(style, ".");
+    map.setStyleJSON(style);
     map.setClasses(classes);
 
     map.setLatLngZoom({ lat, lon }, zoom);
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index b44b53ff9..f805680b7 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -57,8 +57,8 @@ public:
     bool hasClass(const std::string&) const;
     std::vector<std::string> getClasses() const;
 
-    void setStyleURL(const std::string& url);
-    void setStyleJSON(const std::string& json, const std::string& base = "");
+    void setStyleURL(const std::string&);
+    void setStyleJSON(const std::string&);
     std::string getStyleURL() const;
     std::string getStyleJSON() const;
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index 8380d33d1..6c092ee0c 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -194,11 +194,7 @@ final class NativeMapView {
     }
 
     public void setStyleJson(String newStyleJson) {
-        setStyleJson(newStyleJson, "");
-    }
-
-    public void setStyleJson(String newStyleJson, String base) {
-        nativeSetStyleJson(mNativeMapViewPtr, newStyleJson, base);
+        nativeSetStyleJson(mNativeMapViewPtr, newStyleJson);
     }
 
     public String getStyleJson() {
@@ -528,8 +524,7 @@ final class NativeMapView {
 
     private native void nativeSetStyleUrl(long nativeMapViewPtr, String url);
 
-    private native void nativeSetStyleJson(long nativeMapViewPtr,
-                                           String newStyleJson, String base);
+    private native void nativeSetStyleJson(long nativeMapViewPtr, String newStyleJson);
 
     private native String nativeGetStyleJson(long nativeMapViewPtr);
 
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 5c0f7b153..e79689d7a 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -427,13 +427,11 @@ void nativeSetStyleUrl(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, j
     nativeMapView->getMap().setStyleURL(std_string_from_jstring(env, url));
 }
 
-void nativeSetStyleJson(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr,
-                                jni::jstring* newStyleJson, jni::jstring* base) {
+void nativeSetStyleJson(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jni::jstring* newStyleJson) {
     mbgl::Log::Debug(mbgl::Event::JNI, "nativeSetStyleJSON");
     assert(nativeMapViewPtr != 0);
     NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
-    nativeMapView->getMap().setStyleJSON(std_string_from_jstring(env, newStyleJson),
-                                         std_string_from_jstring(env, base));
+    nativeMapView->getMap().setStyleJSON(std_string_from_jstring(env, newStyleJson));
 }
 
 jni::jstring* nativeGetStyleJson(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr) {
@@ -1686,7 +1684,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
         MAKE_NATIVE_METHOD(nativeSetClasses, "(JLjava/util/List;)V"),
         MAKE_NATIVE_METHOD(nativeGetClasses, "(J)Ljava/util/List;"),
         MAKE_NATIVE_METHOD(nativeSetStyleUrl, "(JLjava/lang/String;)V"),
-        MAKE_NATIVE_METHOD(nativeSetStyleJson, "(JLjava/lang/String;Ljava/lang/String;)V"),
+        MAKE_NATIVE_METHOD(nativeSetStyleJson, "(JLjava/lang/String;)V"),
         MAKE_NATIVE_METHOD(nativeGetStyleJson, "(J)Ljava/lang/String;"),
         MAKE_NATIVE_METHOD(nativeSetAccessToken, "(JLjava/lang/String;)V"),
         MAKE_NATIVE_METHOD(nativeGetAccessToken, "(J)Ljava/lang/String;"),
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index e56f31b0e..165e27b66 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -188,7 +188,7 @@ NAN_METHOD(NodeMap::Load) {
     }
 
     try {
-        nodeMap->map->setStyleJSON(style, ".");
+        nodeMap->map->setStyleJSON(style);
     } catch (const std::exception &ex) {
         return Nan::ThrowError(ex.what());
     }
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index ec961a648..d5f5574d5 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -43,7 +43,7 @@ public:
     void update();
     void render();
 
-    void loadStyleJSON(const std::string& json, const std::string& base);
+    void loadStyleJSON(const std::string&);
 
     View& view;
     FileSource& fileSource;
@@ -297,13 +297,7 @@ void Map::setStyleURL(const std::string& url) {
 
     impl->style = std::make_unique<Style>(impl->fileSource, impl->pixelRatio);
 
-    const size_t pos = impl->styleURL.rfind('/');
-    std::string base = "";
-    if (pos != std::string::npos) {
-        base = impl->styleURL.substr(0, pos + 1);
-    }
-
-    impl->styleRequest = impl->fileSource.request(Resource::style(impl->styleURL), [this, base](Response res) {
+    impl->styleRequest = impl->fileSource.request(Resource::style(impl->styleURL), [this](Response res) {
         if (res.error) {
             if (res.error->reason == Response::Error::Reason::NotFound &&
                 util::mapbox::isMapboxURL(impl->styleURL)) {
@@ -314,12 +308,12 @@ void Map::setStyleURL(const std::string& url) {
         } else if (res.notModified || res.noContent) {
             return;
         } else {
-            impl->loadStyleJSON(*res.data, base);
+            impl->loadStyleJSON(*res.data);
         }
     });
 }
 
-void Map::setStyleJSON(const std::string& json, const std::string& base) {
+void Map::setStyleJSON(const std::string& json) {
     if (impl->styleJSON == json) {
         return;
     }
@@ -332,11 +326,11 @@ void Map::setStyleJSON(const std::string& json, const std::string& base) {
     impl->styleJSON.clear();
     impl->style = std::make_unique<Style>(impl->fileSource, impl->pixelRatio);
 
-    impl->loadStyleJSON(json, base);
+    impl->loadStyleJSON(json);
 }
 
-void Map::Impl::loadStyleJSON(const std::string& json, const std::string& base) {
-    style->setJSON(json, base);
+void Map::Impl::loadStyleJSON(const std::string& json) {
+    style->setJSON(json);
     style->setObserver(this);
     styleJSON = json;
 
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index b86845154..5c6037a7d 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -78,7 +78,7 @@ Style::Style(FileSource& fileSource_, float pixelRatio)
     spriteStore->setObserver(this);
 }
 
-void Style::setJSON(const std::string& json, const std::string&) {
+void Style::setJSON(const std::string& json) {
     sources.clear();
     layers.clear();
     classes.clear();
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index a679681f4..05a975a95 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -39,7 +39,7 @@ public:
     Style(FileSource&, float pixelRatio);
     ~Style();
 
-    void setJSON(const std::string& data, const std::string& base);
+    void setJSON(const std::string&);
 
     void setObserver(Observer*);
 
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index ce5aaa860..60d7db6ba 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -37,7 +37,7 @@ public:
 TEST(Annotations, SymbolAnnotation) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
     test.map.addAnnotation(SymbolAnnotation { Point<double>(0, 0), "default_marker" });
     test.checkRendering("point_annotation");
@@ -51,7 +51,7 @@ TEST(Annotations, LineAnnotation) {
     annotation.color = {{ 255, 0, 0, 1 }};
     annotation.width = 5;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotation(annotation);
     test.checkRendering("line_annotation");
 }
@@ -63,7 +63,7 @@ TEST(Annotations, FillAnnotation) {
     FillAnnotation annotation { polygon };
     annotation.color = {{ 255, 0, 0, 1 }};
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotation(annotation);
     test.checkRendering("fill_annotation");
 }
@@ -73,7 +73,7 @@ TEST(Annotations, StyleSourcedShapeAnnotation) {
 
     Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/annotation.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/annotation.json"));
     test.map.addAnnotation(StyleSourcedAnnotation { polygon, "annotation" });
     test.checkRendering("style_sourced_shape_annotation");
 }
@@ -81,7 +81,7 @@ TEST(Annotations, StyleSourcedShapeAnnotation) {
 TEST(Annotations, AddMultiple) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
     test.map.addAnnotation(SymbolAnnotation { Point<double> { -10, 0 }, "default_marker" });
 
@@ -94,7 +94,7 @@ TEST(Annotations, AddMultiple) {
 TEST(Annotations, NonImmediateAdd) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test::render(test.map);
 
     Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
@@ -108,7 +108,7 @@ TEST(Annotations, NonImmediateAdd) {
 TEST(Annotations, UpdateIcon) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotationIcon("flipped_marker", namedMarker("default_marker.png"));
     test.map.addAnnotation(SymbolAnnotation { Point<double> { 0, 0 }, "flipped_marker" });
 
@@ -124,7 +124,7 @@ TEST(Annotations, UpdateIcon) {
 TEST(Annotations, UpdatePoint) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
     test.map.addAnnotationIcon("flipped_marker", namedMarker("flipped_marker.png"));
     AnnotationID point = test.map.addAnnotation(SymbolAnnotation { Point<double> { 0, 0 }, "default_marker" });
@@ -138,7 +138,7 @@ TEST(Annotations, UpdatePoint) {
 TEST(Annotations, RemovePoint) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
     AnnotationID point = test.map.addAnnotation(SymbolAnnotation { Point<double> { 0, 0 }, "default_marker" });
 
@@ -156,7 +156,7 @@ TEST(Annotations, RemoveShape) {
     annotation.color = {{ 255, 0, 0, 1 }};
     annotation.width = 5;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     AnnotationID shape = test.map.addAnnotation(annotation);
 
     test::render(test.map);
@@ -169,7 +169,7 @@ TEST(Annotations, ImmediateRemoveShape) {
     AnnotationTest test;
 
     test.map.removeAnnotation(test.map.addAnnotation(LineAnnotation { LineString<double>() }));
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
 
     test::render(test.map);
 }
@@ -177,20 +177,20 @@ TEST(Annotations, ImmediateRemoveShape) {
 TEST(Annotations, SwitchStyle) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
     test.map.addAnnotation(SymbolAnnotation { Point<double> { 0, 0 }, "default_marker" });
 
     test::render(test.map);
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.checkRendering("switch_style");
 }
 
 TEST(Annotations, QueryRenderedFeatures) {
     AnnotationTest test;
 
-    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
     test.map.addAnnotation(SymbolAnnotation { Point<double> { 0, 0 }, "default_marker" });
 
diff --git a/test/api/custom_layer.cpp b/test/api/custom_layer.cpp
index c805df556..e0be341c4 100644
--- a/test/api/custom_layer.cpp
+++ b/test/api/custom_layer.cpp
@@ -77,7 +77,7 @@ TEST(CustomLayer, Basic) {
     StubFileSource fileSource;
 
     Map map(view, fileSource, MapMode::Still);
-    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     map.addLayer(std::make_unique<CustomLayer>(
         "custom",
         [] (void* context) {
diff --git a/test/api/render_missing.cpp b/test/api/render_missing.cpp
index c1cc3fac3..e0fb8e4c5 100644
--- a/test/api/render_missing.cpp
+++ b/test/api/render_missing.cpp
@@ -40,7 +40,7 @@ TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) {
     std::string message;
 
     // This host does not respond (== connection error).
-    map.setStyleJSON(style, "");
+    map.setStyleJSON(style);
     map.renderStill([&](std::exception_ptr err, PremultipliedImage&&) {
         ASSERT_TRUE(err.operator bool());
         try {
diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index cf5d11599..3a71ddb08 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -32,7 +32,7 @@ TEST(API, RepeatedRender) {
     Map map(view, fileSource, MapMode::Still);
 
     {
-        map.setStyleJSON(style, "");
+        map.setStyleJSON(style);
         PremultipliedImage result;
         map.renderStill([&result](std::exception_ptr, PremultipliedImage&& image) {
             result = std::move(image);
@@ -50,7 +50,7 @@ TEST(API, RepeatedRender) {
     }
 
     {
-        map.setStyleJSON(style, "");
+        map.setStyleJSON(style);
         PremultipliedImage result;
         map.renderStill([&result](std::exception_ptr, PremultipliedImage&& image) {
             result = std::move(image);
diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp
index f9beb5387..fb5027c07 100644
--- a/test/api/set_style.cpp
+++ b/test/api/set_style.cpp
@@ -21,7 +21,7 @@ TEST(API, SetStyle) {
 
     {
         Map map(view, fileSource, MapMode::Still);
-        map.setStyleJSON("invalid", "");
+        map.setStyleJSON("invalid");
     }
 
     auto observer = Log::removeObserver();
diff --git a/test/map/map.cpp b/test/map/map.cpp
index 7cafe563b..57adee567 100644
--- a/test/map/map.cpp
+++ b/test/map/map.cpp
@@ -56,15 +56,15 @@ TEST(Map, DoubleStyleLoad) {
     MapTest test;
 
     Map map(test.view, test.fileSource, MapMode::Still);
-    map.setStyleJSON("", "");
-    map.setStyleJSON("", "");
+    map.setStyleJSON("");
+    map.setStyleJSON("");
 }
 
 TEST(Map, AddLayer) {
     MapTest test;
 
     Map map(test.view, test.fileSource, MapMode::Still);
-    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
 
     auto layer = std::make_unique<BackgroundLayer>("background");
     layer->setBackgroundColor({{{ 1, 0, 0, 1 }}});
@@ -77,7 +77,7 @@ TEST(Map, RemoveLayer) {
     MapTest test;
 
     Map map(test.view, test.fileSource, MapMode::Still);
-    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
 
     auto layer = std::make_unique<BackgroundLayer>("background");
     layer->setBackgroundColor({{{ 1, 0, 0, 1 }}});
diff --git a/test/style/style.cpp b/test/style/style.cpp
index 931867978..d530d9cbd 100644
--- a/test/style/style.cpp
+++ b/test/style/style.cpp
@@ -16,7 +16,7 @@ TEST(Style, UnusedSource) {
 
     auto now = Clock::now();
 
-    style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"), "");
+    style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"));
     style.cascade(now, MapMode::Still);
     style.recalculate(0, now, MapMode::Still);
 
@@ -35,7 +35,7 @@ TEST(Style, UnusedSourceActiveViaClassUpdate) {
     StubFileSource fileSource;
     Style style { fileSource, 1.0 };
 
-    style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"), "");
+    style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"));
     EXPECT_TRUE(style.addClass("visible"));
     EXPECT_TRUE(style.hasClass("visible"));
 
@@ -49,7 +49,7 @@ TEST(Style, UnusedSourceActiveViaClassUpdate) {
     EXPECT_TRUE(unusedSource->isLoaded());
 
     // Style classes should be cleared upon new style load.
-    style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"), "");
+    style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"));
     EXPECT_FALSE(style.hasClass("visible"));
 
     now = Clock::now();