Merge ea021b8 into 7f49cc9

visgl · Nov 5, 2019 · 25a5bbd · 25a5bbd
2 parents 7f49cc9 + ea021b8
commit 25a5bbd
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 1 deletion.
diff --git a/modules/geo-layers/src/tile-layer/tile-layer.js b/modules/geo-layers/src/tile-layer/tile-layer.js
@@ -28,7 +28,11 @@ export default class TileLayer extends CompositeLayer {
 
   updateState({props, oldProps, context, changeFlags}) {
     let {tileCache} = this.state;
-    if (!tileCache || changeFlags.updateTriggersChanged) {
+    if (
+      !tileCache ||
+      (changeFlags.updateTriggersChanged &&
+        (changeFlags.updateTriggersChanged.all || changeFlags.updateTriggersChanged.getTileData))
+    ) {
       const {getTileData, maxZoom, minZoom, maxCacheSize} = props;
       if (tileCache) {
         tileCache.finalize();
@@ -42,7 +46,13 @@ export default class TileLayer extends CompositeLayer {
         onTileError: this._onTileError.bind(this)
       });
       this.setState({tileCache});
+    } else if (changeFlags.updateTriggersChanged) {
+      // if any updateTriggersChanged (other than getTileData), delete the layer
+      this.state.tileCache.tiles.forEach(tile => {
+        tile.layer = null;
+      });
     }
+
     const {viewport} = context;
     if (changeFlags.viewportChanged && viewport.id !== 'DEFAULT-INITIAL-VIEWPORT') {
       const z = this.getLayerZoomLevel();

diff --git a/test/modules/geo-layers/tile-layer/tile-layer.spec.js b/test/modules/geo-layers/tile-layer/tile-layer.spec.js
@@ -31,3 +31,47 @@ test('TileLayer', t => {
   testLayer({Layer: TileLayer, testCases, onError: t.notOk});
   t.end();
 });
+
+test('TileLayer#updateTriggers', t => {
+  const testCases = [
+    {
+      props: {
+        getTileData: 0
+      },
+      onAfterUpdate({layer}) {
+        t.equal(layer.state.tileCache._getTileData, 0, 'Should create a tileCache.');
+      }
+    },
+    {
+      updateProps: {
+        getTileData: 1
+      },
+      onAfterUpdate({layer}) {
+        t.equal(
+          layer.state.tileCache._getTileData,
+          0,
+          'Should not create a tileCache when updateTriggers not changed.'
+        );
+      }
+    },
+    {
+      updateProps: {
+        getTileData: 2,
+        updateTriggers: {
+          getTileData: 2
+        }
+      },
+      onAfterUpdate({layer}) {
+        t.equal(
+          layer.state.tileCache._getTileData,
+          2,
+          'Should create a new tileCache with updated getTileData.'
+        );
+      }
+    }
+  ];
+
+  testLayer({Layer: TileLayer, testCases, onError: t.notOk});
+
+  t.end();
+});