From 79924acaf021a3c98657fd3db77bfb54e9334eed Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Sat, 24 May 2025 02:04:32 +0200
Subject: [PATCH] UX(nearby_features): place nearby panorama markers at nearly
 the right place

---
 src/Logic/GeoOperations.ts               |  7 ++++---
 src/UI/Image/photoSphereViewerWrapper.ts | 22 +++++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/Logic/GeoOperations.ts b/src/Logic/GeoOperations.ts
index d31481c637..8981ff4297 100644
--- a/src/Logic/GeoOperations.ts
+++ b/src/Logic/GeoOperations.ts
@@ -10,11 +10,12 @@ import {
     MultiPolygon,
     Point,
     Polygon,
-    Position,
+    Position
 } from "geojson"
 import { Tiles } from "../Models/TileRange"
 import { Utils } from "../Utils"
-;("use strict")
+
+("use strict")
 
 export class GeoOperations {
     private static readonly _earthRadius: number = 6378137
@@ -106,7 +107,7 @@ export class GeoOperations {
      * @param lonlat0
      * @param lonlat1
      */
-    static distanceBetween(lonlat0: [number, number], lonlat1: [number, number] | Position) {
+    static distanceBetween(lonlat0: [number, number] | Coord | Position, lonlat1: [number, number] | Position | Coord) {
         return turf.distance(lonlat0, lonlat1, { units: "meters" })
     }
 
diff --git a/src/UI/Image/photoSphereViewerWrapper.ts b/src/UI/Image/photoSphereViewerWrapper.ts
index a8b4f76616..d8068e9335 100644
--- a/src/UI/Image/photoSphereViewerWrapper.ts
+++ b/src/UI/Image/photoSphereViewerWrapper.ts
@@ -42,12 +42,26 @@ export class PhotoSphereViewerWrapper {
     public calculatePitch(feature: Feature): number {
         const coors = this.imageInfo.geometry.coordinates
         const distance = GeoOperations.distanceBetween(
-            <[number, number]>coors,
+            coors,
             GeoOperations.centerpointCoordinates(feature)
         )
 
         // In: -pi/2 up to pi/2
-        const alpha = Math.atan(distance / 4) // in radians
+        /*
+          .                           + Eye
+          .                       /   |
+          .                  /  PITCH |
+          .           /               | (Height = y = ~2m)
+          .      /                    |
+          ./ ALPHA                    |
+          +..... (x = distance) .... +
+         */
+        const height = 3
+        // We want to know PITCH = 90 - alpha.
+        //
+        // tan(alpha) = height / distance (we rescale so that distance -> 1)
+        // alpha = atan(height / distance)
+        const alpha = Math.atan(height / distance) // in radians
         const degrees = (alpha * 360) / (2 * Math.PI)
         return -degrees
     }
@@ -86,6 +100,7 @@ export class PhotoSphereViewerWrapper {
         const northOffs = imageInfo.properties.northOffset
         this.nearbyFeatures = nearbyFeatures
         this.clearHotspots()
+        const centralImageLocation = this.imageInfo.geometry.coordinates
         for (const f of nearbyFeatures ?? []) {
             if (f.properties.gotoPanorama?.properties?.url === this.imageInfo.properties.url) {
                 continue // This is the current panorama, no need to show it
@@ -97,12 +112,13 @@ export class PhotoSphereViewerWrapper {
             } else if (!isNaN(f.properties.pitch)) {
                 pitch = f.properties.pitch
             }
+            const distance = Math.round(GeoOperations.distanceBetween(centralImageLocation, GeoOperations.centerpointCoordinates(f)))
             this.viewer.addHotSpot(
                 {
                     type: f.properties.gotoPanorama !== undefined ? "scene" : "info",
                     yaw: (yaw - northOffs) % 360,
                     pitch,
-                    text: f.properties.name,
+                    text: f.properties.name + " (" + distance + "m)",
                     clickHandlerFunc: () => {
                         this.setPanorama(f.properties.gotoPanorama)
                     },