diff --git a/docs/endpoints.rst b/docs/endpoints.rst index 0672f25..b3a5fa0 100644 --- a/docs/endpoints.rst +++ b/docs/endpoints.rst @@ -21,6 +21,10 @@ Rendered tiles * The rendered tiles are not available in the ``tileserver-gl-light`` version. +WMTS Capabilities +============== +* WMTS Capabilities are served at ``/styles/{id}/wmts.xml`` + Static images ============= * Several endpoints: diff --git a/package.json b/package.json index 05bae9b..21d3837 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tileserver-gl", - "version": "2.3.1", + "version": "2.4.0", "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles", "main": "src/main.js", "bin": "src/main.js", @@ -20,30 +20,29 @@ }, "dependencies": { "@mapbox/mapbox-gl-native": "3.5.4", - "@mapbox/mbtiles": "0.9.0", - "@mapbox/sphericalmercator": "1.0.5", - "@mapbox/vector-tile": "1.3.0", + "@mapbox/mbtiles": "0.10.0", + "@mapbox/sphericalmercator": "1.1.0", + "@mapbox/vector-tile": "1.3.1", "advanced-pool": "0.3.3", - "base64url": "2.0.0", - "canvas": "1.6.8", - "clone": "2.1.1", - "color": "1.0.3", - "commander": "2.1.0", + "canvas": "1.6.12", + "clone": "2.1.2", + "color": "3.0.0", + "commander": "2.18.0", "cors": "2.8.4", - "express": "4.16.2", + "express": "4.16.3", "glyph-pbf-composite": "0.0.2", - "handlebars": "4.0.11", + "handlebars": "4.0.12", "http-shutdown": "^1.2.0", - "morgan": "1.9.0", - "pbf": "3.0.5", - "proj4": "2.4.4", - "request": "2.83.0", - "sharp": "0.18.2", + "morgan": "1.9.1", + "pbf": "3.1.0", + "proj4": "2.5.0", + "request": "2.88.0", + "sharp": "0.20.8", "tileserver-gl-styles": "1.2.0" }, "devDependencies": { - "should": "^11.2.0", - "mocha": "^3.2.0", - "supertest": "^3.0.0" + "mocha": "^5.2.0", + "should": "^13.2.0", + "supertest": "^3.1.0" } } diff --git a/public/templates/index.tmpl b/public/templates/index.tmpl index 8b37ed1..2c61428 100644 --- a/public/templates/index.tmpl +++ b/public/templates/index.tmpl @@ -40,8 +40,8 @@ {{#if serving_rendered}} {{#if serving_data}}| {{/if}}TileJSON {{/if}} - {{#if wmts_link}} - | WMTS + {{#if serving_rendered}} + | WMTS {{/if}} {{#if xyz_link}} | XYZ @@ -110,4 +110,4 @@

