deploy

DigitalArsenal · Aug 4, 2024 · f48b1e2 · f48b1e2
1 parent 0a74ab1
commit f48b1e2
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 79 deletions.
diff --git a/docs/assets/app-1ba6ace9.js → docs/assets/app-7f879cc8.js b/docs/assets/app-1ba6ace9.js → docs/assets/app-7f879cc8.js
diff --git a/docs/assets/index-7172a59a.css b/docs/assets/index-7172a59a.css
diff --git a/docs/assets/index-7bb9a9e2.css b/docs/assets/index-7bb9a9e2.css
diff --git a/docs/index.html b/docs/index.html
@@ -10,8 +10,8 @@
     <meta name="HandheldFriendly" content="true" />
 
     <title>SDA TAP LAB</title>
-    <script type="module" crossorigin src="./assets/app-1ba6ace9.js"></script>
-    <link rel="stylesheet" href="./assets/index-7172a59a.css">
+    <script type="module" crossorigin src="./assets/app-7f879cc8.js"></script>
+    <link rel="stylesheet" href="./assets/index-7bb9a9e2.css">
   </head>
   <body>
     <div id="app" class="flex flex-col fixed top-0 z-0 w-full h-full"></div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sda-tap-lab",
-    "version": "0.8.4+1722790341957",
+    "version": "0.8.4+1722803191402",
     "type": "module",
     "scripts": {
         "deploy": "npm run build && git add -A && git commit -m 'deploy' && git push",
@@ -47,7 +47,7 @@
         "flowbite-svelte": "^0.44.20",
         "jquery": "^3.7.1",
         "lz-string": "^1.5.0",
-        "orbpro": "^1.120.2",
+        "orbpro": "^1.120.3",
         "pure-ipfs-only-hash": "^4.0.2",
         "svelte-awesome": "^3.2.1",
         "xxhashjs": "^0.2.2"

diff --git a/src/lib/SelectionWidget/SelectionWidget.svelte b/src/lib/SelectionWidget/SelectionWidget.svelte
@@ -31,8 +31,7 @@
 
   $: $forceHideWidget = !$trackedEntity;
 
-  const updateSegments = (percentComplete: any) => {
-    let total = segments.reduce((total, s) => total + s.size, 0);
+  const updateSegments = (percentComplete: number) => {
     let progress = 360 * (percentComplete / 100);
     segments[0].size = progress;
     segments[1].size = 360 - progress;
@@ -41,8 +40,8 @@
       const options = {
         innerRadius: 30,
         outerRadius: 40,
-        startAngle: acc,
-        endAngle: (acc += (angle * segment.size) / total),
+        startAngle: (acc * Math.PI) / 180,
+        endAngle: ((acc += segment.size) * Math.PI) / 180,
       };
       return {
         color: segment.color,
@@ -53,21 +52,21 @@
   };
 
   const fn = arc();
-  let angle = Math.PI * 2;
 
   updateSegments(90);
 
   let selectedTrackerEvent: any;
-  let ePosition: any = new Cartesian3();
+  let ePosition = new Cartesian3();
   let c2 = { x: 0, y: 0 };
-  let svgOpacity = 1; // Default opacity
+  let svgOpacity = 1;
 
   const revoke = () => {
     if (selectedTrackerEvent) {
       selectedTrackerEvent();
       viewer.clock.onTick.removeEventListener(selectedTrackerEvent);
       selectedTrackerEvent = null;
-    } else if (cameraDistanceChecker) {
+    }
+    if (cameraDistanceChecker) {
       cameraDistanceChecker();
       viewer.clock.onTick.removeEventListener(cameraDistanceChecker);
     }
@@ -80,26 +79,22 @@
 
     if (viewer && viewer.scene) {
       cameraDistanceChecker = viewer.clock.onTick.addEventListener(() => {
-        if ($selectedEntity && $selectedEntity?.position) {
+        if ($selectedEntity && $selectedEntity.position) {
           const cameraPosition = viewer.camera.positionWC;
           const entityPosition = $selectedEntity.position.getValue(
             viewer.clock.currentTime,
             ePosition
           );
-          const distance = Cartesian3.distance(cameraPosition, entityPosition!);
-          if (distance < 10000) {
-            svgOpacity = Math.max(0, distance / 10000);
-          } else {
-            svgOpacity = 1;
-          }
+          const distance = Cartesian3.distance(cameraPosition, entityPosition);
+          svgOpacity = distance < 10000 ? distance / 10000 : 1;
         }
       });
     }
 
     if (!sESubscription) {
       sESubscription = selectedEntity.subscribe((s: any) => {
         revoke();
-        if (!selectedTrackerEvent && s && viewer?.clock) {
+        if (!selectedTrackerEvent && s && viewer.clock) {
           selectedTrackerEvent = viewer.scene.postRender.addEventListener(
             () => {
               c2 = {
@@ -113,7 +108,7 @@
             }
           );
           segments[1].color = (statusColors[
-            ($selectedEntity as any)?.properties?.CAT?.getValue()?.OPS_STATUS_CODE
+            $selectedEntity?.properties?.CAT?.getValue()?.OPS_STATUS_CODE
           ] || [null, "#aaaaaa"])[1];
           updateSegments(0);
         }
@@ -131,8 +126,9 @@
     id="selected"
     class="fixed flex text-white pointer-events-none"
     style="width:{widgetSize.width}px; height:{widgetSize.width}px; top:{c2.y -
-      widgetSize.height / 10}px;left:{c2.x -
-      widgetSize.height / 10}px; opacity:{svgOpacity};">
+      widgetSize.height / 10}px; left:{c2.x -
+      widgetSize.height / 10}px; opacity:{svgOpacity};"
+  >
     <svg viewBox="0 0 100 100">
       <g transform="translate(50,50) scale(.25)">
         {#each arcs as arc}
@@ -144,7 +140,7 @@
 {/if}
 
 <style>
-  /* svg {
+  svg {
         shape-rendering: optimizeSpeed;
-    }*/
+    }
 </style>
diff --git a/src/stores/cesium.sync.ts b/src/stores/cesium.sync.ts
@@ -2,7 +2,7 @@
 import { writable, get } from "svelte/store";
 import { Viewer, Entity, DataSource } from "orbpro";
 import { scenario } from "@/stores/settings.store";
-import { debounce } from "@/utilities/debounce";
+import { debounce, throttle } from "@/utilities/debounce";
 
 const dataSourceEvents = {
   dataSourceAdded: writable<DataSource | null>(null),
@@ -15,31 +15,34 @@ let registeredStoreSubscriptions: any = {};
 let isUpdatingFromStore = false;
 
 const initEvents = (viewer: Viewer) => {
-  /**/
-    removeEvents();
+  removeEvents();
 
-    // Sync from Cesium to Svelte
-    for (let ev in scenario) {
-      console.log(ev, viewer[`${ev}Changed`])
-        if (viewer[`${ev}Changed`]) {
-            registeredEvents[`${ev}Changed`] = viewer[`${ev}Changed`].addEventListener(debounce((e: any) => {
-                if (!isUpdatingFromStore) {
-                    scenario[ev].set(e);
-                }
-            }, 50));
-        }
+  // Sync from Cesium to Svelte
+  for (let ev in scenario) {
+    if (viewer[`${ev}Changed`]) {
+      registeredEvents[`${ev}Changed`] = viewer[
+        `${ev}Changed`
+      ].addEventListener(
+        throttle((e: any) => {
+          if (!isUpdatingFromStore) {
+            scenario[ev].set(e);
+          }
+        }, 100)
+      );
     }
+  }
 
-    /*for (let ev in dataSourceEvents) {
-        console.log(ev);
-        if (viewer.dataSources[ev]) {
-            registeredEvents[ev] = viewer.dataSources[ev].addEventListener(debounce((e: any) => {
-                if (!isUpdatingFromStore) {
-                    dataSourceEvents[ev].set(e);
-                }
-            }, 300));
-        }
-    }*/
+  for (let ev in dataSourceEvents) {
+    if (viewer.dataSources[ev]) {
+      registeredEvents[ev] = viewer.dataSources[ev].addEventListener(
+        throttle((e: any) => {
+          if (!isUpdatingFromStore) {
+            dataSourceEvents[ev].set(e);
+          }
+        }, 300)
+      );
+    }
+  }
 
   // Sync from Svelte to Cesium
   for (let ev in scenario) {
@@ -61,9 +64,11 @@ const removeEvents = () => {
   for (let x in registeredEvents) {
     registeredEvents[x]();
   }
+  registeredEvents = {};
   for (let x in registeredStoreSubscriptions) {
     registeredStoreSubscriptions[x]();
   }
+  registeredStoreSubscriptions = {};
 };
 
-export { initEvents, removeEvents, dataSourceEvents };
+export { initEvents, removeEvents, dataSourceEvents };
diff --git a/src/utilities/debounce.ts b/src/utilities/debounce.ts
@@ -7,4 +7,24 @@ export function debounce(func: (...args: any[]) => void, wait: number) {
             func(...args);
         }, wait);
     };
-}
+}
+
+export function throttle<T extends (...args: any[]) => any>(func: T, limit: number): (...args: Parameters<T>) => void {
+    let lastFunc: ReturnType<typeof setTimeout>;
+    let lastRan: number | undefined;
+    return function(this: ThisParameterType<T>, ...args: Parameters<T>) {
+      const context = this;
+      if (!lastRan) {
+        func.apply(context, args);
+        lastRan = Date.now();
+      } else {
+        clearTimeout(lastFunc);
+        lastFunc = setTimeout(function() {
+          if ((Date.now() - lastRan!) >= limit) {
+            func.apply(context, args);
+            lastRan = Date.now();
+          }
+        }, limit - (Date.now() - lastRan));
+      }
+    };
+  }