summaryrefslogtreecommitdiff
path: root/src/components/map/elements
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-11 11:53:06 +0200
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-23 10:06:00 +0200
commitaa448cb5c3e2e372dad1c79ffc32ff32144b4140 (patch)
tree19f6cff07ca75f541d543ca5e0eb65c50b8e93b8 /src/components/map/elements
parent8bd2bc91cc7e97f233031a42ccfda92af5e8bb96 (diff)
Move zoom level and map position info to store
Diffstat (limited to 'src/components/map/elements')
-rw-r--r--src/components/map/elements/TilePlusIcon.js21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/components/map/elements/TilePlusIcon.js b/src/components/map/elements/TilePlusIcon.js
index 3327525c..ed5ef5b5 100644
--- a/src/components/map/elements/TilePlusIcon.js
+++ b/src/components/map/elements/TilePlusIcon.js
@@ -4,19 +4,19 @@ import {Group, Line} from "react-konva";
import {TILE_PLUS_COLOR} from "../../../colors/index";
import {TILE_PLUS_MARGIN_IN_PIXELS, TILE_PLUS_WIDTH_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants";
-const TilePlusIcon = ({pixelX, pixelY, scale}) => {
+const TilePlusIcon = ({pixelX, pixelY, mapScale}) => {
const linePoints = [
[
- pixelX + 0.5 * TILE_SIZE_IN_PIXELS * scale,
- pixelY + TILE_PLUS_MARGIN_IN_PIXELS * scale,
- pixelX + 0.5 * TILE_SIZE_IN_PIXELS * scale,
- pixelY + TILE_SIZE_IN_PIXELS * scale - TILE_PLUS_MARGIN_IN_PIXELS * scale,
+ pixelX + 0.5 * TILE_SIZE_IN_PIXELS * mapScale,
+ pixelY + TILE_PLUS_MARGIN_IN_PIXELS * mapScale,
+ pixelX + 0.5 * TILE_SIZE_IN_PIXELS * mapScale,
+ pixelY + TILE_SIZE_IN_PIXELS * mapScale - TILE_PLUS_MARGIN_IN_PIXELS * mapScale,
],
[
- pixelX + TILE_PLUS_MARGIN_IN_PIXELS * scale,
- pixelY + 0.5 * TILE_SIZE_IN_PIXELS * scale,
- pixelX + TILE_SIZE_IN_PIXELS * scale - TILE_PLUS_MARGIN_IN_PIXELS * scale,
- pixelY + 0.5 * TILE_SIZE_IN_PIXELS * scale,
+ pixelX + TILE_PLUS_MARGIN_IN_PIXELS * mapScale,
+ pixelY + 0.5 * TILE_SIZE_IN_PIXELS * mapScale,
+ pixelX + TILE_SIZE_IN_PIXELS * mapScale - TILE_PLUS_MARGIN_IN_PIXELS * mapScale,
+ pixelY + 0.5 * TILE_SIZE_IN_PIXELS * mapScale,
],
];
return (
@@ -27,7 +27,7 @@ const TilePlusIcon = ({pixelX, pixelY, scale}) => {
points={points}
lineCap="round"
stroke={TILE_PLUS_COLOR}
- strokeWidth={TILE_PLUS_WIDTH_IN_PIXELS * scale}
+ strokeWidth={TILE_PLUS_WIDTH_IN_PIXELS * mapScale}
listening={false}
/>
))}
@@ -38,6 +38,7 @@ const TilePlusIcon = ({pixelX, pixelY, scale}) => {
TilePlusIcon.propTypes = {
pixelX: PropTypes.number,
pixelY: PropTypes.number,
+ mapScale: PropTypes.number,
};
export default TilePlusIcon;