Use URl-safe base64 alphabet

This commit is contained in:
Petr Sloup 2016-06-30 12:19:32 +02:00
parent d6e2baef67
commit 15bc393aa8
2 changed files with 8 additions and 7 deletions

View file

@ -17,6 +17,7 @@
"dependencies": {
"async": "1.5.2",
"advanced-pool": "0.3.2",
"base64url": "1.0.6",
"canvas": "1.4.0",
"clone": "1.0.2",
"color": "0.11.3",

View file

@ -7,7 +7,8 @@ process.env.UV_THREADPOOL_SIZE =
var fs = require('fs'),
path = require('path');
var clone = require('clone'),
var base64url = require('base64url'),
clone = require('clone'),
cors = require('cors'),
express = require('express'),
handlebars = require('handlebars'),
@ -201,10 +202,9 @@ module.exports = function(opts, callback) {
}
var query = req.query.key ? ('?key=' + req.query.key) : '';
style.wmts_link = 'https://wmts.maptiler.com/' +
new Buffer(req.protocol + '://' + req.headers.host +
'/styles/' + id + '/rendered.json' + query).toString('base64') +
'/wmts';
style.wmts_link = 'http://wmts.maptiler.com/' +
base64url('http://' + req.headers.host +
'/styles/' + id + '/rendered.json' + query) + '/wmts';
}
});
var data = clone(serving.data || {});
@ -227,8 +227,8 @@ module.exports = function(opts, callback) {
var query = req.query.key ? ('?key=' + req.query.key) : '';
data_.wmts_link = 'http://wmts.maptiler.com/' +
new Buffer('http://' + req.headers.host +
'/data/' + id + '.json' + query).toString('base64') + '/wmts';
base64url('http://' + req.headers.host +
'/data/' + id + '.json' + query) + '/wmts';
}
if (data_.filesize) {
var suffix = 'kB';