deploy

DigitalArsenal · Jan 12, 2024 · 81272e1 · 81272e1
1 parent 072ce1b
commit 81272e1
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 20 deletions.
diff --git a/docs/assets/app-5f7f57f8.js → docs/assets/app-a476d12d.js b/docs/assets/app-5f7f57f8.js → docs/assets/app-a476d12d.js
diff --git a/docs/index.html b/docs/index.html
@@ -10,7 +10,7 @@
     <meta name="HandheldFriendly" content="true" />
 
     <title>SDA TAP LAB</title>
-    <script type="module" crossorigin src="/assets/app-5f7f57f8.js"></script>
+    <script type="module" crossorigin src="/assets/app-a476d12d.js"></script>
     <link rel="stylesheet" href="/assets/index-42a1951f.css">
   </head>
   <body>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "spaceaware.io",
     "private": true,
-    "version": "0.0.0+1705015887253",
+    "version": "0.0.0+1705018948270",
     "type": "module",
     "scripts": {
         "postinstall": "npm run copy:orbpro",

diff --git a/src/lib/Camera/Modal.svelte b/src/lib/Camera/Modal.svelte
@@ -1,5 +1,12 @@
 <script lang="ts">
-  import { Cartesian3, Math as CesiumMath, DataSource, Entity } from "orbpro";
+  import {
+    Cartesian3,
+    Math as CesiumMath,
+    DataSource,
+    Entity,
+    Analysis,
+    Clock,
+  } from "orbpro";
   import { messages } from "@/stores/events.store";
   import { content, lastcontent } from "@/stores/modal.store";
   import { scenario } from "@/stores/settings.store";
@@ -13,11 +20,13 @@
   let _cameraPosition: Cartesian3 | undefined;
   let _cameraPositionECEF: string[] = [];
   let _cameraPositionLLA: string[] = [];
-  let searchFrom = "";
+  let searchFrom = viewer.selectedEntity?.id || "";
   let searchTo = "";
   let activeSearchBox = "from"; // 'from' or 'to'
   let matchingEntities: Entity[] = [];
-  const selectedFromEntity = writable<Entity | null>(null);
+  const selectedFromEntity = writable<Entity | null>(
+    viewer.selectedEntity || null
+  );
   const selectedToEntity = writable<Entity | null>(null);
 
   function searchEntities(searchTerm: string): Entity[] {
@@ -92,12 +101,21 @@
     viewer.camera.unTrack();
   }
 
+  let azElRange: any = {};
+
   onMount(() => {
     _shouldAnimate = (globalThis as any).viewer!.clock.shouldAnimate;
     scenario.settings.ClockSettings.shouldAnimate.set(false);
     positionListener = (
       globalThis as any
-    ).viewer?.clock.onTick.addEventListener(() => {
+    ).viewer?.clock.onTick.addEventListener((clock: Clock) => {
+      const { currentTime } = clock;
+      if ($selectedFromEntity?.position && $selectedToEntity?.position) {
+        azElRange = Analysis.getAzElRange(
+          $selectedFromEntity.position.getValue(currentTime) as Cartesian3,
+          $selectedToEntity.position.getValue(currentTime) as Cartesian3
+        );
+      }
       _cameraPosition = (globalThis as any).viewer?.camera.positionWC;
       if (_cameraPosition) {
         const ellipsoid = (globalThis as any).viewer!.scene.globe.ellipsoid;
@@ -129,6 +147,7 @@
     $content = $lastcontent || undefined;
     $lastcontent = undefined;
     scenario.settings.ClockSettings.shouldAnimate.set(_shouldAnimate);
+    clearAllTracking();
   };
 </script>
 
@@ -170,21 +189,29 @@
           {/if}
           {#if $selectedToEntity && $selectedFromEntity}
             <div
-              class="bg-red-500 p-1 pl-2 pr-2 rounded flex items-center justify-center">
+              on:click={clearAllTracking}
+              class="bg-red-500 cursor-pointer p-1 pl-2 pr-2 rounded flex items-center justify-center">
               Clear
             </div>
           {/if}
         </div>
         <div
           class="flex flex-col gap-1 w-full border overflow-scroll p-2 cursor-pointer">
-
-          {#each matchingEntities as entity}
-            <div
-              class="border rounded p-2 flex items-center justify-center text-xs"
-              on:click={() => selectEntity(entity)}>
-              {entity.name}
+          {#if !$selectedToEntity || !$selectedFromEntity}
+            {#each matchingEntities as entity}
+              <div
+                class="border rounded p-2 flex items-center justify-center text-xs"
+                on:click={() => selectEntity(entity)}>
+                {entity.name}
+              </div>
+            {/each}
+          {:else if azElRange?.az && azElRange?.el && azElRange?.range}
+            <div>
+              <div>AZ: {azElRange.az.toFixed(2)}</div>
+              <div>EL: {azElRange.el.toFixed(2)}</div>
+              <div>RANGE: {(azElRange.range / 1000).toFixed(2)} km</div>
             </div>
-          {/each}
+          {/if}
         </div>
       </div>
       <div

diff --git a/src/stores/entity.store.ts b/src/stores/entity.store.ts
@@ -26,7 +26,7 @@ activeEntity.subscribe((aEntity: Entity | null) => {
         if (aEntity instanceof SpaceEntity) {
             (globalThis as any).viewer.scene.screenSpaceCameraController.minimumZoomDistance = 100.0;
             template.set(SpaceObjectTemplate);
-            scenario.settings.referenceFrame.set(1);
+            //scenario.settings.referenceFrame.set(1);
         } else if (aEntity.properties?.SIT) {
             (globalThis as any).viewer.scene.screenSpaceCameraController.minimumZoomDistance = 10.0;
             template.set(SITTemplate);
@@ -35,7 +35,6 @@ activeEntity.subscribe((aEntity: Entity | null) => {
             (globalThis as any).viewer.scene.screenSpaceCameraController.minimumZoomDistance = 0.0;
             title.set(undefined);
             template.set(undefined);
-            console.log(aEntity);
         }
     } else {
         content.set(undefined);

diff --git a/src/stores/utilities/process.sit.ts b/src/stores/utilities/process.sit.ts
@@ -24,7 +24,7 @@ export const processSIT = async (viewer: Viewer, data: ExtendedSITCOLLECTIONT) =
             const siteColor = siteTypeColors[record.SITE_TYPE?.toString()] || Color.WHITE;
 
             try {
-                position = Cartesian3.fromDegrees(record.LONGITUDE, record.LATITUDE);
+                position = Cartesian3.fromDegrees(record.LONGITUDE, record.LATITUDE, 10);
             } catch (e) {
                 console.log(JSON.stringify(record, null, 4));
                 //reject(e);