From 4bee5930da1372379af151ecc38176d32a4b7244 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 16 Jan 2020 11:38:09 +0100
Subject: [PATCH] replacing workspace bug fixed

---
 DesignerSpace/Workspace/Workspace.js |  3 +--
 Spaces/ChartSpace.js                 | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js
index 34d758b20..7f16509a3 100644
--- a/DesignerSpace/Workspace/Workspace.js
+++ b/DesignerSpace/Workspace/Workspace.js
@@ -136,8 +136,7 @@ function newWorkspace () {
           workingAtTask++
           break
         case 5:
-          canvas.chartSpace.finalize()
-          canvas.chartSpace.initialize()
+          canvas.chartSpace.reset()
           workingAtTask++
           break
         case 6:
diff --git a/Spaces/ChartSpace.js b/Spaces/ChartSpace.js
index a9a2b8118..61f5858ce 100644
--- a/Spaces/ChartSpace.js
+++ b/Spaces/ChartSpace.js
@@ -13,10 +13,11 @@ function newChartSpace () {
   logger.fileName = MODULE_NAME
 
   let thisObject = {
-    visible: true,
+    visible: undefined,
     container: undefined,
-    inViewport: new Map(),
-    timeMachines: [],
+    inViewport: undefined,
+    timeMachines: undefined,
+    reset: reset,
     oneScreenUp: oneScreenUp,
     oneScreenDown: oneScreenDown,
     oneScreenLeft: oneScreenLeft,
@@ -31,15 +32,27 @@ function newChartSpace () {
   }
 
   let canvasBrowserResizedEventSubscriptionId
-  let timeMachinesMap = new Map()
-  let syncWithDesignerLoop = 0
+  let timeMachinesMap
+  let syncWithDesignerLoop
 
   const PERCENTAGE_OF_SCREEN_FOR_DISPLACEMENT = 25
 
-  setupContainer()
+  initialSetup()
   return thisObject
 
-  function setupContainer () {
+  function reset () {
+    finalize()
+    initialSetup()
+    initialize()
+  }
+
+  function initialSetup () {
+    thisObject.timeMachines = []
+    thisObject.visible = true
+    timeMachinesMap = new Map()
+    syncWithDesignerLoop = 0
+    thisObject.inViewport = new Map()
+
     thisObject.container = newContainer()
     thisObject.container.initialize(MODULE_NAME)