Refactor zooming logic out to action

This also enables a more straight-forward implementation of the functionality that the zoom buttons offer.

2 files changed, 5 insertions, 6 deletions

diff --git a/src/containers/app/map/MapStage.js b/src/containers/app/map/MapStage.js
index e0c85651..32bde27c 100644
--- a/src/containers/app/map/MapStage.js
+++ b/src/containers/app/map/MapStage.js
@@ -1,20 +1,19 @@
 import {connect} from "react-redux";
-import {setMapDimensions, setMapPosition, setMapScale} from "../../../actions/map";
+import {setMapDimensions, setMapPositionWithBoundsCheck, zoomInOnPosition} from "../../../actions/map";
 import MapStageComponent from "../../../components/app/map/MapStageComponent";
 
 const mapStateToProps = state => {
     return {
         mapPosition: state.map.position,
         mapDimensions: state.map.dimensions,
-        mapScale: state.map.scale,
     };
 };
 
 const mapDispatchToProps = dispatch => {
     return {
-        setMapPosition: (x, y) => dispatch(setMapPosition(x, y)),
+        zoomInOnPosition: (zoomIn, x, y) => dispatch(zoomInOnPosition(zoomIn, x, y)),
+        setMapPositionWithBoundsCheck: (x, y) => dispatch(setMapPositionWithBoundsCheck(x, y)),
         setMapDimensions: (width, height) => dispatch(setMapDimensions(width, height)),
-        setMapScale: (scale) => dispatch(setMapScale(scale)),
     };
 };
 
diff --git a/src/containers/app/map/controls/ZoomControlContainer.js b/src/containers/app/map/controls/ZoomControlContainer.js
index b9cf0a63..fd0e7563 100644
--- a/src/containers/app/map/controls/ZoomControlContainer.js
+++ b/src/containers/app/map/controls/ZoomControlContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import {setMapScale} from "../../../../actions/map";
+import {zoomInOnCenter} from "../../../../actions/map";
 import ZoomControlComponent from "../../../../components/app/map/controls/ZoomControlComponent";
 
 const mapStateToProps = state => {
@@ -10,7 +10,7 @@ const mapStateToProps = state => {
 
 const mapDispatchToProps = dispatch => {
     return {
-        setMapScale: scale => dispatch(setMapScale(scale)),
+        zoomInOnCenter: zoomIn => dispatch(zoomInOnCenter(zoomIn)),
     };
 };