From a68e0e1215e8ad15110efdb47ad38b2078488299 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Mon, 23 Aug 2021 11:29:05 -0600
Subject: [PATCH 01/11] Create modal for moving spaces

---
 src/components/Modals/MoveSpaceModal.vue | 33 ++++++++++++++++++++++++
 src/components/Toolbar.vue               | 13 ++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/components/Modals/MoveSpaceModal.vue

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
new file mode 100644
index 00000000..51aab242
--- /dev/null
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -0,0 +1,33 @@
+<!-- Floorspace.js, Copyright (c) 2016-2017, Alliance for Sustainable Energy, LLC. All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+(1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission from the respective party.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
+
+<template>
+    <ModalBase
+      class="save-as-modal"
+      :title="`Move Selected Space`"
+      @close="$emit('close')"
+    >
+    </ModalBase>
+</template>
+
+<script>
+import ModalBase from './ModalBase.vue';
+
+export default {
+  name: 'MoveSpaceModal',
+  props: [],
+  components: {
+    ModalBase,
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "./../../scss/config";
+
+
+</style>
\ No newline at end of file
diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue
index e5fca127..47c45196 100644
--- a/src/components/Toolbar.vue
+++ b/src/components/Toolbar.vue
@@ -26,6 +26,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
           <div v-if="enable3DPreview" title="Open 3D Previewer">
             <globe-icon-svg @click.native="open3DPreviewer" class="button" />
           </div>
+          <div title="Move Selected Space">
+            <globe-icon-svg @click.native="moveSelectedSpace" class="button" />
+          </div>
         </div>
 
         <div id="undo-redo">
@@ -172,6 +175,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
         v-if="showSaveModal"
         @close="() => {showSaveModal = false;}"
       />
+      <MoveSpaceModal
+        v-if="showMoveSelectedSpaceModal"
+        @close="() => {showMoveSelectedSpaceModal = false;}"
+      />
       <Settings
         v-else-if="showGroundPropsModal"
         @close="showGroundPropsModal = false"
@@ -183,6 +190,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 <script>
 import { mapState, mapGetters } from 'vuex';
 import SaveAsModal from './Modals/SaveAsModal.vue';
+import MoveSpaceModal from './Modals/MoveSpaceModal.vue';
 import Settings from './Modals/Settings.vue';
 import PrettySelect from './PrettySelect.vue';
 import applicationHelpers from './../store/modules/application/helpers';
@@ -203,6 +211,7 @@ export default {
         window_definitions: 'Window Definitions',
       },
       showSaveModal: false,
+      showMoveSelectedSpaceModal: false,
       visibleComponentType: null,
       showGroundPropsModal: false,
     };
@@ -225,6 +234,9 @@ export default {
       localStorage.setItem("floorplan3DExport", JSON.stringify(application.$store.getters['exportData']));
       window.open('3DViewer');
     },
+    moveSelectedSpace() {
+      this.showMoveSelectedSpaceModal = true;
+    },
     importDataAsFile(event, type) {
       const file = event.target.files[0];
       const reader = new FileReader();
@@ -409,6 +421,7 @@ export default {
   components: {
     PrettySelect,
     SaveAsModal,
+    MoveSpaceModal,
     Settings,
     RenderByDropdown,
     ComponentInstanceEditBar,

From a16d54d73215ac7d07e00d92f46af3eaab1a68a1 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Mon, 23 Aug 2021 13:28:59 -0600
Subject: [PATCH 02/11] Able to show current space x & y

---
 src/components/Modals/MoveSpaceModal.vue | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index 51aab242..be6b3b67 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -11,15 +11,50 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
       :title="`Move Selected Space`"
       @close="$emit('close')"
     >
+      <div>
+        <p v-if="this.currentSpace" >{{this.currentSpace.name}}</p>
+        <label>X: </label>
+        <input type="text" v-model="x_offset" />
+        <label>Y: </label>
+        <input type="text" v-model="y_offset" />
+        <button>Save</button>
+      </div>
     </ModalBase>
 </template>
 
 <script>
 import ModalBase from './ModalBase.vue';
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'MoveSpaceModal',
   props: [],
+  mounted() {
+    console.log('current space: ', this.currentSpace);
+    console.log('current story geo: ', this.currentStoryGeometry);
+  },
+  computed: {
+    ...mapGetters({
+      currentSpace: 'application/currentSpace',
+      currentStoryGeometry: 'application/currentStoryGeometry',
+    }),
+    x_offset: {
+      get() {
+        if (this.currentStoryGeometry.vertices.length > 0) {
+          return this.currentStoryGeometry.vertices[0].x;
+        }
+      },
+      // set(val) { this.$store.dispatch('project/modifyGround', { key: 'floor_offset', val }); },
+    },
+    y_offset: {
+      get() {
+        if (this.currentStoryGeometry.vertices.length > 0) {
+          return this.currentStoryGeometry.vertices[0].y;
+        }
+      },
+      // set(val) { this.$store.dispatch('project/modifyGround', { key: 'floor_offset', val }); },
+    },
+  },
   components: {
     ModalBase,
   },

From 1e4471ca7a6aacb468fcc392d1f9f0bd4013bb8a Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Mon, 23 Aug 2021 13:54:45 -0600
Subject: [PATCH 03/11] Fixes the setter

---
 src/components/Modals/MoveSpaceModal.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index be6b3b67..c7f062ae 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -14,9 +14,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
       <div>
         <p v-if="this.currentSpace" >{{this.currentSpace.name}}</p>
         <label>X: </label>
-        <input type="text" v-model="x_offset" />
+        <input type="number" v-model="x_offset" />
         <label>Y: </label>
-        <input type="text" v-model="y_offset" />
+        <input type="number" v-model="y_offset" />
         <button>Save</button>
       </div>
     </ModalBase>
@@ -44,7 +44,7 @@ export default {
           return this.currentStoryGeometry.vertices[0].x;
         }
       },
-      // set(val) { this.$store.dispatch('project/modifyGround', { key: 'floor_offset', val }); },
+      set(val) { console.log('Y val: ', val) },
     },
     y_offset: {
       get() {
@@ -52,7 +52,7 @@ export default {
           return this.currentStoryGeometry.vertices[0].y;
         }
       },
-      // set(val) { this.$store.dispatch('project/modifyGround', { key: 'floor_offset', val }); },
+      set(val) { console.log('Y val: ', val) },
     },
   },
   components: {

From 1907965c1a671b4b27e676f772019f5aa4a50a0a Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Mon, 23 Aug 2021 14:52:06 -0600
Subject: [PATCH 04/11] Set default data based on the face

---
 src/components/Modals/MoveSpaceModal.vue | 31 +++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index c7f062ae..7ebaaa3a 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -29,30 +29,33 @@ import { mapGetters } from 'vuex';
 export default {
   name: 'MoveSpaceModal',
   props: [],
+  data() {
+    return {
+      updateXTo: 0,
+      updateYTo: 0,
+    };
+  },
   mounted() {
     console.log('current space: ', this.currentSpace);
-    console.log('current story geo: ', this.currentStoryGeometry);
+    console.log('current story geo: ', this.currentStoryDenormalizedGeom);
+    if (this.currentStoryDenormalizedGeom.vertices.length > 0) { 
+      const currentFace = this.currentStoryDenormalizedGeom.faces.find(face => face.id === this.currentSpace.face_id);
+      this.updateXTo = currentFace.edges[0].v1.x;
+      this.updateYTo = currentFace.edges[0].v1.y;
+    }
   },
   computed: {
     ...mapGetters({
       currentSpace: 'application/currentSpace',
-      currentStoryGeometry: 'application/currentStoryGeometry',
+      currentStoryDenormalizedGeom: 'application/currentStoryDenormalizedGeom',
     }),
     x_offset: {
-      get() {
-        if (this.currentStoryGeometry.vertices.length > 0) {
-          return this.currentStoryGeometry.vertices[0].x;
-        }
-      },
-      set(val) { console.log('Y val: ', val) },
+      get() { return this.updateXTo },
+      set(val) { this.updateXTo = val; },
     },
     y_offset: {
-      get() {
-        if (this.currentStoryGeometry.vertices.length > 0) {
-          return this.currentStoryGeometry.vertices[0].y;
-        }
-      },
-      set(val) { console.log('Y val: ', val) },
+      get() { return this.updateYTo },
+      set(val) { this.updateYTo = val; },
     },
   },
   components: {

From b2c19ce1b3847fa67182abaa91c05bdfe0c21bf2 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Mon, 23 Aug 2021 15:04:52 -0600
Subject: [PATCH 05/11] Setup the save button

---
 src/components/Modals/MoveSpaceModal.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index 7ebaaa3a..a05dc3f6 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -17,7 +17,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
         <input type="number" v-model="x_offset" />
         <label>Y: </label>
         <input type="number" v-model="y_offset" />
-        <button>Save</button>
+        <button @click="save">Save</button>
       </div>
     </ModalBase>
 </template>
@@ -58,6 +58,11 @@ export default {
       set(val) { this.updateYTo = val; },
     },
   },
+  methods: {
+    save() {
+      console.log('saving coords: X - ', this.updateXTo, ' Y - ', this.updateYTo);
+    },
+  },
   components: {
     ModalBase,
   },

From 810444ad12d61913c7f6b6ecb10a0291454a74b0 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Tue, 24 Aug 2021 13:12:03 -0600
Subject: [PATCH 06/11] Able to move the space but not working properly

---
 src/components/Modals/MoveSpaceModal.vue      | 22 ++++++++++++++-----
 src/store/modules/geometry/actions/actions.js |  9 ++++++++
 src/store/modules/geometry/mutations.js       | 16 ++++++++++++++
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index a05dc3f6..69911d8e 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -13,11 +13,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
     >
       <div>
         <p v-if="this.currentSpace" >{{this.currentSpace.name}}</p>
-        <label>X: </label>
-        <input type="number" v-model="x_offset" />
-        <label>Y: </label>
-        <input type="number" v-model="y_offset" />
-        <button @click="save">Save</button>
+        <i>Adjust from the upperleft X/Y</i>
+        <div>
+          <label>X: </label>
+          <input type="number" v-model="x_offset" />
+          <label>Y: </label>
+          <input type="number" v-model="y_offset" />
+          <button @click="save">Save</button>
+        </div>
       </div>
     </ModalBase>
 </template>
@@ -33,6 +36,7 @@ export default {
     return {
       updateXTo: 0,
       updateYTo: 0,
+      currentFace: undefined,
     };
   },
   mounted() {
@@ -40,6 +44,7 @@ export default {
     console.log('current story geo: ', this.currentStoryDenormalizedGeom);
     if (this.currentStoryDenormalizedGeom.vertices.length > 0) { 
       const currentFace = this.currentStoryDenormalizedGeom.faces.find(face => face.id === this.currentSpace.face_id);
+      this.currentFace = currentFace;
       this.updateXTo = currentFace.edges[0].v1.x;
       this.updateYTo = currentFace.edges[0].v1.y;
     }
@@ -60,7 +65,12 @@ export default {
   },
   methods: {
     save() {
-      console.log('saving coords: X - ', this.updateXTo, ' Y - ', this.updateYTo);
+      console.log('saving coords: X ', this.updateXTo, ' Y ', this.updateYTo);
+      this.$store.dispatch('geometry/updateFacePoints', {
+        face: this.currentFace,
+        updateXTo: this.updateXTo,
+        updateYTo: this.updateYTo,
+      });
     },
   },
   components: {
diff --git a/src/store/modules/geometry/actions/actions.js b/src/store/modules/geometry/actions/actions.js
index 772969c7..86c71cdd 100644
--- a/src/store/modules/geometry/actions/actions.js
+++ b/src/store/modules/geometry/actions/actions.js
@@ -183,8 +183,17 @@ export default {
 
     commit('trimGeometry', { geometry_id, vertsReferencedElsewhere: vertsReferencedByDCs });
   },
+
   cloneStoryGeometry(context, payload) {
     const currentStory = context.rootGetters['application/currentStoryGeometry'];
     context.commit('updateClonedGeometry', { newGeom: payload, currentStoryId: currentStory.id });
   },
+
+  updateFacePoints(context, payload) {
+    console.log('payload coming in for update face points', payload);
+    // swap existing face with updated face (mutation)
+    context.commit('updateFacePoints', {
+      ...payload,
+    });
+  },
 };
diff --git a/src/store/modules/geometry/mutations.js b/src/store/modules/geometry/mutations.js
index 57954a32..5690e4c8 100644
--- a/src/store/modules/geometry/mutations.js
+++ b/src/store/modules/geometry/mutations.js
@@ -163,3 +163,19 @@ export function updateClonedGeometry(state, payload) {
   newGeometry.faces = payload.newGeom.faces;
   newGeometry.vertices = payload.newGeom.vertices;
 }
+
+export function updateFacePoints(state, payload) {
+  console.log('mutation payload: ', payload);
+  // determine diff of movement
+  const xOffset = parseInt(payload.updateXTo, 10) - payload.face.edges[0].v1.x;
+  console.log('detected an xoffset of :', xOffset);
+  const yOffset = parseInt(payload.updateYTo, 10) - payload.face.edges[0].v1.y;
+  console.log('detected an yoffset of :', yOffset);
+
+  for (const edge of Object.values(payload.face.edges)) {
+    edge.v1.x += xOffset;
+    edge.v1.y += yOffset;
+    edge.v2.x += xOffset;
+    edge.v2.y += yOffset;
+  }
+}

From a566598fb562aa9ad967d7fdd5d54babb851f3d1 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Wed, 25 Aug 2021 09:08:03 -0600
Subject: [PATCH 07/11] Starting over

---
 src/components/Modals/MoveSpaceModal.vue      | 15 ++++++---
 src/store/modules/geometry/actions/actions.js | 12 +++----
 .../geometry/actions/createFaceFromPoints.js  | 10 +++---
 src/store/modules/geometry/mutations.js       | 32 ++++++++++---------
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index 69911d8e..fec5e70a 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -66,11 +66,16 @@ export default {
   methods: {
     save() {
       console.log('saving coords: X ', this.updateXTo, ' Y ', this.updateYTo);
-      this.$store.dispatch('geometry/updateFacePoints', {
-        face: this.currentFace,
-        updateXTo: this.updateXTo,
-        updateYTo: this.updateYTo,
-      });
+      // determine diff of movement
+      const xOffset = parseInt(this.updateXTo, 10) - this.currentFace.edges[0].v1.x;
+      console.log('detected an xoffset of :', xOffset);
+      const yOffset = parseInt(payload.updateYTo, 10) - payload.face.edges[0].v1.y;
+      console.log('detected an yoffset of :', yOffset);
+      // this.$store.dispatch('geometry/moveFaceByOffset', {
+      //   face: this.currentFace,
+      //   updateXTo: this.updateXTo,
+      //   updateYTo: this.updateYTo,
+      // });
     },
   },
   components: {
diff --git a/src/store/modules/geometry/actions/actions.js b/src/store/modules/geometry/actions/actions.js
index 86c71cdd..295d9954 100644
--- a/src/store/modules/geometry/actions/actions.js
+++ b/src/store/modules/geometry/actions/actions.js
@@ -189,11 +189,11 @@ export default {
     context.commit('updateClonedGeometry', { newGeom: payload, currentStoryId: currentStory.id });
   },
 
-  updateFacePoints(context, payload) {
-    console.log('payload coming in for update face points', payload);
-    // swap existing face with updated face (mutation)
-    context.commit('updateFacePoints', {
-      ...payload,
-    });
+  moveFaceByOffset(context, { space_id, xOffset, yOffset }) {
+    console.log('space_id: ', space_id);
+    console.log('received offset X of: ', xOffset);
+    console.log('recived offset Y of: ', yOffset);
+    // send in points, model_id and onAlreadyExists = 'replace'
+    // points will just be vertices
   },
 };
diff --git a/src/store/modules/geometry/actions/createFaceFromPoints.js b/src/store/modules/geometry/actions/createFaceFromPoints.js
index 57a8d930..c718849e 100644
--- a/src/store/modules/geometry/actions/createFaceFromPoints.js
+++ b/src/store/modules/geometry/actions/createFaceFromPoints.js
@@ -12,6 +12,7 @@ export default function createFaceFromPoints(context, payload) {
   const {
     model_id,
     points,
+    onAlreadyExists = 'union',
   } = payload;
 
   if (uniq(points).length < 3) { return; }
@@ -23,7 +24,7 @@ export default function createFaceFromPoints(context, payload) {
   const existingFace = target.face_id ? geometryHelpers.faceForId(target.face_id, currentStoryGeometry) : null;
   let facePoints;
 
-  if (existingFace) {
+  if (existingFace && onAlreadyExists === 'union') {
     const existingFaceVertices = geometryHelpers.verticesForFaceId(existingFace.id, currentStoryGeometry);
     facePoints = geometryHelpers.setOperation('union', existingFaceVertices, points);
     if (facePoints.error) {
@@ -79,7 +80,6 @@ export default function createFaceFromPoints(context, payload) {
     // split edges where vertices touch them
     splitEdges(context, newEdges, newVertices);
   });
-
 }
 
 // ////////////////////// HELPERS //////////////////////////// //
@@ -432,11 +432,11 @@ function replacementEdgeRefs(geometry, dyingEdgeId, newEdges) {
 /**
  * Returns a list of all the edges that need to be split (i.e. edges that are on top of one another)
  *
- * @param {*} geometry 
- * @param {*} spacing 
+ * @param {*} geometry
+ * @param {*} spacing
  * @param {*} newEdges List of new edges added, optional
  * @param {*} newVertices List of new vertices added, optional
- * @returns 
+ * @returns
  */
 export function edgesToSplit(geometry, spacing, newEdges, newVertices) {
   const priorIterationEdges = [];
diff --git a/src/store/modules/geometry/mutations.js b/src/store/modules/geometry/mutations.js
index 5690e4c8..4fe847a5 100644
--- a/src/store/modules/geometry/mutations.js
+++ b/src/store/modules/geometry/mutations.js
@@ -164,18 +164,20 @@ export function updateClonedGeometry(state, payload) {
   newGeometry.vertices = payload.newGeom.vertices;
 }
 
-export function updateFacePoints(state, payload) {
-  console.log('mutation payload: ', payload);
-  // determine diff of movement
-  const xOffset = parseInt(payload.updateXTo, 10) - payload.face.edges[0].v1.x;
-  console.log('detected an xoffset of :', xOffset);
-  const yOffset = parseInt(payload.updateYTo, 10) - payload.face.edges[0].v1.y;
-  console.log('detected an yoffset of :', yOffset);
-
-  for (const edge of Object.values(payload.face.edges)) {
-    edge.v1.x += xOffset;
-    edge.v1.y += yOffset;
-    edge.v2.x += xOffset;
-    edge.v2.y += yOffset;
-  }
-}
+// export function updateFacePoints(state, payload) {
+//   console.log('mutation payload: ', payload);
+//   // determine diff of movement
+//   const xOffset = parseInt(payload.updateXTo, 10) - payload.face.edges[0].v1.x;
+//   console.log('detected an xoffset of :', xOffset);
+//   const yOffset = parseInt(payload.updateYTo, 10) - payload.face.edges[0].v1.y;
+//   console.log('detected an yoffset of :', yOffset);
+
+//   for (const edge of Object.values(payload.face.edges)) {
+//     console.log('adjusting vertex v1', edge.v1.id);
+//     edge.v1.x += xOffset;
+//     edge.v1.y += yOffset;
+//     console.log('adjusting vertex v2', edge.v2.id);
+//     edge.v2.x += xOffset;
+//     edge.v2.y += yOffset;
+//   }
+// }

From 3d06a3af0e554aa90f9dcfdd9e5d59dbba7914a7 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Wed, 25 Aug 2021 10:32:41 -0600
Subject: [PATCH 08/11] Working as intended

---
 src/components/Modals/MoveSpaceModal.vue      | 18 +++++++-----------
 src/store/modules/geometry/actions/actions.js |  8 --------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index fec5e70a..45b38c79 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -40,8 +40,6 @@ export default {
     };
   },
   mounted() {
-    console.log('current space: ', this.currentSpace);
-    console.log('current story geo: ', this.currentStoryDenormalizedGeom);
     if (this.currentStoryDenormalizedGeom.vertices.length > 0) { 
       const currentFace = this.currentStoryDenormalizedGeom.faces.find(face => face.id === this.currentSpace.face_id);
       this.currentFace = currentFace;
@@ -65,17 +63,15 @@ export default {
   },
   methods: {
     save() {
-      console.log('saving coords: X ', this.updateXTo, ' Y ', this.updateYTo);
       // determine diff of movement
       const xOffset = parseInt(this.updateXTo, 10) - this.currentFace.edges[0].v1.x;
-      console.log('detected an xoffset of :', xOffset);
-      const yOffset = parseInt(payload.updateYTo, 10) - payload.face.edges[0].v1.y;
-      console.log('detected an yoffset of :', yOffset);
-      // this.$store.dispatch('geometry/moveFaceByOffset', {
-      //   face: this.currentFace,
-      //   updateXTo: this.updateXTo,
-      //   updateYTo: this.updateYTo,
-      // });
+      const yOffset = parseInt(this.updateYTo, 10) - this.currentFace.edges[0].v1.y;
+      this.$store.dispatch('geometry/moveFaceByOffset', {
+        face_id: this.currentFace.id,
+        dx: xOffset,
+        dy: yOffset
+      });
+      this.$emit('close');
     },
   },
   components: {
diff --git a/src/store/modules/geometry/actions/actions.js b/src/store/modules/geometry/actions/actions.js
index 295d9954..42092f61 100644
--- a/src/store/modules/geometry/actions/actions.js
+++ b/src/store/modules/geometry/actions/actions.js
@@ -188,12 +188,4 @@ export default {
     const currentStory = context.rootGetters['application/currentStoryGeometry'];
     context.commit('updateClonedGeometry', { newGeom: payload, currentStoryId: currentStory.id });
   },
-
-  moveFaceByOffset(context, { space_id, xOffset, yOffset }) {
-    console.log('space_id: ', space_id);
-    console.log('received offset X of: ', xOffset);
-    console.log('recived offset Y of: ', yOffset);
-    // send in points, model_id and onAlreadyExists = 'replace'
-    // points will just be vertices
-  },
 };

From c2f45d3f74d3aa669058f1223682a7fd8ce5b011 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Wed, 25 Aug 2021 11:05:05 -0600
Subject: [PATCH 09/11] Add icon + add it to Space row

---
 src/assets/svg-icons/arrows-alt-solid.svg |  1 +
 src/components/LibrarySelect.vue          | 29 +++++++++++++++++++++++
 src/components/Toolbar.vue                | 13 ----------
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 src/assets/svg-icons/arrows-alt-solid.svg

diff --git a/src/assets/svg-icons/arrows-alt-solid.svg b/src/assets/svg-icons/arrows-alt-solid.svg
new file mode 100644
index 00000000..501fe39a
--- /dev/null
+++ b/src/assets/svg-icons/arrows-alt-solid.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="arrows-alt" class="svg-inline--fa fa-arrows-alt fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#A1A9AE" d="M352.201 425.775l-79.196 79.196c-9.373 9.373-24.568 9.373-33.941 0l-79.196-79.196c-15.119-15.119-4.411-40.971 16.971-40.97h51.162L228 284H127.196v51.162c0 21.382-25.851 32.09-40.971 16.971L7.029 272.937c-9.373-9.373-9.373-24.569 0-33.941L86.225 159.8c15.119-15.119 40.971-4.411 40.971 16.971V228H228V127.196h-51.23c-21.382 0-32.09-25.851-16.971-40.971l79.196-79.196c9.373-9.373 24.568-9.373 33.941 0l79.196 79.196c15.119 15.119 4.411 40.971-16.971 40.971h-51.162V228h100.804v-51.162c0-21.382 25.851-32.09 40.97-16.971l79.196 79.196c9.373 9.373 9.373 24.569 0 33.941L425.773 352.2c-15.119 15.119-40.971 4.411-40.97-16.971V284H284v100.804h51.23c21.382 0 32.09 25.851 16.971 40.971z"></path></svg>
\ No newline at end of file
diff --git a/src/components/LibrarySelect.vue b/src/components/LibrarySelect.vue
index 2df0309c..5c66a2ca 100644
--- a/src/components/LibrarySelect.vue
+++ b/src/components/LibrarySelect.vue
@@ -17,6 +17,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
           <span :style="{ 'background-color': item.color }"></span>
           {{item.name}}
           <div class="buttons">
+            <div v-if="item.type === 'space'" title="Move Selected Space">
+              <Move @click.native="moveSelectedSpace" class="button" />
+            </div>
             <a @click.stop="duplicateRow(item)" class="duplicate" title="duplicate">
               <Copy class="button" />
             </a>
@@ -26,12 +29,20 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
           </div>
       </div>
     </div>
+    <section class="modals">
+      <MoveSpaceModal
+        v-if="showMoveSelectedSpaceModal"
+        @close="() => {showMoveSelectedSpaceModal = false;}"
+      />
+    </section>
   </div>
 </template>
 
 <script>
 import Delete from './../assets/svg-icons/delete.svg';
 import Copy from './../assets/svg-icons/copy_icon.svg';
+import Move from './../assets/svg-icons/arrows-alt-solid.svg';
+import MoveSpaceModal from './Modals/MoveSpaceModal.vue';
 
 export default {
   name: 'LibrarySelect',
@@ -39,6 +50,21 @@ export default {
   components: {
     Delete,
     Copy,
+    Move,
+    MoveSpaceModal,
+  },
+  mounted() {
+    console.log('rows coming in: ', this.rows);
+  },
+  data() {
+    return {
+      showMoveSelectedSpaceModal: false,
+    };
+  },
+  methods: {
+    moveSelectedSpace() {
+      this.showMoveSelectedSpaceModal = true;
+    },
   },
 }
 </script>
@@ -84,6 +110,9 @@ export default {
         }
       }
     }
+    .buttons {
+      display: flex;
+    }
   }
   // overflow: auto;
   // height: calc(100% - 5rem);
diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue
index 47c45196..e5fca127 100644
--- a/src/components/Toolbar.vue
+++ b/src/components/Toolbar.vue
@@ -26,9 +26,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
           <div v-if="enable3DPreview" title="Open 3D Previewer">
             <globe-icon-svg @click.native="open3DPreviewer" class="button" />
           </div>
-          <div title="Move Selected Space">
-            <globe-icon-svg @click.native="moveSelectedSpace" class="button" />
-          </div>
         </div>
 
         <div id="undo-redo">
@@ -175,10 +172,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
         v-if="showSaveModal"
         @close="() => {showSaveModal = false;}"
       />
-      <MoveSpaceModal
-        v-if="showMoveSelectedSpaceModal"
-        @close="() => {showMoveSelectedSpaceModal = false;}"
-      />
       <Settings
         v-else-if="showGroundPropsModal"
         @close="showGroundPropsModal = false"
@@ -190,7 +183,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 <script>
 import { mapState, mapGetters } from 'vuex';
 import SaveAsModal from './Modals/SaveAsModal.vue';
-import MoveSpaceModal from './Modals/MoveSpaceModal.vue';
 import Settings from './Modals/Settings.vue';
 import PrettySelect from './PrettySelect.vue';
 import applicationHelpers from './../store/modules/application/helpers';
@@ -211,7 +203,6 @@ export default {
         window_definitions: 'Window Definitions',
       },
       showSaveModal: false,
-      showMoveSelectedSpaceModal: false,
       visibleComponentType: null,
       showGroundPropsModal: false,
     };
@@ -234,9 +225,6 @@ export default {
       localStorage.setItem("floorplan3DExport", JSON.stringify(application.$store.getters['exportData']));
       window.open('3DViewer');
     },
-    moveSelectedSpace() {
-      this.showMoveSelectedSpaceModal = true;
-    },
     importDataAsFile(event, type) {
       const file = event.target.files[0];
       const reader = new FileReader();
@@ -421,7 +409,6 @@ export default {
   components: {
     PrettySelect,
     SaveAsModal,
-    MoveSpaceModal,
     Settings,
     RenderByDropdown,
     ComponentInstanceEditBar,

From a4314a0c03523adcebd9962a220506633b1860a2 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Wed, 25 Aug 2021 12:26:18 -0600
Subject: [PATCH 10/11] Add test for moving a space

---
 src/components/LibrarySelect.vue         |  5 +----
 src/components/Modals/MoveSpaceModal.vue |  6 +++---
 test/e2e/specs/geometry.js               | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/components/LibrarySelect.vue b/src/components/LibrarySelect.vue
index 5c66a2ca..7d6fdf94 100644
--- a/src/components/LibrarySelect.vue
+++ b/src/components/LibrarySelect.vue
@@ -17,7 +17,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
           <span :style="{ 'background-color': item.color }"></span>
           {{item.name}}
           <div class="buttons">
-            <div v-if="item.type === 'space'" title="Move Selected Space">
+            <div v-if="item.type === 'space'" title="Move Selected Space" class="move-selected-space">
               <Move @click.native="moveSelectedSpace" class="button" />
             </div>
             <a @click.stop="duplicateRow(item)" class="duplicate" title="duplicate">
@@ -53,9 +53,6 @@ export default {
     Move,
     MoveSpaceModal,
   },
-  mounted() {
-    console.log('rows coming in: ', this.rows);
-  },
   data() {
     return {
       showMoveSelectedSpaceModal: false,
diff --git a/src/components/Modals/MoveSpaceModal.vue b/src/components/Modals/MoveSpaceModal.vue
index 45b38c79..22a589fd 100644
--- a/src/components/Modals/MoveSpaceModal.vue
+++ b/src/components/Modals/MoveSpaceModal.vue
@@ -16,10 +16,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
         <i>Adjust from the upperleft X/Y</i>
         <div>
           <label>X: </label>
-          <input type="number" v-model="x_offset" />
+          <input type="number" id="move-space-x" v-model="x_offset" />
           <label>Y: </label>
-          <input type="number" v-model="y_offset" />
-          <button @click="save">Save</button>
+          <input type="number" id="move-space-y" v-model="y_offset" />
+          <button id="save-move-space" @click="save">Save</button>
         </div>
       </div>
     </ModalBase>
diff --git a/test/e2e/specs/geometry.js b/test/e2e/specs/geometry.js
index 0f0f9b17..bb7a0547 100644
--- a/test/e2e/specs/geometry.js
+++ b/test/e2e/specs/geometry.js
@@ -92,4 +92,19 @@ module.exports = {
       .assert.containsText('.polygons', 'Space 2 - 2');
     finish(browser);
   },
+  'able to move a selected space (issue #376)': (browser) => {
+    start(browser)
+      .perform(draw50By50Square)
+      .click('.move-selected-space')
+      .clearValue('#move-space-x')
+      .setValue('#move-space-x', -100)
+      .clearValue('#move-space-y')
+      .setValue('#move-space-y', -160)
+      .click('#save-move-space')
+      .execute('return window.application.$store.state.geometry[0].vertices', [], ({ value }) => {
+        browser.assert.equal(value[0].x, -100);
+        browser.assert.equal(value[0].y, -160);
+      });
+    finish(browser);
+  },
 };

From 93204c64d22e2186c4be4438453f94629ff25269 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@devetry.com>
Date: Wed, 25 Aug 2021 12:34:27 -0600
Subject: [PATCH 11/11] Clean up

---
 .../geometry/actions/createFaceFromPoints.js   |  3 +--
 src/store/modules/geometry/mutations.js        | 18 ------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/store/modules/geometry/actions/createFaceFromPoints.js b/src/store/modules/geometry/actions/createFaceFromPoints.js
index c718849e..1b7de513 100644
--- a/src/store/modules/geometry/actions/createFaceFromPoints.js
+++ b/src/store/modules/geometry/actions/createFaceFromPoints.js
@@ -12,7 +12,6 @@ export default function createFaceFromPoints(context, payload) {
   const {
     model_id,
     points,
-    onAlreadyExists = 'union',
   } = payload;
 
   if (uniq(points).length < 3) { return; }
@@ -24,7 +23,7 @@ export default function createFaceFromPoints(context, payload) {
   const existingFace = target.face_id ? geometryHelpers.faceForId(target.face_id, currentStoryGeometry) : null;
   let facePoints;
 
-  if (existingFace && onAlreadyExists === 'union') {
+  if (existingFace) {
     const existingFaceVertices = geometryHelpers.verticesForFaceId(existingFace.id, currentStoryGeometry);
     facePoints = geometryHelpers.setOperation('union', existingFaceVertices, points);
     if (facePoints.error) {
diff --git a/src/store/modules/geometry/mutations.js b/src/store/modules/geometry/mutations.js
index 4fe847a5..57954a32 100644
--- a/src/store/modules/geometry/mutations.js
+++ b/src/store/modules/geometry/mutations.js
@@ -163,21 +163,3 @@ export function updateClonedGeometry(state, payload) {
   newGeometry.faces = payload.newGeom.faces;
   newGeometry.vertices = payload.newGeom.vertices;
 }
-
-// export function updateFacePoints(state, payload) {
-//   console.log('mutation payload: ', payload);
-//   // determine diff of movement
-//   const xOffset = parseInt(payload.updateXTo, 10) - payload.face.edges[0].v1.x;
-//   console.log('detected an xoffset of :', xOffset);
-//   const yOffset = parseInt(payload.updateYTo, 10) - payload.face.edges[0].v1.y;
-//   console.log('detected an yoffset of :', yOffset);
-
-//   for (const edge of Object.values(payload.face.edges)) {
-//     console.log('adjusting vertex v1', edge.v1.id);
-//     edge.v1.x += xOffset;
-//     edge.v1.y += yOffset;
-//     console.log('adjusting vertex v2', edge.v2.id);
-//     edge.v2.x += xOffset;
-//     edge.v2.y += yOffset;
-//   }
-// }