Skip to content

Allowing tile urls to carry the query params from the original request #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marionmaiden wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allowing tile urls to carry the query params from the original request #469

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a120435
Allowing tile urls to carry the query params from the original request
Aug 10, 2020
893528a
Small fixes to remove repeated code
Aug 10, 2020
93c70b3
Merge branch 'feature/mf-queryparams-tile-urls' of https://github.com…
Aug 10, 2020
6b5684e
fix conflicts
Aug 10, 2020
2477060
Merge branch 'feature/mf-queryparams-tile-urls' of https://github.com…
Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/serve_style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,25 @@ const fixUrl = (req, url, publicUrl, opt_nokey) => {
if (!url || (typeof url !== 'string') || url.indexOf('local://') !== 0) {
return url;
}

return url.replace(
'local://', utils.getPublicUrl(publicUrl, req)) + getQuery(req, opt_nokey);
};


// Return the query suffix from the original request
const getQuery = (req, opt_nokey) => {
const queryParams = [];
if (!opt_nokey && req.query.key) {
queryParams.unshift(`key=${encodeURIComponent(req.query.key)}`);
}

let query = '';
if (queryParams.length) {
query = `?${queryParams.join('&')}`;
}
return url.replace(
'local://', utils.getPublicUrl(publicUrl, req)) + query;

return query;
};

module.exports = {
Expand All @@ -40,6 +49,13 @@ module.exports = {
for (const name of Object.keys(styleJSON_.sources)) {
const source = styleJSON_.sources[name];
source.url = fixUrl(req, source.url, item.publicUrl);

// Apply the query parameters to the tile urls
if (source.tiles) {
for (let i = 0; i < source.tiles.length; i++) {
source.tiles[i] = source.tiles[i] + getQuery(req);
}
}
}
// mapbox-gl-js viewer cannot handle sprite urls with query
if (styleJSON_.sprite) {
Expand Down