Fixed style background not being properly set when VectorTileDecoder …

…style was updated
CartoDB · Apr 19, 2017 · cef2610 · cef2610
1 parent df867a4
commit cef2610
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/all/native/layers/VectorTileLayer.cpp b/all/native/layers/VectorTileLayer.cpp
@@ -388,17 +388,17 @@ namespace carto {
         // Create new rendererer, simply drop old one (if exists)
         auto renderer = std::make_shared<TileRenderer>(_mapRenderer, _useFBO, _useDepth, _useStencil);
         renderer->onSurfaceCreated(shaderManager, textureManager);
-        renderer->setBackgroundColor(_tileDecoder->getBackgroundColor());
-        if (_tileDecoder->getBackgroundPattern()) {
-            renderer->setBackgroundPattern(_tileDecoder->getBackgroundPattern());
-        }
         setRenderer(renderer);
     }
 
     bool VectorTileLayer::onDrawFrame(float deltaSeconds, BillboardSorter& billboardSorter, StyleTextureCache& styleCache, const ViewState& viewState) {
         updateTileLoadListener();
 
         if (auto renderer = getRenderer()) {
+            renderer->setBackgroundColor(_tileDecoder->getBackgroundColor());
+            if (auto backgroundPattern = _tileDecoder->getBackgroundPattern()) {
+                renderer->setBackgroundPattern(backgroundPattern);
+            }
             renderer->setLabelOrder(static_cast<int>(getLabelRenderOrder()));
             renderer->setBuildingOrder(static_cast<int>(getBuildingRenderOrder()));
             renderer->setInteractionMode(_vectorTileEventListener.get() ? true : false);

diff --git a/all/native/vectortiles/MBVectorTileDecoder.cpp b/all/native/vectortiles/MBVectorTileDecoder.cpp
@@ -490,6 +490,8 @@ namespace carto {
         _backgroundPattern = backgroundPattern;
         _symbolizerContext = symbolizerContext;
         _styleSet = styleSet;
+        _cachedFeatureDecoder.first.reset();
+        _cachedFeatureDecoder.second.reset();
     }
 
     const int MBVectorTileDecoder::DEFAULT_TILE_SIZE = 256;