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

WV-2766: Modernizing Rotation Component #4505

Merged
merged 2 commits into from
Jul 25, 2023
Merged

WV-2766: Modernizing Rotation Component #4505

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c09af7
Converted to functional component
christof-wittreich Jul 20, 2023
1b55143
Changed dispatch action & simplified map object per feedback
christof-wittreich Jul 20, 2023
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
218 changes: 89 additions & 129 deletions web/js/components/map/rotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,154 +1,114 @@
import React from 'react';
import React, { useState } from 'react';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { connect } from 'react-redux';
import { useSelector, useDispatch, shallowEqual } from 'react-redux';
import { debounce } from 'lodash';
import PropTypes from 'prop-types';
import { saveRotation } from '../../map/util';
import HoverTooltip from '../util/hover-tooltip';
import { refreshRotation } from '../../modules/map/actions';

const duration = 500;

class Rotation extends React.Component {
constructor(props) {
super(props);
this.state = {
intervalId: null,
};
this.rotateOnClick = this.rotateOnClick.bind(this);
this.clearInterval = this.clearInterval.bind(this);
this.resetRotation = this.resetRotation.bind(this);
}
function Rotation() {
const [intervalId, setIntervalId] = useState(null);

clearInterval() {
const { intervalId } = this.state;
const map = useSelector((state) => state.map.ui.selected, shallowEqual);
const proj = useSelector((state) => state.proj, shallowEqual);
const rotation = useSelector((state) => state.map.rotation);
const isDistractionFreeModeActive = useSelector((state) => state.ui.isDistractionFreeModeActive);
const isMobile = useSelector((state) => state.screenSize.isMobileDevice);

const currentRotation = Number(rotation * (180 / Math.PI)).toFixed();
const isPolarProj = proj.id !== 'geographic' && proj.id !== 'webmerc';
const rotationButtonClass = isMobile ? 'wv-rotation-buttons-mobile' : 'wv-rotation-buttons';

const dispatch = useDispatch();
const updateRotationState = (radians) => debounce(() => {
dispatch(refreshRotation(radians));
}, 100);

const clearIntervalRotation = () => {
clearInterval(intervalId);
}
};

rotate(degrees) {
const { map, updateRotationState } = this.props;
const mapView = map.ui.selected.getView();
const rotate = (degrees) => {
const mapView = map.getView();
const currentDeg = mapView.getRotation() * (180.0 / Math.PI);
const rotation = mapView.getRotation() - Math.PI / degrees;
const newRotation = mapView.getRotation() - Math.PI / degrees;
saveRotation(currentDeg, mapView);
mapView.animate({ rotation, duration });
updateRotationState(rotation);
}
mapView.animate({ rotation: newRotation, duration });
updateRotationState(newRotation);
};

rotateOnClick = (radians) => {
const rotateOnClick = (radians) => {
const newIntervalId = setInterval(() => {
this.rotate(radians);
rotate(radians);
}, duration);
this.rotate(radians);
this.setState({ intervalId: newIntervalId });
rotate(radians);
setIntervalId(newIntervalId);
};

resetRotation() {
const { map } = this.props;
this.clearInterval();
map.ui.selected.getView().animate({
const resetRotation = () => {
clearIntervalRotation();
map.getView().animate({
duration: 500,
rotation: 0,
});
}

render() {
const {
rotation, proj, isDistractionFreeModeActive, isMobile,
} = this.props;
const currentRotation = Number(rotation * (180 / Math.PI)).toFixed();
const isPolarProj = proj.id !== 'geographic' && proj.id !== 'webmerc';
const rotationButtonClass = isMobile ? 'wv-rotation-buttons-mobile' : 'wv-rotation-buttons';
};

return !isDistractionFreeModeActive && isPolarProj && (
<div className={rotationButtonClass}>
<button
type="button"
className="wv-map-rotate-left wv-map-zoom"
onMouseDown={() => { this.rotateOnClick(10); }}
onMouseUp={this.clearInterval}
onMouseOut={this.clearInterval}
onMouseMove={(e) => { e.stopPropagation(); }}
>
<HoverTooltip
isMobile={isMobile}
labelText="Rotate counterclockwise"
placement="left"
target=".wv-map-rotate-left"
/>
<FontAwesomeIcon icon="undo" className="cursor-pointer" />
</button>
return !isDistractionFreeModeActive && isPolarProj && (
<div className={rotationButtonClass}>
<button
type="button"
className="wv-map-rotate-left wv-map-zoom"
onMouseDown={() => { rotateOnClick(10); }}
onMouseUp={clearIntervalRotation}
onMouseOut={clearIntervalRotation}
onMouseMove={(e) => { e.stopPropagation(); }}
>
<HoverTooltip
isMobile={isMobile}
labelText="Rotate counterclockwise"
placement="left"
target=".wv-map-rotate-left"
/>
<FontAwesomeIcon icon="undo" className="cursor-pointer" />
</button>

<button
type="button"
className="wv-map-reset-rotation wv-map-zoom"
onMouseDown={this.resetRotation}
onMouseUp={this.clearInterval}
onMouseOut={this.clearInterval}
onMouseMove={(e) => { e.stopPropagation(); }}
>
<HoverTooltip
isMobile={isMobile}
labelText="Reset rotation"
placement="left"
target=".wv-map-reset-rotation"
/>
{currentRotation}
</button>
<button
type="button"
className="wv-map-reset-rotation wv-map-zoom"
onMouseDown={resetRotation}
onMouseUp={clearIntervalRotation}
onMouseOut={clearIntervalRotation}
onMouseMove={(e) => { e.stopPropagation(); }}
>
<HoverTooltip
isMobile={isMobile}
labelText="Reset rotation"
placement="left"
target=".wv-map-reset-rotation"
/>
{currentRotation}
</button>

<button
type="button"
className="wv-map-rotate-right wv-map-zoom"
onMouseDown={() => { this.rotateOnClick(-10); }}
onMouseUp={this.clearInterval}
onMouseOut={this.clearInterval}
onMouseMove={(e) => { e.stopPropagation(); }}
>
<HoverTooltip
isMobile={isMobile}
labelText="Rotate clockwise"
placement="left"
target=".wv-map-rotate-right"
/>
<FontAwesomeIcon icon="redo" className="cursor-pointer" />
</button>
</div>
);
}
<button
type="button"
className="wv-map-rotate-right wv-map-zoom"
onMouseDown={() => { rotateOnClick(-10); }}
onMouseUp={clearIntervalRotation}
onMouseOut={clearIntervalRotation}
onMouseMove={(e) => { e.stopPropagation(); }}
>
<HoverTooltip
isMobile={isMobile}
labelText="Rotate clockwise"
placement="left"
target=".wv-map-rotate-right"
/>
<FontAwesomeIcon icon="redo" className="cursor-pointer" />
</button>
</div>
);
}

const mapStateToProps = (state) => {
const {
screenSize, map, proj, ui,
} = state;
const isMobile = screenSize.isMobileDevice;
return {
map,
proj,
rotation: map.rotation,
isDistractionFreeModeActive: ui.isDistractionFreeModeActive,
isMobile,
};
};

const mapDispatchToProps = (dispatch) => ({
updateRotationState: debounce((radians) => {
dispatch({
type: 'MAP/UPDATE_ROTATION',
rotation: radians,
});
}, 100),
});

Rotation.propTypes = {
map: PropTypes.object,
rotation: PropTypes.number,
isDistractionFreeModeActive: PropTypes.bool,
isMobile: PropTypes.bool,
proj: PropTypes.object,
updateRotationState: PropTypes.func,
};

export default connect(
mapStateToProps,
mapDispatchToProps,
)(Rotation);
export default Rotation;