Skip to content

Commit

Permalink
fix #2696 map rotation disables correctly (#2905)
Browse files Browse the repository at this point in the history
  • Loading branch information
MV88 authored and offtherailz committed May 15, 2018
1 parent ffa46f9 commit ecd429a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion web/client/plugins/Map.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,14 @@ class MapPlugin extends React.Component {

render() {
if (this.props.map) {
const {mapOptions = {}} = this.props.map;

return (
<plugins.Map id="map"
{...this.props.options}
mapOptions={this.getMapOptions()}
projectionDefs={this.props.projectionDefs}
{...this.props.map}
mapOptions={assign({}, mapOptions, this.getMapOptions())}
zoomControl={this.props.zoomControl}>
{this.renderLayers()}
{this.renderSupportTools()}
Expand Down

0 comments on commit ecd429a

Please sign in to comment.