From 02eafd26b8841ed5896ab83672aba13d569ea63d Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Tue, 5 Sep 2017 09:55:19 +0200
Subject: Fix issue loading DC with previously filled store

---
 src/components/map/MapConstants.js          |  1 +
 src/components/map/elements/TilePlusIcon.js | 10 +++++-----
 src/components/map/groups/GridGroup.js      |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/components')

diff --git a/src/components/map/MapConstants.js b/src/components/map/MapConstants.js
index c8a9810b..d700ee49 100644
--- a/src/components/map/MapConstants.js
+++ b/src/components/map/MapConstants.js
@@ -3,6 +3,7 @@ export const TILE_SIZE_IN_PIXELS = 100;
 export const MAP_SIZE_IN_PIXELS = MAP_SIZE * TILE_SIZE_IN_PIXELS;
 
 export const OBJECT_MARGIN_IN_PIXELS = TILE_SIZE_IN_PIXELS / 5;
+export const TILE_PLUS_MARGIN_IN_PIXELS = TILE_SIZE_IN_PIXELS / 3;
 export const OBJECT_SIZE_IN_PIXELS = TILE_SIZE_IN_PIXELS - OBJECT_MARGIN_IN_PIXELS * 2;
 
 export const GRID_LINE_WIDTH_IN_PIXELS = 2;
diff --git a/src/components/map/elements/TilePlusIcon.js b/src/components/map/elements/TilePlusIcon.js
index 562d7d15..4c22c23c 100644
--- a/src/components/map/elements/TilePlusIcon.js
+++ b/src/components/map/elements/TilePlusIcon.js
@@ -2,20 +2,20 @@ import PropTypes from "prop-types";
 import React from "react";
 import {Group, Line} from "react-konva";
 import {TILE_PLUS_COLOR} from "../../../colors/index";
-import {OBJECT_MARGIN_IN_PIXELS, TILE_PLUS_WIDTH_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants";
+import {TILE_PLUS_MARGIN_IN_PIXELS, TILE_PLUS_WIDTH_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants";
 
 const TilePlusIcon = ({pixelX, pixelY}) => {
     const linePoints = [
         [
             pixelX + 0.5 * TILE_SIZE_IN_PIXELS,
-            pixelY + OBJECT_MARGIN_IN_PIXELS,
+            pixelY + TILE_PLUS_MARGIN_IN_PIXELS,
             pixelX + 0.5 * TILE_SIZE_IN_PIXELS,
-            pixelY + TILE_SIZE_IN_PIXELS - OBJECT_MARGIN_IN_PIXELS,
+            pixelY + TILE_SIZE_IN_PIXELS - TILE_PLUS_MARGIN_IN_PIXELS,
         ],
         [
-            pixelX + OBJECT_MARGIN_IN_PIXELS,
+            pixelX + TILE_PLUS_MARGIN_IN_PIXELS,
             pixelY + 0.5 * TILE_SIZE_IN_PIXELS,
-            pixelX + TILE_SIZE_IN_PIXELS - OBJECT_MARGIN_IN_PIXELS,
+            pixelX + TILE_SIZE_IN_PIXELS - TILE_PLUS_MARGIN_IN_PIXELS,
             pixelY + 0.5 * TILE_SIZE_IN_PIXELS,
         ],
     ];
diff --git a/src/components/map/groups/GridGroup.js b/src/components/map/groups/GridGroup.js
index f50482ce..7affeced 100644
--- a/src/components/map/groups/GridGroup.js
+++ b/src/components/map/groups/GridGroup.js
@@ -17,10 +17,10 @@ const GridGroup = () => (
     <Group>
         {HORIZONTAL_POINT_PAIRS.concat(VERTICAL_POINT_PAIRS).map((points, index) => (
             <Line
+                key={index}
                 points={points}
                 stroke={GRID_COLOR}
                 strokeWidth={GRID_LINE_WIDTH_IN_PIXELS}
-                key={index}
             />
         ))}
     </Group>
-- 
cgit v1.2.3