diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-08-31 17:56:27 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-08-31 18:09:11 -0700 |
commit | 55d25a80a77c06ef5e66acc0d8518867b03fe8a4 (patch) | |
tree | 81c7ebc771f4190ccb64309f7c45f8268be73be8 | |
parent | 0918ad5a29ea535ac59c39097cd7a670f0a76320 (diff) | |
download | qtlocation-mapboxgl-55d25a80a77c06ef5e66acc0d8518867b03fe8a4.tar.gz |
In still mode, don't load resources until a render request is made
-rw-r--r-- | platform/node/test/js/map.test.js | 22 | ||||
-rw-r--r-- | src/mbgl/map/map_context.cpp | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js index ecd89c1487..d4a8a77960 100644 --- a/platform/node/test/js/map.test.js +++ b/platform/node/test/js/map.test.js @@ -141,6 +141,28 @@ test('Map', function(t) { map.release(); t.end(); }); + + t.test('does not immediately trigger any tile loads', function(t) { + var map = new mbgl.Map({ + request: function(req) { + if (req.url === './fixtures/tiles.tilejson') { + fs.readFile(path.join('test', req.url), function (err, data) { + req.respond(err, {data: data}); + }); + } else { + t.fail('unexpected request ' + req.url); + } + }, + ratio: 1 + }); + + map.load(style); + + setTimeout(function() { + map.release(); + t.end(); + }, 100); + }); }); t.test('.render', function(t) { diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index f6cc4ec2b7..17d3a87ccc 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -259,7 +259,7 @@ void MapContext::update() { updateFlags = Update::Nothing; } - if (updateFlags == Update::Nothing) { + if (updateFlags == Update::Nothing || (data.mode == MapMode::Still && !callback)) { return; } |