Consolidate Diff fn

dfpc-coe · Aug 8, 2024 · 1722e5b · 1722e5b
1 parent 0807ae8
commit 1722e5b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/api/web/src/components/CloudTAK/Map.vue b/api/web/src/components/CloudTAK/Map.vue
@@ -837,33 +837,6 @@ export default {
             try {
                 const diff = cotStore.diff();
 
-                for (const cot of cotStore.pending.values()) {
-                    const render = cot.as_rendered();
-
-                    if (cotStore.cots.has(cot.id)) {
-                        diff.update.push({
-                            id: render.id,
-                            addOrUpdateProperties: Object.keys(render.properties).map((key) => {
-                                return { key, value: render.properties[key] }
-                            }),
-                            newGeometry: render.geometry
-                        })
-                    } else {
-                        diff.add.push(render);
-                    }
-
-                    cotStore.cots.set(cot.id, cot);
-                }
-
-                cotStore.pending.clear();
-
-                for (const id of cotStore.pendingDelete) {
-                    diff.remove.push(id);
-                    cotStore.cots.delete(id);
-                }
-
-                cotStore.pendingDelete.clear();
-
                 if (diff.add.length || diff.remove.length || diff.update.length) {
                     mapStore.map.getSource('-1').updateData(diff);
                 }

diff --git a/api/web/src/stores/cots.ts b/api/web/src/stores/cots.ts
@@ -167,6 +167,33 @@ export const useCOTStore = defineStore('cots', {
                 }
             }
 
+            for (const cot of this.pending.values()) {
+                const render = cot.as_rendered();
+
+                if (this.cots.has(cot.id)) {
+                    diff.update.push({
+                        id: render.id,
+                        addOrUpdateProperties: Object.keys(render.properties).map((key) => {
+                            return { key, value: render.properties[key] }
+                        }),
+                        newGeometry: render.geometry
+                    })
+                } else {
+                    diff.add.push(render);
+                }
+
+                this.cots.set(cot.id, cot);
+            }
+
+            this.pending.clear();
+
+            for (const id of this.pendingDelete) {
+                diff.remove.push(id);
+                this.cots.delete(id);
+            }
+
+            this.pendingDelete.clear();
+
             return diff;
         },