Update tests and links to use the new data

.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
+  - 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 tmp_test_data
+  - unzip -q test_data.zip -d test_data
-  - mkdir test_data
-  - mv tmp_test_data/tileserver-gl-data-*/* -t test_data
 script:
   - xvfb-run --server-args="-screen 0 1024x768x24" npm test

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

test/metadata.js

@@ -64,6 +64,6 @@ describe('Metadata', function() {
     });
   });
 
-  testTileJSON('/styles/bright/rendered.json', 'bright');
+  testTileJSON('/styles/test-style/rendered.json', 'test-style');
-  testTileJSON('/data/zurich-vector.json', 'zurich-vector');
+  testTileJSON('/data/openmaptiles.json', 'openmaptiles');
 });

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() {

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() {

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() {

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() {