Fix map icon to rocketship, remove ISS icon, adjust map angle calcula…

…tion for spaceship icon
pauljones0 · Sep 13, 2024 · 392fc35 · 392fc35
1 parent 9a259ea
commit 392fc35
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/assets/images/iss-icon.png b/assets/images/iss-icon.png
diff --git a/scripts/index-page.js b/scripts/index-page.js
@@ -1,5 +1,5 @@
 import { ISSApi } from "./iss-api.js";
-import { calculateAngle } from "./utilities.js";
+import { calculateAngle, adjustAngleForIcon } from "./utilities.js";
 
 let map;
 let marker;
@@ -19,7 +19,7 @@ const issPosititoData = async (isInitialCall = false) => {
         }
 
         const issIcon = L.icon({
-            iconUrl: './assets/images/iss-icon.png',
+            iconUrl: 'assets/icons/favicon.ico',
             iconSize: [32, 32],
             iconAnchor: [16, 16],
         });
@@ -31,11 +31,13 @@ const issPosititoData = async (isInitialCall = false) => {
 
         if (!marker && prevPosition) {
             const angle = calculateAngle(prevPosition, newLatLng);
-            marker = L.marker(newLatLng, {icon: issIcon, rotationAngle: angle, rotationOrigin: 'center center'}).addTo(map);
+            const adjustedAngle = adjustAngleForIcon(angle);
+            marker = L.marker(newLatLng, {icon: issIcon, rotationAngle: adjustedAngle, rotationOrigin: 'center center'}).addTo(map);
         } else if (marker && prevPosition) {
             const angle = calculateAngle(prevPosition, newLatLng);
+            const adjustedAngle = adjustAngleForIcon(angle);
             marker.setLatLng(newLatLng);
-            marker.setRotationAngle(angle);
+            marker.setRotationAngle(adjustedAngle);
         }
 
         map.setView(newLatLng, 3);

diff --git a/scripts/utilities.js b/scripts/utilities.js
@@ -8,3 +8,9 @@ export function calculateAngle(prev, next) {
 
     return (angle + 360) % 360;
 }
+
+export function adjustAngleForIcon(angle) {
+    // Subtract 45 degrees to compensate for the icon's initial rotation
+    // Then normalize to ensure the angle is between 0 and 360
+    return (angle - 45 + 360) % 360;
+}