diff --git a/VERSION.md b/VERSION.md index b0d540f7f..100c0cf67 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1,5 +1,10 @@ # Version History +## 4.4.0.14 + +* Bug Fixes + * display the angle correctly when showing doghouses. + ## 4.4.0.13 * Bug Fixes diff --git a/atak/ATAK/app/build.gradle b/atak/ATAK/app/build.gradle index c368ddf8c..06e2783ae 100644 --- a/atak/ATAK/app/build.gradle +++ b/atak/ATAK/app/build.gradle @@ -24,7 +24,7 @@ import java.util.regex.Pattern buildscript { ext.ATAK_VERSION = "4.4.0" - ext.ATAK_VERSION_SUBMINOR = ".13" + ext.ATAK_VERSION_SUBMINOR = ".14" ext.jacocoVersion = '0.8.5' 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 df9ba5fac..b257cf0ee 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 @@ -501,22 +501,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/atak/ATAK/app/src/main/java/com/atakmap/android/maps/MultiPolyline.java b/atak/ATAK/app/src/main/java/com/atakmap/android/maps/MultiPolyline.java index dedda54a9..95b6b9332 100644 --- a/atak/ATAK/app/src/main/java/com/atakmap/android/maps/MultiPolyline.java +++ b/atak/ATAK/app/src/main/java/com/atakmap/android/maps/MultiPolyline.java @@ -20,6 +20,7 @@ import com.atakmap.app.R; import com.atakmap.coremap.cot.event.CotDetail; import com.atakmap.coremap.cot.event.CotEvent; +import com.atakmap.coremap.filesystem.FileSystemUtils; import com.atakmap.coremap.maps.coords.GeoPoint; import com.atakmap.coremap.maps.coords.GeoPointMetaData; import com.atakmap.coremap.maps.time.CoordinatedTime; @@ -211,7 +212,7 @@ public void setTitle(final String title) { super.setTitle(title); // only call refresh if the title actually changes - if (!title.equals(prevTitle)) + if (!FileSystemUtils.isEquals(title, prevTitle)) refresh(); } diff --git a/depends/assimp-4.0.1-mod.tar.gz b/depends/assimp-4.0.1-mod.tar.gz index 67709baef..d928ff83e 100644 Binary files a/depends/assimp-4.0.1-mod.tar.gz and b/depends/assimp-4.0.1-mod.tar.gz differ diff --git a/depends/gdal-2.4.4-mod.tar.gz b/depends/gdal-2.4.4-mod.tar.gz index 12a6b015e..9b75bcb2f 100644 Binary files a/depends/gdal-2.4.4-mod.tar.gz and b/depends/gdal-2.4.4-mod.tar.gz differ diff --git a/depends/tinygltf-2.4.1-mod.tar.gz b/depends/tinygltf-2.4.1-mod.tar.gz index 56cc7b1ef..a8fc97349 100644 Binary files a/depends/tinygltf-2.4.1-mod.tar.gz and b/depends/tinygltf-2.4.1-mod.tar.gz differ diff --git a/depends/tinygltfloader-0.9.5-mod.tar.gz b/depends/tinygltfloader-0.9.5-mod.tar.gz index 178607db1..aa6b12916 100644 Binary files a/depends/tinygltfloader-0.9.5-mod.tar.gz and b/depends/tinygltfloader-0.9.5-mod.tar.gz differ diff --git a/pluginsdk.zip b/pluginsdk.zip index c1573cd03..5dacf4cb5 100644 Binary files a/pluginsdk.zip and b/pluginsdk.zip differ