Switch from String to Int for altitude, #249.

GlideAngle · Mar 16, 2019 · e3356cb · e3356cb
1 parent 679a30b
commit e3356cb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/igc/library/Flight/Igc/Parse.hs b/igc/library/Flight/Igc/Parse.hs
@@ -77,7 +77,7 @@ lng = do
 -- -1m
 altBaro :: ParsecT Void String Identity AltBaro
 altBaro =
-    AltBaro . Altitude
+    AltBaro . Altitude . read
     <$>
         ( count 5 digitChar
         <|> (char '-' >> (("-" ++) <$> count 4 digitChar))
@@ -97,7 +97,7 @@ altBaro =
 -- -1m
 altGps :: ParsecT Void String Identity AltGps
 altGps =
-    AltGps . Altitude
+    AltGps . Altitude . read
     <$>
         ( count 5 digitChar
         <|> (char '-' >> (("-" ++) <$> count 4 digitChar))

diff --git a/igc/library/Flight/Igc/Record.hs b/igc/library/Flight/Igc/Record.hs
@@ -27,8 +27,8 @@ import Text.Printf (printf)
 import Data.List (partition)
 import Test.Tasty.QuickCheck (Arbitrary(..), frequency, oneof)
 
--- | An altitude in metres
-newtype Altitude = Altitude String
+-- | An altitude in metres.
+newtype Altitude = Altitude Int
     deriving (Eq, Ord)
 
 -- | An hour of time.
@@ -273,16 +273,6 @@ showLng (LngW d m) =
 showLng (LngE d m) =
     showDegreeOfLng d ++ " " ++ showMinute m ++ " E"
 
-ltrimZero :: String -> String
-ltrimZero ('-' : s) =
-    case '-' : ltrimZero s of
-        "-0" -> "0"
-        s' -> s'
-ltrimZero s =
-    case dropWhile ('0' ==) s of
-        "" -> "0"
-        s' -> s'
-
 instance Show HMS where
     show = showHMS
 
@@ -293,10 +283,10 @@ instance Show Lng where
     show = showLng
 
 instance Show AltBaro where
-    show (AltBaro (Altitude x)) = ltrimZero x ++ "m"
+    show (AltBaro (Altitude x)) = show x ++ "m"
 
 instance Show AltGps where
-    show (AltGps (Altitude x)) = ltrimZero x ++ "m"
+    show (AltGps (Altitude x)) = show x ++ "m"
 
 showIgc :: [ IgcRecord ] -> String
 showIgc xs =

diff --git a/track/library/Flight/TrackLog.hs b/track/library/Flight/TrackLog.hs
@@ -240,7 +240,7 @@ readLng (LngE d m) = K.Longitude $ readDegMin d m
 readLng (LngW d m) = K.Longitude . negate $ readDegMin d m
 
 readAltBaro :: AltBaro -> K.Altitude
-readAltBaro (AltBaro (Altitude alt)) = K.Altitude (read alt :: Integer)
+readAltBaro (AltBaro (Altitude alt)) = K.Altitude $ fromIntegral alt
 
 readAltGps :: AltGps -> K.Altitude
-readAltGps (AltGps (Altitude alt)) = K.Altitude (read alt :: Integer)
+readAltGps (AltGps (Altitude alt)) = K.Altitude $ fromIntegral alt