Skip to content

Fixes #1788: configurability of SettingModal showElevationChart #1789

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
mbarto merged 1 commit into from
May 8, 2017
Merged

Fixes #1788: configurability of SettingModal showElevationChart #1789

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions web/client/components/TOC/fragments/SettingsModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const SettingsModal = React.createClass({
closeText: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.element]),
options: React.PropTypes.object,
chartStyle: React.PropTypes.object,
showElevationChart: React.PropTypes.bool,
buttonSize: React.PropTypes.string,
closeGlyph: React.PropTypes.string,
panelStyle: React.PropTypes.object,
Expand Down Expand Up @@ -135,6 +136,7 @@ const SettingsModal = React.createClass({
return (<Elevation
elevationText={this.props.elevationText}
chartStyle={this.props.chartStyle}
showElevationChart={this.props.showElevationChart}
element={this.props.element}
elevations={elevationDim}
appState={this.state || {}}
Expand Down
10 changes: 6 additions & 4 deletions web/client/components/TOC/fragments/settings/Elevation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,20 @@ module.exports = React.createClass({
elevations: React.PropTypes.object,
onChange: React.PropTypes.func,
appState: React.PropTypes.object,
chartStyle: React.PropTypes.object
chartStyle: React.PropTypes.object,
showElevationChart: React.PropTypes.bool
},
getDefaultProps() {
return {
onChange: () => {}
onChange: () => {},
showElevationChart: true
};
},
shouldComponentUpdate(nextProps) {
return this.props.element.id !== nextProps.element.id;
},
renderElevationsChart(elevations) {
if (this.props.elevations.showChart) {
if (this.props.showElevationChart) {
return (
<ElevationChart
elevations={elevations}
Expand Down Expand Up @@ -66,7 +68,7 @@ module.exports = React.createClass({
}
}
}}
tooltips={!this.props.elevations.showChart}
tooltips={!this.props.showElevationChart}
onChange={(value) => {
this.props.onChange("params", Object.assign({}, {
[this.props.elevations.name]: value[0]
Expand Down
1 change: 0 additions & 1 deletion web/client/components/TOC/fragments/settings/__tests__/Elevation-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ describe('test Layer Properties Elevation component', () => {
name: "ELEVATION",
units: "Meters",
positive: false,
showChart: true,
values: ["1.5", "5.0", "10.0", "15.0", "20.0", "25.0", "30.0"]
}
};
Expand Down
1 change: 0 additions & 1 deletion web/client/utils/LayersUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const getElevationDimension = (dimensions = []) => {
return dimensions.reduce((previous, dim) => {
return (dim.name.toLowerCase() === 'elevation' || dim.name.toLowerCase() === 'depth') ?
assign({
showChart: true,
positive: dim.name.toLowerCase() === 'elevation'
}, dim, {
name: dim.name.toLowerCase() === 'elevation' ? dim.name : 'DIM_' + dim.name
Expand Down