diff --git a/.travis.yml b/.travis.yml index b6e33e7..17579e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,7 @@ before_install: - sudo apt-get install -qq xvfb install: - npm install - - wget -O test_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.8.zip - - unzip -q test_data.zip -d tmp_test_data - - mkdir test_data - - mv tmp_test_data/tileserver-gl-data-*/* -t test_data + - wget -O test_data.zip https://github.com/klokantech/tileserver-gl/releases/download/v1.3.0/test_data.zip + - unzip -q test_data.zip -d test_data script: - xvfb-run --server-args="-screen 0 1024x768x24" npm test diff --git a/src/main.js b/src/main.js index bdfcd08..d13a407 100644 --- a/src/main.js +++ b/src/main.js @@ -175,7 +175,7 @@ fs.stat(path.resolve(opts.config), function(err, stats) { console.log('No MBTiles specified, using ' + mbtiles); return startWithMBTiles(mbtiles); } else { - var url = 'https://github.com/klokantech/tileserver-gl-styles/releases/download/v0.3.0/zurich_switzerland.mbtiles'; + var url = 'https://github.com/klokantech/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles'; var filename = 'zurich_switzerland.mbtiles'; var stream = fs.createWriteStream(filename); console.log('Downloading sample data (' + filename + ') from ' + url); diff --git a/test/metadata.js b/test/metadata.js index 2414445..f754dcb 100644 --- a/test/metadata.js +++ b/test/metadata.js @@ -64,6 +64,6 @@ describe('Metadata', function() { }); }); - testTileJSON('/styles/bright/rendered.json', 'bright'); - testTileJSON('/data/zurich-vector.json', 'zurich-vector'); + testTileJSON('/styles/test-style/rendered.json', 'test-style'); + testTileJSON('/data/openmaptiles.json', 'openmaptiles'); }); diff --git a/test/static.js b/test/static.js index 7c663e5..fc3b59b 100644 --- a/test/static.js +++ b/test/static.js @@ -12,7 +12,7 @@ var testStatic = function(prefix, q, format, status, scale, type, query) { }); }; -var prefix = 'bright'; +var prefix = 'test-style'; describe('Static endpoints', function() { describe('center-based', function() { diff --git a/test/style.js b/test/style.js index f66c91c..b596cd1 100644 --- a/test/style.js +++ b/test/style.js @@ -8,7 +8,7 @@ var testIs = function(url, type, status) { }); }; -var prefix = 'bright'; +var prefix = 'test-style'; describe('Styles', function() { describe('/styles/' + prefix + '.json is valid style', function() { diff --git a/test/tiles_data.js b/test/tiles_data.js index d18e424..2e6566a 100644 --- a/test/tiles_data.js +++ b/test/tiles_data.js @@ -8,7 +8,7 @@ var testTile = function(prefix, z, x, y, status) { }); }; -var prefix = 'zurich-vector'; +var prefix = 'openmaptiles'; describe('Vector tiles', function() { describe('existing tiles', function() { diff --git a/test/tiles_rendered.js b/test/tiles_rendered.js index ff8bb0c..a44e936 100644 --- a/test/tiles_rendered.js +++ b/test/tiles_rendered.js @@ -9,7 +9,7 @@ var testTile = function(prefix, z, x, y, format, status, scale, type) { }); }; -var prefix = 'bright'; +var prefix = 'test-style'; describe('Raster tiles', function() { describe('valid requests', function() {