Skip to content

Fix #1518. Fixed thumbs relative URLs for catalog #1519

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

Merged
offtherailz merged 1 commit into from
Mar 2, 2017
+4 −1
Merged

Fix #1518. Fixed thumbs relative URLs for catalog #1519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion web/client/utils/CatalogUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ const getWMSBBox = (record) => {
}
return bbox;
};
const getBaseCatalogUrl = (url) => {
return url && url.replace(/\/csw$/, "/");
};

const getWMTSBBox = (record) => {
let layer = record;
Expand Down Expand Up @@ -115,7 +118,7 @@ const converters = {
if (thumbURL) {
let absolute = (thumbURL.indexOf("http") === 0);
if (!absolute) {
thumbURL = options.catalogURL + "/" + thumbURL;
thumbURL = (getBaseCatalogUrl(options.url) || "") + thumbURL;
}
}
// create the references array (now only wms is supported)
Expand Down