平面直角座標への変換の不具合を修正

[yubeshi/yubeshi.git] / Yubeshi / Degree.cs

diff --git a/Yubeshi/Degree.cs b/Yubeshi/Degree.cs
index f06a50b..4977bdd 100755 (executable)
--- a/Yubeshi/Degree.cs
+++ b/Yubeshi/Degree.cs
@@ -106,7 +106,7 @@ namespace Yubeshi
             return new Degree(rad * radToDeg);\r
         }\r
 \r
-        public static Degree FromGpsFormat(string angle)\r
+        public static Degree FromNmeaFormat(string angle)\r
         {\r
             return FromNmeaFormat(angle, null);\r
         }\r
@@ -124,14 +124,15 @@ namespace Yubeshi
 \r
         public override string ToString()\r
         {\r
+            double s = Math.Abs(degree * 3600) % 60.0;\r
             if (degree < 0)\r
             {\r
-                return String.Format("-{0}°{1}′{2}″",\r
-                                                -Deg, -Minute, -Second);\r
+                return String.Format("-{0}°{1}′{2:G6}″",\r
+                                                -Deg, -Minute, s);\r
             }\r
             else\r
             {\r
-                return String.Format("{0}°{1}′{2}″", Deg, Minute, Second);\r
+                return String.Format("{0}°{1}′{2:G6}″", Deg, Minute, s);\r
             }\r
         }\r
 \r
@@ -139,6 +140,7 @@ namespace Yubeshi
         {\r
             return degree.ToString(format);\r
         }\r
+\r
         #endregion\r
     }\r
 }\r