Skip to content

Commit

Permalink
fix: decouple default WMS server style and preselected style for the … (
Browse files Browse the repository at this point in the history 
origo-map#1715)

* fix: decouple default WMS server style and preselected style for the stylepicker in order to accomodate preselected alternative WMS server styles when a stylepicker is employed for WMS layers

* fix: tolerate missing initialStyle prop in layerPicker
  • Loading branch information
@Grammostola
Grammostola committed Mar 24, 2023
1 parent 0669dd5 commit ab36426
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 36 deletions.
23 changes: 15 additions & 8 deletions src/controls/legend/overlayproperties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const OverlayProperties = function OverlayProperties(options = {}) {
function getStyleDisplayName(styleName) {
let altStyle = stylePicker.find(s => s.style === styleName);
if (!altStyle) {
altStyle = stylePicker.find(s => s.default);
altStyle = stylePicker.find(s => s.defaultWMSServerStyle);
}
return (altStyle && altStyle.title) || styleName;
}
Expand All @@ -75,27 +75,33 @@ const OverlayProperties = function OverlayProperties(options = {}) {
const altStyle = stylePicker[altStyleIndex];
styleSelection.setButtonText(styleTitle);
const legendCmp = document.getElementById(legendComponent.getId());
if (!layer.get('defaultStyle')) layer.setProperties({ defaultStyle: layer.get('styleName') });
if (!layer.get('defaultStyle')) {
layer.setProperties({ defaultStyle: layer.get('styleName') });
}
layer.setProperties({ altStyleIndex });

if (layer.get('type') === 'WMS') {
const layerSource = layer.get('source');
const sourceParams = layerSource.getParams();
let styleToSet = altStyle.style;
if (altStyle.default) {
sourceParams.STYLES = altStyle.style;

if (altStyle.initialStyle) {
styleToSet = layer.get('defaultStyle');
} else {
sourceParams.STYLES = styleToSet;
} else if (altStyle.defaultWMSServerStyle) {
styleToSet = `${layer.get('name')}_WMSServerDefault`;
}

sourceParams.STYLES = altStyle.defaultWMSServerStyle ? '' : styleToSet;
layerSource.refresh();
layer.set('styleName', styleToSet);
let maxResolution;
if (!(altStyle.legendParams) || !(Object.keys(altStyle.legendParams).find(key => key.toUpperCase() === 'SCALE'))) {
maxResolution = viewer.getResolutions()[viewer.getResolutions().length - 1];
}

let styleNameParam = styleToSet;
if (altStyle.defaultWMSServerStyle) styleNameParam = '';
const getLegendString = layerSource.getLegendUrl(maxResolution, {
STYLE: styleToSet,
STYLE: styleNameParam,
...altStyle.legendParams
});
const newWmsStyle = [[{
Expand All @@ -110,6 +116,7 @@ const OverlayProperties = function OverlayProperties(options = {}) {
layer.dispatchEvent('change:style');
return;
}

layer.set('styleName', altStyle.style);
legendCmp.innerHTML = Legend(viewer.getStyle(altStyle.style), opacity);
const newStyle = Style.createStyle({ style: altStyle.style, clusterStyleName: altStyle.clusterStyle, viewer });
Expand Down
90 changes: 63 additions & 27 deletions src/layer/wms.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,45 @@ function createImageSource(options) {
}));
}

function createWmsStyle(wmsOptions, source, viewer, defaultStyle = true) {
let altStyleLegendParams;
function createWmsStyle({ wmsOptions, source, viewer, initialStyle = false }) {
let maxResolution = viewer.getResolutions()[viewer.getResolutions().length - 1];
let newStyle;

if (!(defaultStyle) && (wmsOptions.stylePicker)) {
const altStyle = wmsOptions.stylePicker.find(style => style.style === wmsOptions.styleName);
if (altStyle.legendParams) {
altStyleLegendParams = altStyle.legendParams;
if (Object.keys(altStyle.legendParams).find(key => key.toUpperCase() === 'SCALE')) {
maxResolution = null;
}
if (initialStyle) {
if (wmsOptions.stylePicker) {
newStyle = wmsOptions.stylePicker.find(style => style.initialStyle);
} else {
newStyle = {
defaultWMSServerStyle: true,
hasThemeLegend: wmsOptions.hasThemeLegend || false,
legendParams: wmsOptions.legendParams || false
};
}
} else {
newStyle = wmsOptions.stylePicker[wmsOptions.altStyleIndex];
}

const styleName = defaultStyle ? `${wmsOptions.name}_WMSDefault` : wmsOptions.styleName;
const getLegendString = defaultStyle ? source.getLegendUrl(maxResolution, wmsOptions.legendParams) : source.getLegendUrl(maxResolution, {
STYLE: styleName,
...altStyleLegendParams
});
let hasThemeLegend = wmsOptions.hasThemeLegend || false;
if (!defaultStyle) {
hasThemeLegend = wmsOptions.stylePicker[wmsOptions.altStyleIndex].hasThemeLegend || false;
const legendParams = wmsOptions.stylePicker ? newStyle.legendParams : wmsOptions.legendParams;

if ((legendParams) && (Object.keys(legendParams).find(key => key.toUpperCase() === 'SCALE'))) {
maxResolution = null;
}

let getLegendString;
let styleName;

if (newStyle.defaultWMSServerStyle) {
getLegendString = source.getLegendUrl(maxResolution, legendParams);
styleName = `${wmsOptions.name}_WMSServerDefault`;
} else {
getLegendString = source.getLegendUrl(maxResolution, {
STYLE: newStyle.style,
...legendParams
});
styleName = newStyle.style;
}

const hasThemeLegend = newStyle.hasThemeLegend || false;
const style = [[{
icon: {
src: `${getLegendString}`
Expand All @@ -74,14 +89,33 @@ function createWmsStyle(wmsOptions, source, viewer, defaultStyle = true) {
function createWmsLayer(wmsOptions, source, viewer) {
const wmsOpts = wmsOptions;
const wmsSource = source;
if (wmsOpts.styleName === 'default') {
wmsOpts.styleName = createWmsStyle(wmsOptions, source, viewer);
wmsOpts.style = wmsOptions.styleName;
} else if (wmsOptions.altStyleIndex > -1) {
wmsOpts.defaultStyle = createWmsStyle(wmsOptions, source, viewer);
wmsOpts.styleName = createWmsStyle(wmsOptions, source, viewer, false);

function setInitialStyle() {
if (!(wmsOpts.stylePicker.some(style => style.initialStyle === true))) {
wmsOpts.stylePicker[0].initialStyle = true;
}
}

if (wmsOptions.stylePicker) {
setInitialStyle();
let pickedStyle;
if (wmsOptions.altStyleIndex > -1) {
wmsOpts.defaultStyle = createWmsStyle({ wmsOptions, source, viewer, initialStyle: true });
wmsOpts.styleName = createWmsStyle({ wmsOptions, source, viewer });
wmsOpts.style = wmsOptions.styleName;
pickedStyle = wmsOptions.stylePicker[wmsOptions.altStyleIndex];
} else {
wmsOpts.styleName = createWmsStyle({ wmsOptions, source, viewer, initialStyle: true });
wmsOpts.defaultStyle = wmsOpts.styleName;
wmsOpts.style = wmsOptions.styleName;
pickedStyle = wmsOpts.stylePicker.find(style => style.initialStyle === true);
}
if (!(pickedStyle.defaultWMSServerStyle)) {
wmsSource.getParams().STYLES = wmsOptions.styleName;
}
} else if (wmsOpts.styleName === 'default') {
wmsOpts.styleName = createWmsStyle({ wmsOptions, source, viewer, initialStyle: true });
wmsOpts.style = wmsOptions.styleName;
wmsSource.getParams().STYLES = wmsOptions.styleName;
}
}

Expand All @@ -104,9 +138,11 @@ const wms = function wms(layerOptions, viewer) {
sourceOptions.projection = viewer.getProjection();
sourceOptions.id = wmsOptions.id;
sourceOptions.format = wmsOptions.format ? wmsOptions.format : sourceOptions.format;
const styleSettings = viewer.getStyle(wmsOptions.styleName);
const wmsStyleObject = styleSettings ? styleSettings[0].find(s => s.wmsStyle) : undefined;
sourceOptions.style = wmsStyleObject ? wmsStyleObject.wmsStyle : '';
if (!wmsOptions.stylePicker) {
const styleSettings = viewer.getStyle(wmsOptions.styleName);
const wmsStyleObject = styleSettings ? styleSettings[0].find(s => s.wmsStyle) : undefined;
sourceOptions.style = wmsStyleObject ? wmsStyleObject.wmsStyle : '';
}

if (wmsOptions.tileGrid) {
sourceOptions.tileGrid = maputils.tileGrid(wmsOptions.tileGrid);
Expand Down
9 changes: 8 additions & 1 deletion src/viewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,14 @@ const Viewer = function Viewer(targetOption, options = {}) {
const altStyle = initialProps.stylePicker[savedLayerProps[layerName].altStyleIndex];
savedProps.clusterStyle = altStyle.clusterStyle;
savedProps.style = altStyle.style;
savedProps.defaultStyle = initialProps.style;
if (initialProps.type === 'WMS') {
let WMSStylePickerInitialStyle = initialProps.stylePicker.find(style => style.initialStyle);
if (WMSStylePickerInitialStyle === undefined) {
WMSStylePickerInitialStyle = initialProps.stylePicker[0];
WMSStylePickerInitialStyle.initialStyle = true;
}
savedProps.defaultStyle = WMSStylePickerInitialStyle;
} else savedProps.defaultStyle = initialProps.style;
}
savedProps.name = initialProps.name;
const mergedProps = Object.assign({}, initialProps, savedProps);
Expand Down

0 comments on commit ab36426

Please sign in to comment.