diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js index a76e6baf0..87536891c 100644 --- a/platform/node/test/render.test.js +++ b/platform/node/test/render.test.js @@ -44,16 +44,9 @@ function renderTest(style, info, base, key) { var url = decodeURIComponent(req.url); console.log('JAVASCRIPT REQUEST:', url); fs.readFile(path.join(suitePath, url), function(err, data) { - // t.error(err); - console.log('CANCELED?', req.canceled, 'ERROR?', err, url); - if (!req.canceled) req.respond(err, { data: data }); + req.respond(err, { data: data }); }); }; - options.cancel = function(req) { - var url = decodeURIComponent(req.url); - console.log('JAVASCRIPT CANCEL:', url); - req.canceled = true; - }; options.ratio = 1.0; var map = new mbgl.Map(options); diff --git a/scripts/node/install.sh b/scripts/node/install.sh index 9711ad359..7ad60d1d9 100755 --- a/scripts/node/install.sh +++ b/scripts/node/install.sh @@ -13,7 +13,7 @@ if [ ${TRAVIS_OS_NAME} == "linux" ]; then mason install mesa 10.4.3 fi -source ~/.nvm/nvm.sh +source .nvm/nvm.sh mapbox_time $NODE_VERSION \ nvm install $NODE_VERSION diff --git a/scripts/node/run.sh b/scripts/node/run.sh index 5e11ab751..b8b31dc19 100755 --- a/scripts/node/run.sh +++ b/scripts/node/run.sh @@ -11,7 +11,7 @@ BUILDTYPE=${BUILDTYPE:-Release} # Build ################################################################################ -source ~/.nvm/nvm.sh +source .nvm/nvm.sh nvm use $NODE_VERSION mapbox_time "checkout_styles" \ diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 9bfb04841..b260b228f 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -9,6 +9,7 @@ #include #include +#include namespace mbgl { @@ -63,6 +64,7 @@ void Map::renderSync() { MapChangeDidFinishRenderingFrame); if (!fullyLoaded) { + std::cout << "RenderState::partial" << std::endl; renderState = RenderState::partial; } else if (renderState != RenderState::fully) { renderState = RenderState::fully;