[core] Fix render tile set source update

Before this change, the `RenderTileSetSource` implementation
ignored update calls for the sources whose description was not yet
loaded and it lead to missing of relayout requests.

2 files changed, 40 insertions, 1 deletions

diff --git a/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp
index ef3f34f595..c5afb38435 100644
--- a/src/mbgl/renderer/sources/render_tile_source.cpp
+++ b/src/mbgl/renderer/sources/render_tile_source.cpp
@@ -176,7 +176,7 @@ void RenderTileSetSource::update(Immutable<style::Source::Impl> baseImpl_,
         tilePyramid.clearAll();
     }
 
-    if (!implTileset) return;
+    if (!cachedTileset) return;
 
     updateInternal(*cachedTileset, layers, needsRendering, needsRelayout, parameters);
 }
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index 09c433b6a4..ca0e79f46a 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -42,6 +42,7 @@
 #include <mbgl/text/glyph_manager.hpp>
 
 #include <cstdint>
+#include <gmock/gmock.h>
 
 using namespace mbgl;
 using SourceType = mbgl::style::SourceType;
@@ -793,3 +794,41 @@ TEST(Source, CustomGeometrySourceSetTileData) {
     test.run();
 }
 
+TEST(Source, RenderTileSetSourceUpdate) {
+    SourceTest test;
+
+    class FakeRenderTileSetSource : public RenderTileSetSource {
+    public:
+        explicit FakeRenderTileSetSource(Immutable<style::Source::Impl> impl_)
+            : RenderTileSetSource(std::move(impl_)) {}
+
+        MOCK_METHOD0(mockedUpdateInternal, void());
+
+        void updateInternal(const Tileset&,
+                            const std::vector<Immutable<style::LayerProperties>>&,
+                            const bool, const bool, const TileParameters&) override {
+            mockedUpdateInternal();
+        }
+
+        const optional<Tileset>& getTileset() const override {
+            return static_cast<const style::VectorSource::Impl&>(*baseImpl).tileset;
+        }
+    };
+
+    VectorSource initialized("source", Tileset{ {"tiles"} });
+    initialized.loadDescription(*test.fileSource);
+
+    FakeRenderTileSetSource renderTilesetSource { initialized.baseImpl };
+
+    LineLayer layer("id", "source");
+    Immutable<LayerProperties> layerProperties = makeMutable<LineLayerProperties>(staticImmutableCast<LineLayer::Impl>(layer.baseImpl));
+    std::vector<Immutable<LayerProperties>> layers { layerProperties };
+
+    // Check that `updateInternal()` is called even if the updated source has not yet loaded description.
+    EXPECT_CALL(renderTilesetSource, mockedUpdateInternal()).Times(2);
+    RenderSource* renderSource = &renderTilesetSource;
+    renderSource->update(initialized.baseImpl, layers, true, true, test.tileParameters);    
+
+    VectorSource uninitialized("source", "http://url");
+    renderSource->update(uninitialized.baseImpl, layers, true, true, test.tileParameters);
+}