diff --git a/.travis.yml b/.travis.yml index dafc63c52..256029607 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ sudo: required dist: xenial services: - redis-server + - xvfb cache: directories: - $GDALINST @@ -17,10 +18,6 @@ before_install: - travis_wait 30 ./misc/install_gdal.sh - export PATH=$GDALINST/gdal-2.2.3/bin:$PATH - export LD_LIBRARY_PATH=$GDALINST/gdal-2.2.3/lib:$LD_LIBRARY_PATH - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - - sleep 3 - - fluxbox >/dev/null 2>&1 & install: - npm -g install topojson - pip install --upgrade "setuptools>=25.1" pip diff --git a/client/js/webworker_jointure.js b/client/js/webworker_jointure.js index b54953520..ab8da3343 100644 --- a/client/js/webworker_jointure.js +++ b/client/js/webworker_jointure.js @@ -45,5 +45,5 @@ onmessage = function (e) { } } } - postMessage([data_manager.field_join_map, hits]); + postMessage([field_join_map, hits]); }; diff --git a/magrit_app/static/dist/webworker_jointure.js b/magrit_app/static/dist/webworker_jointure.js index b54953520..ab8da3343 100644 --- a/magrit_app/static/dist/webworker_jointure.js +++ b/magrit_app/static/dist/webworker_jointure.js @@ -45,5 +45,5 @@ onmessage = function (e) { } } } - postMessage([data_manager.field_join_map, hits]); + postMessage([field_join_map, hits]); };