Skip to content
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

Jump to bottom

Fix QGIS legend in print #4659

Merged
merged 1 commit into from
Feb 20, 2019
Merged

Fix QGIS legend in print #4659

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion buildtools/webpack.commons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ const config = function(hardSourceConfig, babelLoaderCacheDirectory) {
],
resolve: {
modules: [
'../node_modules'
'../node_modules',
'../node_modules/d3/node_modules',
],
mainFields: ['geoblocks_src', 'module', 'jsnext:main', 'main'],
alias: {
Expand Down
6 changes: 3 additions & 3 deletions contribs/gmf/src/print/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,17 +1242,17 @@ class Controller {
scale, undefined, undefined, undefined, source.serverType_, dpi,
this.gmfLegendOptions_.useBbox ? bbox : undefined,
this.map.getView().getProjection().getCode(),
this.gmfLegendOptions_.params[layer.getSource().get('serverType_')]
this.gmfLegendOptions_.params[source.serverType_]
);
}
// Don't add classes without legend url or from layers without any
// active name.
if (icons && name.length !== 0) {
classes.push(Object.assign({
'name': this.gmfLegendOptions_.label[layer.getSource().get('serverType_')] === false ? '' :
'name': this.gmfLegendOptions_.label[source.serverType_] === false ? '' :
gettextCatalog.getString(name),
'icons': [icons]
}, layer.getSource().get('serverType_') === 'qgis' ? {
}, source.serverType_ === 'qgis' ? {
'dpi': dpi,
} : {}));
}
Expand Down