Merge branch 'master' of https://github.com/djmango/starfinder

src/fov.rs

@@ -15,7 +15,7 @@ pub fn get_fov(
         ra: 180.0_f64.to_radians(),
         dec: 0.0_f64.to_radians(),
     };
-    let fov_size = fov_w.max(fov_h)/ (4.0 * PI);
+    let fov_size = fov_w.max(fov_h);
     let ra_dif = center.ra - view_init_center.ra;
     let dec_dif = center.dec - view_init_center.dec;
     // Calculate FOV bounds in cartesian coords
@@ -107,7 +107,7 @@ pub fn get_fov(
             z: transformed[(2, 0)],
         }
         .to_equatorial()
-        .to_grid(fov_size);
+        .to_grid(fov_size/(4.0*PI));
         let next_coord = EquatorialCoords {
             ra: grid_coord.ra + 1.0,
             dec: grid_coord.dec,

src/types/coords.rs

@@ -1,3 +1,4 @@
+
 use serde::{Deserialize, Serialize};
 use std::f64::consts::PI;
 use std::hash::{Hash, Hasher};
@@ -20,14 +21,14 @@ impl CartesianCoords {
         let ra: f64;
 
         if self.y < 0.0 {
-            ra = (2.0 * PI) - self.x.acos();
+            ra = (2.0 * PI) - self.x.clamp(-1.0, 1.0).acos();
         } else {
-            ra = self.x.acos();
+            ra = self.x.clamp(-1.0, 1.0).acos();
         }
 
         EquatorialCoords {
             ra,
-            dec: self.z.asin(),
+            dec: self.z.clamp(-1.0, 1.0).asin(),
         }
     }
 }
@@ -67,9 +68,10 @@ impl EquatorialCoords {
     }
 
     pub fn to_grid(&self, fov_size: f64) -> EquatorialCoords {
+        let clamped_size = fov_size.clamp(0.02, 1.0);
         EquatorialCoords {
-            ra: (self.ra / (2.0 * PI) * (1.0 - (2.0 * self.dec.abs() / PI)).powf(0.5) / fov_size).round(),
-            dec: (self.dec / 2.0 / fov_size).round(),
+            ra: (self.ra / (2.0 * PI) * (1.0 - (2.0 * self.dec.abs() / PI)).powf(0.5) / clamped_size).round(),
+            dec: (self.dec / (2.0 * PI) / clamped_size).round(),
         }
     }
 }
@@ -88,5 +90,4 @@ impl Hash for EquatorialCoords {
         (self.ra as i32).hash(state);
         (self.dec as i32).hash(state);
     }
-}
-
+}