Fix landscape composite moon rendering alignment

Author: c0d3rb4b4

apps/mobile/src/utils/photographyGuide.ts

@@ -473,6 +473,7 @@ export function buildLandscapeCompositeLayout(
     frameWidth,
     frameHeight,
   );
+  const travelVector = normalizeTravelVector(input.travelVector);
   const rawHorizonY = anchorY + (maxSunAltitudeDeg / LANDSCAPE_VERTICAL_FOV_DEG_24MM) * frameHeight;
   const horizonY = clampRange(rawHorizonY, 0, frameHeight);
 
@@ -497,8 +498,6 @@ export function buildLandscapeCompositeLayout(
     const rawY = anchorY - (altitudeDeltaDeg / LANDSCAPE_VERTICAL_FOV_DEG_24MM) * frameHeight;
     const clampedX = clampRange(rawX, minX, maxX);
     const clampedY = clampRange(rawY, minY, maxY);
-    const clampedDeltaX = clampedX - rawX;
-    const clampedDeltaY = clampedY - rawY;
     const clamped = Math.abs(clampedX - rawX) > 0.01 || Math.abs(clampedY - rawY) > 0.01;
 
     let moon:
@@ -509,30 +508,23 @@ export function buildLandscapeCompositeLayout(
         }
       | undefined;
     if (row.showMoon) {
-      const moonRadius = bodyAngularRadiusDegToPixels(
-        sample.moon.angularRadiusDeg,
-        frameWidth,
-        frameHeight,
-      );
-      const moonAzimuthDeltaDeg = normalizeSignedDeltaDeg(maxSunAzimuthDeg, sample.moon.azimuthDeg);
-      const moonAltitudeDeltaDeg = sample.moon.altitudeDeg - maxSunAltitudeDeg;
-      const moonX =
-        anchorX +
-        (moonAzimuthDeltaDeg / LANDSCAPE_HORIZONTAL_FOV_DEG_24MM) * frameWidth +
-        clampedDeltaX;
-      const moonY =
-        anchorY -
-        (moonAltitudeDeltaDeg / LANDSCAPE_VERTICAL_FOV_DEG_24MM) * frameHeight +
-        clampedDeltaY;
-      const centerDistance = Math.hypot(moonX - clampedX, moonY - clampedY);
-      const isOccluding = centerDistance <= sunRadius + moonRadius + 0.25;
-      if (isOccluding) {
-        moon = {
-          x: moonX,
-          y: moonY,
-          radius: moonRadius,
-        };
-      }
+      const moonGeometryStageSize = Math.max(64, sunRadius * LANDSCAPE_MOON_GEOMETRY_STAGE_FACTOR);
+      const moonGeometry = calculatePreviewMoonGeometry({
+        progress: row.progress,
+        kindAtLocation: input.kindAtLocation,
+        magnitude: input.magnitude,
+        contacts: input.schedule.contacts,
+        stageSize: moonGeometryStageSize,
+        sunRadius,
+        travelVector,
+      });
+      const moonOffsetX = moonGeometry.moonCenterX - moonGeometryStageSize / 2;
+      const moonOffsetY = moonGeometry.moonCenterY - moonGeometryStageSize / 2;
+      moon = {
+        x: clampedX + moonOffsetX,
+        y: clampedY + moonOffsetY,
+        radius: moonGeometry.moonRadius,
+      };
     }
 
     return {

apps/mobile/tests/photography-guide.test.ts

@@ -257,6 +257,14 @@ describe("photography guide schedule", () => {
       expect(placement.sunRadius).toBeLessThan(4);
       expect(placement.sunRadius).toBeGreaterThan(1);
       expect(placement.y + placement.sunRadius).toBeLessThanOrEqual(layout.horizonY);
+      expect(placement.showMoon).toBe(true);
+      expect(placement.moon).toBeDefined();
+      if (!placement.moon) continue;
+      const centerDistance = Math.hypot(
+        placement.moon.x - placement.x,
+        placement.moon.y - placement.y,
+      );
+      expect(centerDistance).toBeLessThan(placement.sunRadius * 2.5);
     }
   });
 });