Skip to content

Commit

Permalink
DiagramSounding: Define segments with different style for the hodograph
Browse files Browse the repository at this point in the history 
Relates to #39
  • Loading branch information
Ivo Sonderegger committed Jul 5, 2021
1 parent 10035c1 commit 1a53632
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 3 deletions.
37 changes: 36 additions & 1 deletion src/meteoJS/thermodynamicDiagram/DiagramSounding.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,14 +373,27 @@ function updateWindprofileOptions(options, updateOptions) {
}

/**
* Style/visibility options for a sounding in the hodograph.
* Options for a line-segment of a sounding in the hodograph.
*
* @typedef {module:meteoJS/thermodynamicDiagram~lineOptions}
* module:meteoJS/thermodynamicDiagram/diagramSounding~hodographSegmentOptions
* @property {number|undefined}
* [minPressure] - Minimum pressure level of the segment. Unit: hPa.
* @property {number|undefined}
* [maxPressure] - Maximum pressure level of the segment. Unit: hPa.
*/

/**
* Options for a sounding in the hodograph.
*
* @typedef {module:meteoJS/thermodynamicDiagram~lineOptions}
* module:meteoJS/thermodynamicDiagram/diagramSounding~hodographOptions
* @property {number|undefined}
* [minPressure] - Minimum pressure level to plot in the hodograph. Unit: hPa.
* @property {number|undefined}
* [maxPressure] - Maximum pressure level to plot in the hodograph. Unit: hPa.
* @property {module:meteoJS/thermodynamicDiagram/diagramSounding~hodographSegmentOptions[]}
* [segments] - Array of segment definitions.
*/

