## 4.5.1.5

* Bug Fixes * display the angle correctly when showing doghouses.
deptofdefense · Jul 1, 2022 · fe76169 · fe76169
1 parent 7eae109
commit fe76169
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 20 deletions.
diff --git a/VERSION.md b/VERSION.md
@@ -1,5 +1,11 @@
 # Version History
 
+## 4.5.1.5
+
+* Bug Fixes
+  * display the angle correctly when showing doghouses.
+
+
 ## 4.5.1.4
 
 * Bug Fixes

diff --git a/atak/ATAK/app/build.gradle b/atak/ATAK/app/build.gradle
@@ -26,7 +26,7 @@ buildscript {
     apply from: '../../gradle/versions.gradle', to: project
 
     ext.ATAK_VERSION = "4.5.1"
-    ext.ATAK_VERSION_SUBMINOR = ".4"
+    ext.ATAK_VERSION_SUBMINOR = ".5"
 
     ext.isDevKitEnabled = { ->
         return getProperty('takRepoMavenUrl', null) != null &&

diff --git a/atak/ATAK/app/src/main/java/com/atakmap/android/maps/Doghouse.java b/atak/ATAK/app/src/main/java/com/atakmap/android/maps/Doghouse.java
@@ -505,22 +505,22 @@ private void updateTurnpointId() {
     }
 
     /**
-     * converts the bearing from 1 route point to the next by users current north reference preference
+     * Calculates the bearing from 1 route point to the next and sets it on the doghouse, displaying
+     * it using the user's current north reference preference.
      */
     private void setBearingToNext() {
         _bearingToNext = _source.get().bearingTo(_target.get());
-        double bearingMag;
+        double bearing;
         if (_northReference == NorthReference.MAGNETIC) {
-            bearingMag = ATAKUtilities.convertFromTrueToMagnetic(_source.get(),
+            bearing = ATAKUtilities.convertFromTrueToMagnetic(_source.get(),
                     _bearingToNext);
         } else if (_northReference == NorthReference.TRUE) {
-            bearingMag = ATAKUtilities.convertFromMagneticToTrue(_source.get(),
-                    _bearingToNext);
+            bearing = _bearingToNext;
         } else {
-            bearingMag = ATAKUtilities.computeGridConvergence(_source.get(),
+            bearing = ATAKUtilities.computeGridConvergence(_source.get(),
                     _target.get());
         }
-        String bearingRepr = formatBearingString(bearingMag);
+        String bearingRepr = formatBearingString(bearing);
         setMetaString(
                 DoghouseFields.BEARING_TO_NEXT.toString(), bearingRepr);
 

diff --git a/depends/LASzip-3.4.3-mod.tar.gz b/depends/LASzip-3.4.3-mod.tar.gz
diff --git a/depends/assimp-4.0.1-mod.tar.gz b/depends/assimp-4.0.1-mod.tar.gz
diff --git a/depends/gdal-2.4.4-mod.tar.gz b/depends/gdal-2.4.4-mod.tar.gz
diff --git a/depends/libLAS-1.8.2-mod.tar.gz b/depends/libLAS-1.8.2-mod.tar.gz
diff --git a/depends/tinygltf-2.4.1-mod.tar.gz b/depends/tinygltf-2.4.1-mod.tar.gz
diff --git a/depends/tinygltfloader-0.9.5-mod.tar.gz b/depends/tinygltfloader-0.9.5-mod.tar.gz
diff --git a/pluginsdk.zip b/pluginsdk.zip