Skip to content

Avoid duplicate layers when a style already defines a source #1501

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
0xOnyx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid duplicate layers when a style already defines a source #1501

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
17 changes: 9 additions & 8 deletions src/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,10 @@ const hideControls = {
};

function addSources(styles, sourceBucket) {
return styles.map((style) => {
if (style.source) return style;
return Object.assign({}, style, {
id: `${style.id}.${sourceBucket}`,
source: (sourceBucket === 'hot') ? Constants.sources.HOT : Constants.sources.COLD
});
});
return styles.map((style) => Object.assign({}, style, {
id: `${style.id}.${sourceBucket}`,
source: (sourceBucket === 'hot') ? Constants.sources.HOT : Constants.sources.COLD
}));
}

export default function(options = {}) {
Expand All @@ -62,7 +59,11 @@ export default function(options = {}) {
withDefaults = Object.assign({}, defaultOptions, withDefaults);

// Layers with a shared source should be adjacent for performance reasons
withDefaults.styles = addSources(withDefaults.styles, 'cold').concat(addSources(withDefaults.styles, 'hot'));
const sourcedStyles = withDefaults.styles.filter((style) => style.source);
const unsourcedStyles = withDefaults.styles.filter((style) => !style.source);
withDefaults.styles = sourcedStyles
.concat(addSources(unsourcedStyles, 'cold'))
.concat(addSources(unsourcedStyles, 'hot'));

return withDefaults;
}