Revert "don't clear state on reload, just on setData (#7129)"

fdc96d5
mapbox · Aug 16, 2018 · 68353fd · 68353fd
1 parent aad9b54
commit 68353fd
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 113 deletions.
diff --git a/src/source/source_cache.js b/src/source/source_cache.js
@@ -75,7 +75,6 @@ class SourceCache extends Evented {
             // for sources with mutable data, this event fires when the underlying data
             // to a source is changed. (i.e. GeoJSONSource#setData and ImageSource#serCoordinates)
             if (this._sourceLoaded && !this._paused && e.dataType === "source" && e.sourceDataType === 'content') {
-                if (this._source.type === "geojson") this.resetState();
                 this.reload();
                 if (this.transform) {
                     this.update(this.transform);
@@ -218,6 +217,9 @@ class SourceCache extends Evented {
         }
 
         this._cache.reset();
+        //Reset the SourceCache when the source has been reloaded. For GeoJSON sources, 
+        // the `id`  of features is not guaranteed to be identical when updated
+        this._state = new SourceFeatureState();
 
         for (const i in this._tiles) {
             if (this._tiles[i].state !== "errored") this._reloadTile(i, 'reloading');
@@ -831,14 +833,6 @@ class SourceCache extends Evented {
         sourceLayer = sourceLayer || '_geojsonTileLayer';
         return this._state.getState(sourceLayer, feature);
     }
-
-    /**
-     * Reset the SourceFeatureState when the source has been reloaded. For GeoJSON sources,
-     * the `id`  of features is not guaranteed to be identical when updated
-     */
-    resetState() {
-        this._state = new SourceFeatureState();
-    }
 }
 
 SourceCache.maxOverzooming = 10;

diff --git a/src/style-spec/types.js b/src/style-spec/types.js
@@ -408,4 +408,3 @@ export type LayerSpecification =
     | RasterLayerSpecification
     | HillshadeLayerSpecification
     | BackgroundLayerSpecification;
-
diff --git a/test/integration/render-tests/feature-state/set-paint-property/expected.png b/test/integration/render-tests/feature-state/set-paint-property/expected.png
diff --git a/test/integration/render-tests/feature-state/set-paint-property/style.json b/test/integration/render-tests/feature-state/set-paint-property/style.json
diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
@@ -1268,38 +1268,6 @@ test('Map', (t) => {
                 t.end();
             });
         });
-
-        t.test('resets state if source data is updated', (t) => {
-            const map = createMap(t, {
-                style: {
-                    "version": 8,
-                    "sources": {
-                        "geojson": createStyleSource()
-                    },
-                    "layers": []
-                }
-            });
-            map.on('load', () => {
-                map.setFeatureState({ source: 'geojson', id: '12345'}, {'hover': true});
-                const fState = map.getFeatureState({ source: 'geojson', id: '12345'});
-                t.equal(fState.hover, true);
-
-                map.on('data', () => {
-                    if (map.isSourceLoaded('geojson')) {
-                        const cleanState = map.getFeatureState({ source: 'geojson', id: '12345'});
-                        t.notOk(cleanState.hover);
-                        t.end();
-                    }
-                });
-
-                map.getSource('geojson')
-                    .setData({
-                        type: "FeatureCollection",
-                        features: []
-                    });
-            });
-        });
-
         t.test('throw before loaded', (t) => {
             const map = createMap(t, {
                 style: {