neo

p4ken · Jun 29, 2024 · 5c70d55 · 5c70d55
1 parent 8ead580
commit 5c70d55
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 11 deletions.
diff --git a/src/neo2.rs b/src/neo2.rs
@@ -111,6 +111,7 @@ impl<T: From<LatLon> + Into<LatLon>> Degrees for T {
 }
 
 #[allow(unused_variables)]
+#[cfg(feature = "default")]
 mod tests {
     use super::{jgd, Degrees, LatLon, Tokyo};
 

diff --git a/src/neo5.rs b/src/neo5.rs
@@ -2,7 +2,7 @@
 
 pub struct Tokyo;
 impl Tokyo {
-    pub fn new(lat: f64, lon: f64) -> Self {
+    pub fn new(lat_lon: LatLon) -> Self {
         Self
     }
     pub fn to_jgd2000(self) -> Jgd2000 {
@@ -25,11 +25,21 @@ impl Jgd2000 {
     }
 }
 pub struct Jgd2011;
-impl From<Jgd2011> for (f64, f64) {
-    fn from(crs: Jgd2011) -> Self {
-        crs.degrees()
+impl Jgd2011 {
+    fn lat_lon(&self) -> LatLon {
+        LatLon(0., 0.)
     }
 }
+// impl From<Jgd2011> for (f64, f64) {
+//     fn from(crs: Jgd2011) -> Self {
+//         crs.degrees()
+//     }
+// }
+// impl AsRef<LatLon> for Jgd2011 {
+//     fn as_ref(&self) -> &LatLon {
+//         &LatLon(0., 0.)
+//     }
+// }
 impl Degrees for Jgd2011 {
     fn with_degrees(lat: f64, lon: f64) -> Self {
         Self
@@ -50,13 +60,36 @@ pub trait Degrees: Sized {
         self.degrees()
     }
 }
-pub struct LatLon;
+pub struct LatLon(f64, f64);
+// impl Degrees for LatLon {
+//     fn with_degrees(lat: f64, lon: f64) -> Self {
+//         todo!()
+//     }
+//     fn degrees(self) -> (f64, f64) {
+//         todo!()
+//     }
+// }
 
+#[cfg(test)]
 pub fn usage() {
-    let (lat, lon) = Tokyo::new(1., 2.).to_jgd2000().to_jgd2011().into();
+    use geo::Point;
+
+    // let (lat, lon) = Tokyo::new(LatLon(1., 2.))
+    //     .to_jgd2000()
+    //     .to_jgd2011()
+    //     .lat_lon()
+    //     .secs();
     let (lat, lon) = Tokyo::with_degrees(1., 2.)
         .to_jgd2000()
         .to_jgd2011()
         .degrees();
+
     let (lat, lon) = Tokyo::with_secs(1., 2.).to_jgd2000().to_jgd2011().secs();
+
+    let mut p = Point::new(1., 2.);
+    let (lat, lon) = Tokyo::with_degrees(p.y(), p.x())
+        .to_jgd2000()
+        .to_jgd2011()
+        .degrees();
+    p = Point::new(lon, lat);
 }
diff --git a/src/neo6.rs b/src/neo6.rs
@@ -7,7 +7,7 @@ impl Tokyo {
     }
 }
 impl Degrees for Tokyo {
-    fn with_degrees(degrees: LatLon) -> Self {
+    fn with_degrees(degrees: impl Into<LatLon>) -> Self {
         Self
     }
     fn degrees(&self) -> LatLon {
@@ -23,7 +23,7 @@ impl Jgd2000 {
 }
 pub struct Jgd2011;
 impl Degrees for Jgd2011 {
-    fn with_degrees(degrees: LatLon) -> Self {
+    fn with_degrees(degrees: impl Into<LatLon>) -> Self {
         Self
     }
     fn degrees(&self) -> LatLon {
@@ -33,7 +33,8 @@ impl Degrees for Jgd2011 {
 
 // TODO sealed
 pub trait Degrees: Sized {
-    fn with_degrees(degrees: LatLon) -> Self;
+    // TODO: Into要らないかも
+    fn with_degrees(degrees: impl Into<LatLon>) -> Self;
     fn with_secs(secs: LatLon) -> Self {
         Self::with_degrees(secs)
     }
@@ -51,10 +52,10 @@ impl LatLon {
     pub fn into_rev<T: From<[f64; 2]>>(&self) -> T {
         [self.lon(), self.lat()].into()
     }
-    pub fn lon(&self) -> f64 {
+    pub fn lat(&self) -> f64 {
         self.0
     }
-    pub fn lat(&self) -> f64 {
+    pub fn lon(&self) -> f64 {
         self.1
     }
 }