Add Conversion from DDM to DD

.gitea/workflows/verify.yaml

@@ -35,3 +35,7 @@ jobs:
     - name: build project
       run: |
         /bin/alr -n build
+
+    - name: project verify
+      run: |
+        /bin/alr -n gnatprove

src/grl-coordinates.adb

@@ -5,17 +5,33 @@ package body Grl.Coordinates is
    begin
 
       case DM_Base.Form is
-         when Relative => null;
+         when Relative =>
-         when DD_Fine => null;
+            null;
-         when DD => DD_Target := DM_Base;
+         when DD_Fine =>
+            null;
+         when DD =>
+            DD_Target := DM_Base;
          when DDM =>
             if DM_Base.DDM.Cardinal_Lat = North then
                DD_Target.DD.Latitude :=
-                  DD_Meter_Scale_Lat (DM_Base.DDM.Degree_Lat)
+                 DD_Meter_Scale_Lat (DM_Base.DDM.Degree_Lat) +
-                  +
+                 DD_Meter_Scale_Lat (DM_Base.DDM.Minutes_Lat / 60.0);
+            else
+               DD_Target.DD.Latitude :=
+                 -1.0 * DD_Meter_Scale_Lat (DM_Base.DDM.Degree_Lat) +
                  DD_Meter_Scale_Lat (DM_Base.DDM.Minutes_Lat / 60.0);
             end if;
-         when DMS => null;
+            if DM_Base.DDM.Cardinal_Lon = East then
+               DD_Target.DD.Longitude :=
+                 DD_Meter_Scale_Lon (DM_Base.DDM.Degree_Lon) +
+                 DD_Meter_Scale_Lon (DM_Base.DDM.Minutes_Lon / 60.0);
+            else
+               DD_Target.DD.Longitude :=
+                 -1.00 * DD_Meter_Scale_Lon (DM_Base.DDM.Degree_Lon) +
+                 DD_Meter_Scale_Lon (DM_Base.DDM.Minutes_Lon / 60.0);
+            end if;
+         when DMS =>
+            null;
       end case;
 
       return DD_Target;

src/grl-coordinates.ads

@@ -1,5 +1,5 @@
-package Grl.Coordinates
+package Grl.Coordinates with
-with SPARK_Mode => On
+  SPARK_Mode => On
 is
 
    --  ------------  --
@@ -54,11 +54,10 @@ is
       Seconds_Lon  : DM_Seconds;
       Cardinal_Lat : Cardinal;
       Cardinal_Lon : Cardinal;
-	end record
+   end record with
-   with Dynamic_Predicate =>
+     Dynamic_Predicate =>
       Format_DMS.Cardinal_Lat in North | South
-      and then
+      and then Format_DMS.Cardinal_Lon in East | West;
-      Format_DMS.Cardinal_Lon in East | West;
 
    --  DDM
    type Format_DDM is record
@@ -68,11 +67,10 @@ is
       Minutes_Lon  : DDM_Minutes;
       Cardinal_Lat : Cardinal;
       Cardinal_Lon : Cardinal;
-	end record
+   end record with
-   with Dynamic_Predicate =>
+     Dynamic_Predicate =>
       Format_DDM.Cardinal_Lat in North | South
-      and then
+      and then Format_DDM.Cardinal_Lon in East | West;
-      Format_DDM.Cardinal_Lon in East | West;
 
      --  --------------------------  --
      --  Coordinate Type Definition  --
@@ -103,10 +101,9 @@ is
    --  @return    Coordinate
    --  @parameter DM_Base  :  Coordinate
    --  @description Take any coordinate and return a DD formatted coordinate.
-   function To_DD (DM_Base : Coordinate) return Coordinate
+   function To_DD (DM_Base : Coordinate) return Coordinate with
-      with Pre =>
+     Pre =>
-         (DM_Base.Form = DD) or else
+      (DM_Base.Form = DD) or else (DM_Base.Form = DMS)
-         (DM_Base.Form = DMS) or else
+      or else (DM_Base.Form = DDM);
-         (DM_Base.Form = DDM);
 
 end Grl.Coordinates;