- + \ No newline at end of file diff --git a/public/templates/wmts.tmpl b/public/templates/wmts.tmpl new file mode 100644 index 0000000..4fbec04 --- /dev/null +++ b/public/templates/wmts.tmpl @@ -0,0 +1,407 @@ + + + + + TileServer GL + OGC WMTS + 1.0.0 + + + + + + + + + + RESTful + + + + + + + + + + + + + RESTful + + + + + + + + + + {{name}} + {{id}} + + -180 -85.051128779807 + 180 85.051128779807 + + + image/png + + GoogleMapsCompatible + + + + GoogleMapsCompatible + GoogleMapsCompatible EPSG:3857 + GoogleMapsCompatible + urn:ogc:def:crs:EPSG::3857 + + 0 + 559082264.02872 + -20037508.34 20037508.34 + 256 + 256 + 1 + 1 + + + 1 + 279541132.01436 + -20037508.34 20037508.34 + 256 + 256 + 2 + 2 + + + 2 + 139770566.00718 + -20037508.34 20037508.34 + 256 + 256 + 4 + 4 + + + 3 + 69885283.00359 + -20037508.34 20037508.34 + 256 + 256 + 8 + 8 + + + 4 + 34942641.501795 + -20037508.34 20037508.34 + 256 + 256 + 16 + 16 + + + 5 + 17471320.750897 + -20037508.34 20037508.34 + 256 + 256 + 32 + 32 + + + 6 + 8735660.3754487 + -20037508.34 20037508.34 + 256 + 256 + 64 + 64 + + + 7 + 4367830.1877244 + -20037508.34 20037508.34 + 256 + 256 + 128 + 128 + + + 8 + 2183915.0938622 + -20037508.34 20037508.34 + 256 + 256 + 256 + 256 + + + 9 + 1091957.5469311 + -20037508.34 20037508.34 + 256 + 256 + 512 + 512 + + + 10 + 545978.77346554 + -20037508.34 20037508.34 + 256 + 256 + 1024 + 1024 + + + 11 + 272989.38673277 + -20037508.34 20037508.34 + 256 + 256 + 2048 + 2048 + + + 12 + 136494.69336639 + -20037508.34 20037508.34 + 256 + 256 + 4096 + 4096 + + + 13 + 68247.346683193 + -20037508.34 20037508.34 + 256 + 256 + 8192 + 8192 + + + 14 + 34123.673341597 + -20037508.34 20037508.34 + 256 + 256 + 16384 + 16384 + + + 15 + 17061.836670798 + -20037508.34 20037508.34 + 256 + 256 + 32768 + 32768 + + + 16 + 8530.9183353991 + -20037508.34 20037508.34 + 256 + 256 + 65536 + 65536 + + + 17 + 4265.4591676996 + -20037508.34 20037508.34 + 256 + 256 + 131072 + 131072 + + + 18 + 2132.7295838498 + -20037508.34 20037508.34 + 256 + 256 + 262144 + 262144 + + WGS84 + WGS84 EPSG:4326 + WGS84 + urn:ogc:def:crs:EPSG::4326 + + 0 + 279541132.01436 + 90 -180 + 256 + 256 + 2 + 1 + + + 1 + 139770566.00718 + 90 -180 + 256 + 256 + 4 + 2 + + + 2 + 69885283.00359 + 90 -180 + 256 + 256 + 8 + 4 + + + 3 + 34942641.501795 + 90 -180 + 256 + 256 + 16 + 8 + + + 4 + 17471320.750897 + 90 -180 + 256 + 256 + 32 + 16 + + + 5 + 8735660.3754487 + 90 -180 + 256 + 256 + 64 + 32 + + + 6 + 4367830.1877244 + 90 -180 + 256 + 256 + 128 + 64 + + + 7 + 2183915.0938622 + 90 -180 + 256 + 256 + 256 + 128 + + + 8 + 1091957.5469311 + 90 -180 + 256 + 256 + 512 + 256 + + + 9 + 545978.77346554 + 90 -180 + 256 + 256 + 1024 + 512 + + + 10 + 272989.38673277 + 90 -180 + 256 + 256 + 2048 + 1024 + + + 11 + 136494.69336639 + 90 -180 + 256 + 256 + 4096 + 2048 + + + 12 + 68247.346683193 + 90 -180 + 256 + 256 + 8192 + 4096 + + + 13 + 34123.673341597 + 90 -180 + 256 + 256 + 16384 + 8192 + + + 14 + 17061.836670798 + 90 -180 + 256 + 256 + 32768 + 16384 + + + 15 + 8530.9183353991 + 90 -180 + 256 + 256 + 65536 + 32768 + + + 16 + 4265.4591676996 + 90 -180 + 256 + 256 + 131072 + 65536 + + + 17 + 2132.7295838498 + 90 -180 + 256 + 256 + 262144 + 131072 + + + 18 + + 90 -180 + 256 + 256 + 524288 + 262144 + + + + \ No newline at end of file diff --git a/run.sh b/run.sh index d952cc4..7b6c1bf 100755 --- a/run.sh +++ b/run.sh @@ -7,6 +7,8 @@ _term() { trap _term TERM +# Delete files if they were not cleaned by last run +rm -rf /tmp/.X11-unix /tmp/.X99-lock start-stop-daemon --start --pidfile ~/xvfb.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1024x768x24 -ac +extension GLX +render -noreset echo "Waiting 3 seconds for xvfb to start..." @@ -19,5 +21,5 @@ node /usr/src/app/ -p 80 "$@" & child=$! wait "$child" -start-stop-daemon --stop --pidfile ~/xvfb.pid # stop xvfb when exiting +start-stop-daemon --stop --retry 5 --pidfile ~/xvfb.pid # stop xvfb when exiting rm ~/xvfb.pid diff --git a/src/main.js b/src/main.js index 640bbb1..bbb0711 100644 --- a/src/main.js +++ b/src/main.js @@ -35,8 +35,8 @@ var opts = require('commander') .option( '-p, --port ', 'Port [8080]', - parseInt, - 8080 + 8080, + parseInt ) .option( '-C|--no-cors', diff --git a/src/serve_data.js b/src/serve_data.js index 4acda69..044a22d 100644 --- a/src/serve_data.js +++ b/src/serve_data.js @@ -89,7 +89,7 @@ module.exports = function(options, repo, params, id, styles) { source.getTile(z, x, y, function(err, data, headers) { if (err) { if (/does not exist/.test(err.message)) { - return res.status(404).send(err.message); + return res.status(204).send(err.message); } else { return res.status(500).send(err.message); } diff --git a/src/server.js b/src/server.js index 254c8f8..2256c2b 100644 --- a/src/server.js +++ b/src/server.js @@ -7,8 +7,7 @@ process.env.UV_THREADPOOL_SIZE = var fs = require('fs'), path = require('path'); -var base64url = require('base64url'), - clone = require('clone'), +var clone = require('clone'), cors = require('cors'), enableShutdown = require('http-shutdown'), express = require('express'), @@ -269,6 +268,7 @@ function start(opts) { data['key_query_part'] = req.query.key ? 'key=' + req.query.key + '&' : ''; data['key_query'] = req.query.key ? '?key=' + req.query.key : ''; + if (template === 'wmts') res.set('Content-Type', 'text/xml'); return res.status(200).send(compiled(data)); }); resolve(); @@ -295,12 +295,7 @@ function start(opts) { Math.floor(centerPx[0] / 256) + '/' + Math.floor(centerPx[1] / 256) + '.png'; } - - var query = req.query.key ? ('?key=' + req.query.key) : ''; - style.wmts_link = 'http://wmts.maptiler.com/' + - base64url('http://' + req.hostname + - '/styles/' + id + '.json' + query) + '/wmts'; - + var tiles = utils.getTileUrls( req, style.serving_rendered.tiles, 'styles/' + id, style.serving_rendered.format); @@ -325,11 +320,6 @@ function start(opts) { Math.floor(centerPx[1] / 256) + '.' + data_.format; } - var query = req.query.key ? ('?key=' + req.query.key) : ''; - data_.wmts_link = 'http://wmts.maptiler.com/' + - base64url('http://' + req.hostname + - '/data/' + id + '.json' + query) + '/wmts'; - var tiles = utils.getTileUrls( req, data_.tiles, 'data/' + id, data_.format, { 'pbf': options.pbfAlias @@ -374,6 +364,20 @@ function start(opts) { return res.redirect(301, '/styles/' + req.params.id + '/'); }); */ + serveTemplate('/styles/:id/wmts.xml', 'wmts', function(req) { + var id = req.params.id; + var wmts = clone((config.styles || {})[id]); + if (!wmts) { + return null; + } + if (wmts.hasOwnProperty("serve_rendered") && !wmts.serve_rendered) { + return null; + } + wmts.id = id; + wmts.name = (serving.styles[id] || serving.rendered[id]).name; + wmts.baseUrl = (req.get('X-Forwarded-Protocol')?req.get('X-Forwarded-Protocol'):req.protocol) + '://' + req.get('host'); + return wmts; + }); serveTemplate('/data/:id/$', 'data', function(req) { var id = req.params.id; diff --git a/test/setup.js b/test/setup.js index 963bb26..ce4442f 100644 --- a/test/setup.js +++ b/test/setup.js @@ -17,5 +17,5 @@ before(function() { after(function() { console.log('global teardown'); - global.server.close(function() { console.log('Done'); }); + global.server.close(function() { console.log('Done'); process.exit(); }); }); diff --git a/test/tiles_data.js b/test/tiles_data.js index 2e6566a..5b9b68e 100644 --- a/test/tiles_data.js +++ b/test/tiles_data.js @@ -23,6 +23,6 @@ describe('Vector tiles', function() { testTile(prefix, 0, 1, 0, 404); testTile(prefix, 0, 0, 1, 404); - testTile(prefix, 14, 0, 0, 404); // non existent tile + testTile(prefix, 14, 0, 0, 204); // non existent tile }); });