merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

2 files changed, 0 insertions, 31 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/app/map/controls/ScaleIndicatorContainer.js b/opendc-web/opendc-web-ui/src/containers/app/map/controls/ScaleIndicatorContainer.js
deleted file mode 100644
index fa3b9d22..00000000
--- a/opendc-web/opendc-web-ui/src/containers/app/map/controls/ScaleIndicatorContainer.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { connect } from 'react-redux'
-import ScaleIndicatorComponent from '../../../../components/app/map/controls/ScaleIndicatorComponent'
-
-const mapStateToProps = (state) => {
-    return {
-        scale: state.map.scale,
-    }
-}
-
-const ScaleIndicatorContainer = connect(mapStateToProps)(ScaleIndicatorComponent)
-
-export default ScaleIndicatorContainer
diff --git a/opendc-web/opendc-web-ui/src/containers/app/map/controls/ZoomControlContainer.js b/opendc-web/opendc-web-ui/src/containers/app/map/controls/ZoomControlContainer.js
deleted file mode 100644
index ddc68cc7..00000000
--- a/opendc-web/opendc-web-ui/src/containers/app/map/controls/ZoomControlContainer.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { connect } from 'react-redux'
-import { zoomInOnCenter } from '../../../../actions/map'
-import ZoomControlComponent from '../../../../components/app/map/controls/ZoomControlComponent'
-
-const mapStateToProps = (state) => {
-    return {
-        mapScale: state.map.scale,
-    }
-}
-
-const mapDispatchToProps = (dispatch) => {
-    return {
-        zoomInOnCenter: (zoomIn) => dispatch(zoomInOnCenter(zoomIn)),
-    }
-}
-
-const ZoomControlContainer = connect(mapStateToProps, mapDispatchToProps)(ZoomControlComponent)
-
-export default ZoomControlContainer