From 254d6b8ae15fd38605a43c872af42d359324c398 Mon Sep 17 00:00:00 2001 From: takdeveloper Date: Fri, 1 Jul 2022 15:55:39 +0000 Subject: [PATCH] ## 4.5.1.6 * Bug Fixes * display the angle correctly for Grid North when showing doghouses. --- VERSION.md | 5 +++++ atak/ATAK/app/build.gradle | 2 +- .../com/atakmap/android/maps/Doghouse.java | 3 ++- .../views/loadout/LoadoutManager.java | 8 +++++--- depends/LASzip-3.4.3-mod.tar.gz | 4 ++-- depends/assimp-4.0.1-mod.tar.gz | 4 ++-- depends/gdal-2.4.4-mod.tar.gz | 4 ++-- depends/libLAS-1.8.2-mod.tar.gz | 4 ++-- depends/tinygltf-2.4.1-mod.tar.gz | 4 ++-- depends/tinygltfloader-0.9.5-mod.tar.gz | 4 ++-- pluginsdk.zip | Bin 1938021 -> 1938021 bytes 11 files changed, 25 insertions(+), 17 deletions(-) diff --git a/VERSION.md b/VERSION.md index 55abdaa60..f5092374f 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1,5 +1,10 @@ # Version History +## 4.5.1.6 + +* Bug Fixes + * display the angle correctly for Grid North when showing doghouses. + ## 4.5.1.5 * Bug Fixes diff --git a/atak/ATAK/app/build.gradle b/atak/ATAK/app/build.gradle index 8616be8f1..99030ef26 100644 --- 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 = ".5" + ext.ATAK_VERSION_SUBMINOR = ".6" 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 index 67cbe9192..5dc49f201 100644 --- 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 @@ -517,8 +517,9 @@ private void setBearingToNext() { } else if (_northReference == NorthReference.TRUE) { bearing = _bearingToNext; } else { - bearing = ATAKUtilities.computeGridConvergence(_source.get(), + double gridConvergence = ATAKUtilities.computeGridConvergence(_source.get(), _target.get()); + bearing = AngleUtilities.wrapDeg(_bearingToNext - gridConvergence); } String bearingRepr = formatBearingString(bearing); setMetaString( diff --git a/atak/ATAK/app/src/main/java/com/atakmap/android/navigation/views/loadout/LoadoutManager.java b/atak/ATAK/app/src/main/java/com/atakmap/android/navigation/views/loadout/LoadoutManager.java index 8fec342d7..f9bde931a 100644 --- a/atak/ATAK/app/src/main/java/com/atakmap/android/navigation/views/loadout/LoadoutManager.java +++ b/atak/ATAK/app/src/main/java/com/atakmap/android/navigation/views/loadout/LoadoutManager.java @@ -254,12 +254,14 @@ public String serializeToXML(LoadoutItemModel loadout) { } @Override - public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { + public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) { if (key == null) return; - if (key.startsWith(LOADOUT_PREFIX)) { + if (key.equals(PREF_SELECTED_LOADOUT)) { + setCurrentLoadout(_prefs.get(key, DEFAULT_LOADOUT_UID)); + } else if (key.startsWith(LOADOUT_PREFIX)) { // Check if this change is in response to a local edit synchronized (_prefEditing) { @@ -293,7 +295,7 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { } } } - + /** * Persist or remove a loadout to/from preferences * @param loadout Loadout diff --git a/depends/LASzip-3.4.3-mod.tar.gz b/depends/LASzip-3.4.3-mod.tar.gz index ad8aaba85..21fee1a45 100644 --- a/depends/LASzip-3.4.3-mod.tar.gz +++ b/depends/LASzip-3.4.3-mod.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5734fcf2403b5d0ebd6aa22a5c0a73515d9e3bb05c5d8457743cba219d690a04 -size 241752 +oid sha256:e64d19744286f81de71e50fc63fb2ac7e18f6497cad6f21bdff261cff1feeda9 +size 241735 diff --git a/depends/assimp-4.0.1-mod.tar.gz b/depends/assimp-4.0.1-mod.tar.gz index e2b2d474e..9ea2520cb 100644 --- a/depends/assimp-4.0.1-mod.tar.gz +++ b/depends/assimp-4.0.1-mod.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d37eb603fb1d0e835fe6bbe13a35883efc823cf22b25a86ab113d8296159585 -size 45176926 +oid sha256:73fba449d35e952e24dc5150cd8d8ec6e069cc361b8cbce25734a5317b12ec84 +size 45182456 diff --git a/depends/gdal-2.4.4-mod.tar.gz b/depends/gdal-2.4.4-mod.tar.gz index aff7e9289..989a62945 100644 --- a/depends/gdal-2.4.4-mod.tar.gz +++ b/depends/gdal-2.4.4-mod.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:942bed51ee83999f8af3a65152ea43e0a0660c31c4e5ac12b7275a50eb1c2e19 -size 14552801 +oid sha256:f86a6a9d81d1f4171dd868ae6021ae0183903dd0945100eca7ecabd7a7d2e5ed +size 14552700 diff --git a/depends/libLAS-1.8.2-mod.tar.gz b/depends/libLAS-1.8.2-mod.tar.gz index 6925161ae..3c3d28fd9 100644 --- a/depends/libLAS-1.8.2-mod.tar.gz +++ b/depends/libLAS-1.8.2-mod.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68e9a56e39058b34f873ab912757a9eebe1d1f6ae5595d997f0f5bf7ea8aa446 -size 141035192 +oid sha256:0caf68dc8e9ccbf6ae3f2fe535a548a301ea91d41cfdac7a2b8aee40f584f0a4 +size 141026148 diff --git a/depends/tinygltf-2.4.1-mod.tar.gz b/depends/tinygltf-2.4.1-mod.tar.gz index 87cfe6748..134ebd383 100644 --- a/depends/tinygltf-2.4.1-mod.tar.gz +++ b/depends/tinygltf-2.4.1-mod.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225fcbd349f9de0f6cac6aa24874f08b7ee36611888e311906af12ae0ad07625 -size 5755679 +oid sha256:518e9e659ebe672faca7aaeb062841c76a22a35779d569a422b3274458ab3502 +size 5755742 diff --git a/depends/tinygltfloader-0.9.5-mod.tar.gz b/depends/tinygltfloader-0.9.5-mod.tar.gz index df73a79c7..b82d62e05 100644 --- a/depends/tinygltfloader-0.9.5-mod.tar.gz +++ b/depends/tinygltfloader-0.9.5-mod.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:716961b28ea3fe204fa7c81272143ce26401f0e7154dd16d4001140ce45351fa -size 708588 +oid sha256:3cf6bbc8bd712e5889cba3bc6564fb975004d225c684768cf98587b12b410f1f +size 708582 diff --git a/pluginsdk.zip b/pluginsdk.zip index 8f66ab0cf71c318357a68bf2e570a1b1f485e09d..70fe0d7855f98f22c031da528b72be3e18c84a5f 100644 GIT binary patch delta 386 zcmaF5r0nUEGM)f$W)?065NNBL$fL!sBe6dTh$q@gF#!c4onZnS7soyXicDsD6J$M61VkpvdY}l@PLvHm5qLLI)(%06-Uf-2eap delta 386 zcmaF5r0nUEGM)f$W)?065GYTc$fL#X^kQEU5Kpv~Vgd?8I>Q7uE{=T&6q(HQ$Q35k z?DuH9-y_D0GC=X^ivJm{VG`Su|1)ZHfJxFLE#`vVlau@G&{TMB8oonShuX zh*^M`6^Pk@m>q~YfS41Axqz4(h-A*fLIWSg@9NXh(&-{6o|!uSR9BY zfLL<7Ex%O9N|3F`cSt$FZROi3)y}t5dOP1vndoaE+3bE<3ud6lr(c*T3--{Fe%U}2 o0ka9R!6*W&CdhiC2#8FS^*|A*ohTcCBJggatRGmwev+&j005GWS^xk5