Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert some changes

Browse source
This commit is contained in:
birdage 2017-07-18 21:03:45 -04:00
parent 0247881343
commit 4eb42506ad
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/serve_data.js
View file

@ -162,9 +162,9 @@ module.exports = function(options, repo, params, id, styles) {
var info = clone(tileJSON); var info = clone(tileJSON);
info.tiles = utils.getTileUrls(req, info.tiles, info.tiles = utils.getTileUrls(req, info.tiles,
'data/' + id, info.format, { 'data/' + id, info.format, {
'pbf': options.pbfAlias, 'pbf': options.pbfAlias
baseURL },
}); baseURL);
return res.send(info); return res.send(info);
}); });

20
src/server.js
View file

@ -135,7 +135,7 @@ function start(opts) {
}, function(font) { }, function(font) {
serving.fonts[font] = true; serving.fonts[font] = true;
}).then(function(sub) { }).then(function(sub) {
app.use('/tiles/styles/', sub); app.use('/styles/', sub);
})); }));
} }
if (item.serve_rendered !== false) { if (item.serve_rendered !== false) {
@ -152,7 +152,7 @@ function start(opts) {
return mbtilesFile; return mbtilesFile;
} }
).then(function(sub) { ).then(function(sub) {
app.use('/tiles/styles/', sub); app.use('/styles/', sub);
}) })
); );
} else { } else {
@ -163,7 +163,7 @@ function start(opts) {
startupPromises.push( startupPromises.push(
serve_font(options, serving.fonts).then(function(sub) { serve_font(options, serving.fonts).then(function(sub) {
app.use('/tiles/', sub); app.use('/', sub);
}) })
); );
@ -176,12 +176,12 @@ function start(opts) {
startupPromises.push( startupPromises.push(
serve_data(options, serving.data, item, id, serving.styles).then(function(sub) { serve_data(options, serving.data, item, id, serving.styles).then(function(sub) {
app.use('/tiles/data/', sub); app.use('/data/', sub);
}) })
); );
}); });
app.get('/tiles/styles.json', function(req, res, next) { app.get('/styles.json', function(req, res, next) {
var result = []; var result = [];
var query = req.query.key ? ('?key=' + req.query.key) : ''; var query = req.query.key ? ('?key=' + req.query.key) : '';
Object.keys(serving.styles).forEach(function(id) { Object.keys(serving.styles).forEach(function(id) {
@ -191,7 +191,7 @@ function start(opts) {
name: styleJSON.name, name: styleJSON.name,
id: id, id: id,
url: (baseURL ? baseURL : req.protocol + '://' + req.headers.host + url: (baseURL ? baseURL : req.protocol + '://' + req.headers.host +
'/tiles/styles/' + id + '/style.json' + query '/styles/' + id + '/style.json' + query
}); });
}); });
res.send(result); res.send(result);
@ -202,7 +202,7 @@ function start(opts) {
var info = clone(serving[type][id]); var info = clone(serving[type][id]);
var path = ''; var path = '';
if (type == 'rendered') { if (type == 'rendered') {
path = 'tiles/styles/' + id; path = '/styles/' + id;
} else { } else {
path = type + '/' + id; path = type + '/' + id;
} }
@ -226,7 +226,7 @@ function start(opts) {
//------------------------------------ //------------------------------------
// serve web presentations // serve web presentations
app.use('/tiles/', express.static(path.join(__dirname, '../public/resources'))); app.use('/', express.static(path.join(__dirname, '../public/resources')));
var templates = path.join(__dirname, '../public/templates'); var templates = path.join(__dirname, '../public/templates');
var serveTemplate = function(urlPath, template, dataGetter) { var serveTemplate = function(urlPath, template, dataGetter) {
@ -290,7 +290,7 @@ function start(opts) {
var query = req.query.key ? ('?key=' + req.query.key) : ''; var query = req.query.key ? ('?key=' + req.query.key) : '';
style.wmts_link = 'http://wmts.maptiler.com/' + style.wmts_link = 'http://wmts.maptiler.com/' +
base64url('http://' + req.headers.host + base64url('http://' + req.headers.host +
'/tiles/styles/' + id + '.json' + query) + '/wmts'; '/styles/' + id + '.json' + query) + '/wmts';
var tiles = utils.getTileUrls( var tiles = utils.getTileUrls(
req, style.serving_rendered.tiles, req, style.serving_rendered.tiles,
@ -349,7 +349,7 @@ function start(opts) {
}; };
}); });
serveTemplate('/tiles/styles/:id/$', 'viewer', function(req) { serveTemplate('/styles/:id/$', 'viewer', function(req) {
var id = req.params.id; var id = req.params.id;
var style = clone((config.styles || {})[id]); var style = clone((config.styles || {})[id]);
if (!style) { if (!style) {