Skip to content

Commit

Permalink
## 4.4.0.12
Browse files Browse the repository at this point in the history
* Bug Fix
  * Difficult time changing range and bearing units specifically feet/meters.
takdeveloper committed Feb 10, 2022
1 parent b5b5357 commit 6ab5b49
Showing 9 changed files with 20 additions and 4 deletions.
5 changes: 5 additions & 0 deletions VERSION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Version History

## 4.4.0.12

* Bug Fix
* Difficult time changing range and bearing units specifically feet/meters.

## 4.4.0.11

* Bug Fixes
2 changes: 1 addition & 1 deletion atak/ATAK/app/build.gradle
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import java.util.regex.Pattern
buildscript {

ext.ATAK_VERSION = "4.4.0"
ext.ATAK_VERSION_SUBMINOR = ".11"
ext.ATAK_VERSION_SUBMINOR = ".12"

ext.jacocoVersion = '0.8.5'

Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
import com.atakmap.coremap.conversions.CoordinateFormat;
import com.atakmap.coremap.conversions.CoordinateFormatUtilities;
import com.atakmap.coremap.conversions.Span;
import com.atakmap.coremap.conversions.SpanUtilities;
import com.atakmap.coremap.filesystem.FileSystemUtils;
import com.atakmap.coremap.maps.conversion.EGM96;
import com.atakmap.coremap.maps.coords.GeoPoint;
@@ -60,7 +61,7 @@ public void setRangeSystem(int rangeSys) {

/**
* Get preferred range units based on set thresholds
* @param range Range value to use as reference
* @param range Range value to use as reference (meters)
* @return Range units
*/
public Span getRangeUnits(double range) {
@@ -71,6 +72,7 @@ public Span getRangeUnits(double range) {
return Span.KILOMETER;
return Span.METER;
} else if (system == Span.ENGLISH) {
range = SpanUtilities.convert(range, Span.METER, Span.FOOT);
int thresh = get(FT_MILES_THRESH, 5280);
if (range > thresh)
return Span.MILE;
Original file line number Diff line number Diff line change
@@ -226,9 +226,18 @@ public void onItemSelected(AdapterView<?> parent,
Span selectedUnits = unitsAdapter.getItem(position);
if (selectedUnits == null)
return;

// Convert the radius to the new units selection
double radius = _rabCircle.getRadius();
Span currentUnits = _prefs.getRangeUnits(radius);
radius = SpanUtilities.convert(radius, Span.METER,
currentUnits);
radius = SpanUtilities.convert(radius, selectedUnits,
Span.METER);

// Update preferences and circle
_prefs.setRangeSystem(selectedUnits.getType());
_rabCircle.refresh();
refresh();
_rabCircle.setRadius(radius);
}
});

Binary file modified depends/assimp-4.0.1-mod.tar.gz
Binary file not shown.
Binary file modified depends/gdal-2.4.4-mod.tar.gz
Binary file not shown.
Binary file modified depends/tinygltf-2.4.1-mod.tar.gz
Binary file not shown.
Binary file modified depends/tinygltfloader-0.9.5-mod.tar.gz
Binary file not shown.
Binary file modified pluginsdk.zip
Binary file not shown.

0 comments on commit 6ab5b49

Please sign in to comment.