local nvm?

This commit is contained in:
Mike Morris
2015-08-28 15:49:25 -04:00
parent a42a9e4a7c
commit 6bfda4fcef
4 changed files with 5 additions and 10 deletions

View File

@@ -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);

View File

@@ -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

View File

@@ -11,7 +11,7 @@ BUILDTYPE=${BUILDTYPE:-Release}
# Build
################################################################################
source ~/.nvm/nvm.sh
source .nvm/nvm.sh
nvm use $NODE_VERSION
mapbox_time "checkout_styles" \

View File

@@ -9,6 +9,7 @@
#include <mbgl/util/projection.hpp>
#include <mbgl/util/thread.hpp>
#include <iostream>
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;