Merge pull request #1 from Karuzzzo/add_waypoints

Add waypoints

dsky-utils/src/lib.rs

@@ -1,6 +1,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use substrate_fixed::types::I10F22;
+use substrate_fixed::{types::{I10F22, I42F22}, traits::FromFixed};
+// Set of traits, required for Coord struct, used in maps pallet
 
 pub trait IntDiv<RHS = Self> {
     fn integer_division_u16(self, rhs: RHS) -> u16;
@@ -9,6 +10,7 @@ pub trait IntDiv<RHS = Self> {
 
 pub trait Signed { 
     fn abs(self) -> Self;
+    fn signum(self) -> Self;
 }
 
 pub trait FromRaw {
@@ -19,6 +21,22 @@ pub trait CastToType {
     fn to_u32_with_frac_part(self, cell_size: u32, max_digits_in_frac_part: u8) -> u32;
 }
 
+// TODO consider naming of two traits, as they are used in pair
+pub trait ToBigCoord {
+    type Output;
+    fn try_into(self) -> Self::Output;
+}
+
+pub trait FromBigCoord {
+    type Output;
+    fn try_from(self) -> Self::Output;
+}
+
+pub trait GetEpsilon {
+    fn get_epsilon() -> Self;
+}
+
+// Here comes the implementations 
 // Want to change Coord type => impl trait for it here
 impl IntDiv for I10F22 {
     fn integer_division_u16(self, rhs: I10F22) -> u16 {
@@ -40,6 +58,10 @@ impl Signed for I10F22 {
     fn abs(self) -> Self {
         self.abs()
     }
+    /// returns sign (-1, 1, 0)
+    fn signum(self) -> Self {
+        self.signum()
+    }
 }
 
 impl CastToType for I10F22 {
@@ -63,3 +85,24 @@ impl CastToType for I10F22 {
         integer_part + frac_part
     }
 }
+
+impl ToBigCoord for I10F22 {
+    type Output = I42F22;
+    fn try_into(self) -> Self::Output {
+        self.into()
+    }
+}
+
+// TODO handle possible errors through checked_from_fixed()
+impl FromBigCoord for I42F22 {
+    type Output = I10F22;
+    fn try_from(self) -> Self::Output {
+        I10F22::from_fixed(self)
+    }
+}
+
+impl GetEpsilon for I42F22 {
+    fn get_epsilon() -> I42F22 {
+        I42F22::from_num(0.00001f64)
+    }
+}

pallets/ds-maps/src/default_weight.rs

@@ -16,5 +16,7 @@ impl crate::WeightInfo for () {
     fn change_area_type() -> Weight {
         100_000_u64.saturating_add(DbWeight::get().writes(1))
     }   
-
+    fn route_add() -> Weight {
+        100_000_u64.saturating_add(DbWeight::get().writes(1))
+    }
 }