Merge remote-tracking branch 'origin/main'

dashboard.py

@@ -594,10 +594,10 @@ def compute_gha1_ana(n1, beta11, lamb11, s, a_deg, ax, ay, b, method1):
     alpha_rad = wu.deg2rad(float(a_deg))
     s_val = float(s)
 
-    p1 = tuple(map(float, ell.ell2cart(beta_rad, lamb_rad)))
+    p1 = ell.ell2cart(beta_rad, lamb_rad)
-    x2, y2, z2 = gha1_ana(ell, p1, alpha_rad, s_val, 70)
+    p2_ana, alpha2 = gha1_ana(ell, p1, alpha_rad, s_val, 70)
-    p2 = (float(x2), float(y2), float(z2))
+    x2, y2, z2 = p2_ana
-    beta2, lamb2 = ell.cart2ell([x2, y2, z2])
+    beta2, lamb2 = ell.cart2ell(p2_ana)
 
     out = html.Div([
         html.Strong("Analytisch: "),
@@ -609,7 +609,7 @@ def compute_gha1_ana(n1, beta11, lamb11, s, a_deg, ax, ay, b, method1):
     ])
 
     store = {
-        "points": [("P1", p1, "black"), ("P2", p2, "red")],
+        "points": [("P1", p1, "black"), ("P2", p2_ana, "red")],
         "polyline": None,
         "color": "#d62728"
     }
@@ -641,16 +641,15 @@ def compute_gha1_num(n1, beta11, lamb11, s, a_deg, ax, ay, b, method1):
     alpha_rad = wu.deg2rad(float(a_deg))
     s_val = float(s)
 
-    p1 = tuple(map(float, ell.ell2cart(beta_rad, lamb_rad)))
+    p1 = ell.ell2cart(beta_rad, lamb_rad)
 
-    xN, yN, zN, werte = gha1_num(ell, p1, alpha_rad, s_val, 10000)
+    p2_num, alpha1, werte = gha1_num(ell, p1, alpha_rad, s_val, 10000, all_points=True)
-    p2 = (xN, yN, zN)
+    beta2_num, lamb2_num = ell.cart2ell(p2_num)
-    beta2_num, lamb2_num = ell.cart2ell(p2)
 
     out = html.Div([
         html.Strong("Numerisch: "),
         html.Br(),
-        html.Span(f"kartesisch: x₂={p2[0]:.4f} m, y₂={p2[1]:.4f} m, z₂={p2[2]:.4f} m"),
+        html.Span(f"kartesisch: x₂={p2_num[0]:.4f} m, y₂={p2_num[1]:.4f} m, z₂={p2_num[2]:.4f} m"),
         html.Br(),
         html.Span(f"ellipsoidisch: {aus.gms('β₂', beta2_num, 4)}, {aus.gms('λ₂', lamb2_num, 4)}"),
         html.Br(),
@@ -659,7 +658,7 @@ def compute_gha1_num(n1, beta11, lamb11, s, a_deg, ax, ay, b, method1):
     polyline = [[x1, y1, z1] for x1, _, y1, _, z1, _ in werte]
 
     store = {
-        "points": [("P1", p1, "black"), ("P2", p2, "#ff8c00")],
+        "points": [("P1", p1, "black"), ("P2", p2_num, "#ff8c00")],
         "polyline": polyline,
         "color": "#ff8c00"
     }