/**
Expand All @@ -395,11 +408,22 @@ function updateWindprofileOptions(options, updateOptions) {
function getNormalizedHodographOptions({
minPressure = undefined,
maxPressure = undefined,
segments = [],
...result
} = {}) {
result = getNormalizedLineOptions(result);
result.minPressure = minPressure;
result.maxPressure = maxPressure;
result.segments = segments.map(({
minPressure = undefined,
maxPressure = undefined,
...segment
}) => {
segment = getNormalizedLineOptions(segment);
segment.minPressure = minPressure;
segment.maxPressure = maxPressure;
return segment;
});
return result;
}

Expand All @@ -420,6 +444,17 @@ function updateHodographOptions(options, updateOptions) {
if (styleKey in updateOptions)
options[styleKey] = updateOptions[styleKey];
});
if ('segments' in updateOptions)
options.segments = updateOptions.segments.map(({
minPressure = undefined,
maxPressure = undefined,
...segment
}) => {
segment = getNormalizedLineOptions(segment);
segment.minPressure = minPressure;
segment.maxPressure = maxPressure;
return segment;
});
return options;
}

Expand Down
85 changes: 83 additions & 2 deletions test/meteoJS/thermodynamicDiagram/diagramSounding.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ describe('DiagramSounding class, import via default', () => {
assert.ok(Object.keys(s.options.hodograph.style).length > 1, 'style');
assert.equal(s.options.hodograph.minPressure, undefined, 'hodograph.minPressure');
assert.equal(s.options.hodograph.maxPressure, undefined, 'hodograph.maxPressure');
assert.ok(s.options.hodograph.segments instanceof Array, 'hodograph.segments');
assert.equal(s.options.hodograph.segments.length, 0, 'hodograph.segments');
assert.equal(Object.keys(s.options.parcels).length, 2, 'length parcels options');
assert.ok('default' in s.options.parcels, 'default');
assert.equal(Object.keys(s.options.parcels.default).length, 3, 'length default options');
Expand Down Expand Up @@ -84,7 +86,16 @@ describe('DiagramSounding class, import via default', () => {
width: 2
},
minPressure: 300,
maxPressure: 900
maxPressure: 900,
segments: [{
visible: false,
minPressure: 500,
maxPressure: 800,
style: {
color: 'red',
width: 3
}
}]
},
parcels: {
default: {
Expand Down Expand Up @@ -142,6 +153,14 @@ describe('DiagramSounding class, import via default', () => {
assert.equal(s.options.hodograph.maxPressure, 900, 'hodograph.maxPressure');
assert.equal(s.options.hodograph.style.color, 'black', 'color');
assert.equal(s.options.hodograph.style.width, 2, 'width');
assert.ok(s.options.hodograph.segments instanceof Array, 'hodograph.segments');
assert.equal(s.options.hodograph.segments.length, 1, 'hodograph.segments');
assert.equal(s.options.hodograph.segments[0].minPressure, 500, 'hodograph.segments[0].minPressure');
assert.equal(s.options.hodograph.segments[0].maxPressure, 800, 'hodograph.segments[0].maxPressure');
assert.equal(s.options.hodograph.segments[0].visible, false, 'hodograph.segments[0].visible');
assert.equal(Object.keys(s.options.hodograph.segments[0].style).length, 2, 'keys hodograph.segments[0].style');
assert.equal(s.options.hodograph.segments[0].style.color, 'red', 'hodograph.segments[0].style.color');
assert.equal(s.options.hodograph.segments[0].style.width, 3, 'hodograph.segments[0].style.width');
assert.equal(Object.keys(s.options.parcels).length, 3, 'length parcels options');
assert.ok(!s.options.parcels.default.visible, 'default.visible');
assert.equal(Object.keys(s.options.parcels.default).length, 3, 'length default parcels options');
Expand Down Expand Up @@ -208,7 +227,20 @@ describe('DiagramSounding class, import via default', () => {
hodograph: {
visible: true,
style: { color: 'green' },
minPressure: 200
minPressure: 200,
segments: [{
minPressure: 300,
maxPressure: 500,
style: {
color: 'orange'
}
}, {
minPressure: 500,
maxPressure: 700,
style: {
color: 'pink'
}
}]
},
parcels: {
visible: true,
Expand Down Expand Up @@ -247,6 +279,14 @@ describe('DiagramSounding class, import via default', () => {
assert.equal(s.options.hodograph.style.width, '1', 'width');
assert.equal(s.options.hodograph.minPressure, 200, 'hodograph.minPressure');
assert.equal(s.options.hodograph.maxPressure, undefined, 'hodograph.maxPressure');
assert.ok(s.options.hodograph.segments instanceof Array, 'hodograph.segments');
assert.equal(s.options.hodograph.segments.length, 2, 'hodograph.segments');
assert.equal(s.options.hodograph.segments[0].minPressure, 300, 'hodograph.segments[0].minPressure');
assert.equal(s.options.hodograph.segments[0].maxPressure, 500, 'hodograph.segments[0].maxPressure');
assert.equal(s.options.hodograph.segments[0].visible, true, 'hodograph.segments[0].visible');
assert.equal(Object.keys(s.options.hodograph.segments[0].style).length, 2, 'keys hodograph.segments[0].style');
assert.equal(s.options.hodograph.segments[0].style.color, 'orange', 'hodograph.segments[0].style.color');
assert.equal(s.options.hodograph.segments[0].style.width, 1, 'hodograph.segments[0].style.width');
assert.ok(!s.options.parcels.default.visible, 'visible');
assert.equal(s.options.parcels.default.temp.style.color, 'gray', 'color');
assert.ok(!s.options.parcels.default.dewp.visible, 'visible');
Expand All @@ -258,6 +298,47 @@ describe('DiagramSounding class, import via default', () => {
assert.ok(s.visible, 'visible');
assert.equal(changeOptionsCounter, 2, 'changeOptionsCounter');
assert.equal(changeVisibleCounter, 2, 'changeVisibleCounter');
s.update({
hodograph: {
segments: [{
minPressure: 850,
maxPressure: 1000,
style: {
color: 'violet'
}
}]
}
});
assert.equal(s.options.hodograph.style.color, 'green', 'color');
assert.equal(s.options.hodograph.style.width, '1', 'width');
assert.equal(s.options.hodograph.minPressure, 200, 'hodograph.minPressure');
assert.equal(s.options.hodograph.maxPressure, undefined, 'hodograph.maxPressure');
assert.ok(s.options.hodograph.segments instanceof Array, 'hodograph.segments');
assert.equal(s.options.hodograph.segments.length, 1, 'hodograph.segments');
assert.equal(s.options.hodograph.segments[0].minPressure, 850, 'hodograph.segments[0].minPressure');
assert.equal(s.options.hodograph.segments[0].maxPressure, 1000, 'hodograph.segments[0].maxPressure');
assert.equal(s.options.hodograph.segments[0].visible, true, 'hodograph.segments[0].visible');
assert.equal(Object.keys(s.options.hodograph.segments[0].style).length, 2, 'keys hodograph.segments[0].style');
assert.equal(s.options.hodograph.segments[0].style.color, 'violet', 'hodograph.segments[0].style.color');
assert.equal(s.options.hodograph.segments[0].style.width, 1, 'hodograph.segments[0].style.width');
s.update({
hodograph: {
minPressure: undefined,
maxPressure: undefined
}
});
assert.equal(s.options.hodograph.style.color, 'green', 'color');
assert.equal(s.options.hodograph.style.width, '1', 'width');
assert.equal(s.options.hodograph.minPressure, undefined, 'hodograph.minPressure');
assert.equal(s.options.hodograph.maxPressure, undefined, 'hodograph.maxPressure');
assert.ok(s.options.hodograph.segments instanceof Array, 'hodograph.segments');
assert.equal(s.options.hodograph.segments.length, 1, 'hodograph.segments');
assert.equal(s.options.hodograph.segments[0].minPressure, 850, 'hodograph.segments[0].minPressure');
assert.equal(s.options.hodograph.segments[0].maxPressure, 1000, 'hodograph.segments[0].maxPressure');
assert.equal(s.options.hodograph.segments[0].visible, true, 'hodograph.segments[0].visible');
assert.equal(Object.keys(s.options.hodograph.segments[0].style).length, 2, 'keys hodograph.segments[0].style');
assert.equal(s.options.hodograph.segments[0].style.color, 'violet', 'hodograph.segments[0].style.color');
assert.equal(s.options.hodograph.segments[0].style.width, 1, 'hodograph.segments[0].style.width');
});
it('getParcelOptions()', () => {
const sounding = new Sounding();
Expand Down

0 comments on commit 1a53632

Please sign in to comment.