summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-11 14:49:17 +0200
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-23 10:06:00 +0200
commitcbf8eb9cbf2f4082cb1a83955d435ebcb73be3ab (patch)
treedb58a2d9c363d3256270eb705b5ae13d51836c71
parentaa448cb5c3e2e372dad1c79ffc32ff32144b4140 (diff)
Center datacenter on site load
-rw-r--r--src/actions/topology/building.js2
-rw-r--r--src/components/map/MapConstants.js3
-rw-r--r--src/index.js2
-rw-r--r--src/store/configure-store.js (renamed from src/store/configureStore.js)2
-rw-r--r--src/store/middlewares/viewport-adjustment.js51
-rw-r--r--src/util/tile-calculations.js10
6 files changed, 58 insertions, 12 deletions
diff --git a/src/actions/topology/building.js b/src/actions/topology/building.js
index 9f2d4590..4138d2b5 100644
--- a/src/actions/topology/building.js
+++ b/src/actions/topology/building.js
@@ -1,5 +1,3 @@
-export const FETCH_TOPOLOGY_OF_DATACENTER = "FETCH_TOPOLOGY_OF_DATACENTER";
-export const FETCH_TOPOLOGY_OF_DATACENTER_SUCCEEDED = "FETCH_TOPOLOGY_OF_DATACENTER_SUCCEEDED";
export const FETCH_LATEST_DATACENTER = "FETCH_LATEST_DATACENTER";
export const FETCH_LATEST_DATACENTER_SUCCEEDED = "FETCH_LATEST_DATACENTER_SUCCEEDED";
export const RESET_CURRENT_DATACENTER = "RESET_CURRENT_DATACENTER";
diff --git a/src/components/map/MapConstants.js b/src/components/map/MapConstants.js
index f24e450f..524dd1ae 100644
--- a/src/components/map/MapConstants.js
+++ b/src/components/map/MapConstants.js
@@ -11,6 +11,9 @@ export const WALL_WIDTH_IN_PIXELS = TILE_SIZE_IN_PIXELS / 8;
export const OBJECT_BORDER_WIDTH_IN_PIXELS = TILE_SIZE_IN_PIXELS / 12;
export const TILE_PLUS_WIDTH_IN_PIXELS = TILE_SIZE_IN_PIXELS / 10;
+export const SIDEBAR_WIDTH = 350;
+export const VIEWPORT_PADDING = 50;
+
export const RACK_FILL_ICON_WIDTH = OBJECT_SIZE_IN_PIXELS / 3;
export const RACK_FILL_ICON_OPACITY = 0.8;
diff --git a/src/index.js b/src/index.js
index 8fa45ebf..84d5329c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,7 +5,7 @@ import {setupSocketConnection} from "./api/socket";
import "./index.css";
import registerServiceWorker from "./registerServiceWorker";
import Routes from "./routes";
-import configureStore from "./store/configureStore";
+import configureStore from "./store/configure-store";
setupSocketConnection(() => {
const store = configureStore();
diff --git a/src/store/configureStore.js b/src/store/configure-store.js
index 5bbaf811..a7f3ec31 100644
--- a/src/store/configureStore.js
+++ b/src/store/configure-store.js
@@ -6,6 +6,7 @@ import thunk from "redux-thunk";
import {authRedirectMiddleware} from "../auth/index";
import rootReducer from "../reducers/index";
import rootSaga from "../sagas/index";
+import {viewportAdjustmentMiddleware} from "./middlewares/viewport-adjustment";
const sagaMiddleware = createSagaMiddleware();
const logger = createLogger();
@@ -20,6 +21,7 @@ export default function configureStore() {
thunk,
sagaMiddleware,
authRedirectMiddleware,
+ viewportAdjustmentMiddleware,
)
)
);
diff --git a/src/store/middlewares/viewport-adjustment.js b/src/store/middlewares/viewport-adjustment.js
new file mode 100644
index 00000000..75ad6a2f
--- /dev/null
+++ b/src/store/middlewares/viewport-adjustment.js
@@ -0,0 +1,51 @@
+import {SET_MAP_DIMENSIONS, setMapPosition, setMapScale} from "../../actions/map";
+import {
+ MAP_MAX_SCALE,
+ MAP_MIN_SCALE,
+ SIDEBAR_WIDTH,
+ TILE_SIZE_IN_PIXELS,
+ VIEWPORT_PADDING
+} from "../../components/map/MapConstants";
+import {calculateRoomListBounds} from "../../util/tile-calculations";
+
+export const viewportAdjustmentMiddleware = store => next => action => {
+ const state = store.getState();
+ if (action.type === SET_MAP_DIMENSIONS && state.currentDatacenterId !== -1) {
+ const roomIds = state.objects.datacenter[state.currentDatacenterId].roomIds;
+ const rooms = roomIds.map(id => Object.assign({}, state.objects.room[id]));
+ rooms.forEach(room => room.tiles = room.tileIds.map(tileId => state.objects.tile[tileId]));
+
+ const viewportParams = calculateParametersToZoomInOnRooms(rooms, action.width, action.height);
+ store.dispatch(setMapPosition(viewportParams.newX, viewportParams.newY));
+ store.dispatch(setMapScale(viewportParams.newScale));
+ }
+
+ next(action);
+};
+
+function calculateParametersToZoomInOnRooms(rooms, mapWidth, mapHeight) {
+ const bounds = calculateRoomListBounds(rooms);
+ const newScale = calculateNewScale(bounds, mapWidth, mapHeight);
+
+ // Coordinates of the center of the room, relative to the global origin of the map
+ const roomCenterCoordinates = {
+ x: bounds.center.x * TILE_SIZE_IN_PIXELS * newScale,
+ y: bounds.center.y * TILE_SIZE_IN_PIXELS * newScale
+ };
+
+ const newX = -roomCenterCoordinates.x + mapWidth / 2;
+ const newY = -roomCenterCoordinates.y + mapHeight / 2;
+
+ return {newScale, newX, newY};
+}
+
+function calculateNewScale(bounds, mapWidth, mapHeight) {
+ const width = bounds.max.x - bounds.min.x;
+ const height = bounds.max.y - bounds.min.y;
+
+ const scaleX = (mapWidth - 2 * SIDEBAR_WIDTH) / (width * TILE_SIZE_IN_PIXELS + 2 * VIEWPORT_PADDING);
+ const scaleY = mapHeight / (height * TILE_SIZE_IN_PIXELS + 2 * VIEWPORT_PADDING);
+ const newScale = Math.min(scaleX, scaleY);
+
+ return Math.min(Math.max(MAP_MIN_SCALE, newScale), MAP_MAX_SCALE);
+}
diff --git a/src/util/tile-calculations.js b/src/util/tile-calculations.js
index 260f28e6..31b5d8aa 100644
--- a/src/util/tile-calculations.js
+++ b/src/util/tile-calculations.js
@@ -239,13 +239,5 @@ export function calculateRoomListBounds(rooms) {
y: min.y + (max.y - min.y) / 2.0
};
- return {
- min,
- center,
- max
- };
-}
-
-export function calculateRoomBounds(room) {
- return calculateRoomListBounds([room]);
+ return {min, center, max};
}