Skip to content

Commit

Permalink
## 4.4.0.13
Browse files Browse the repository at this point in the history
* Bug Fixes
  * Null Pointer when setting the title of a MultiPolyline
  * Toggling doghouse visibility displays doghouses for hidden routes
  • Loading branch information
takdeveloper committed Feb 10, 2022
1 parent 6ab5b49 commit a73b359
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 1 deletion.
6 changes: 6 additions & 0 deletions VERSION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Version History

## 4.4.0.13

* Bug Fixes
* Null Pointer when setting the title of a MultiPolyline
* Toggling doghouse visibility displays doghouses for hidden routes

## 4.4.0.12

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

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

ext.jacocoVersion = '0.8.5'

Expand Down
25 changes: 25 additions & 0 deletions atak/ATAK/app/src/main/java/com/atakmap/android/maps/Doghouse.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@

import androidx.annotation.NonNull;

import com.atakmap.android.routes.Route;
import com.atakmap.android.routes.RouteMapReceiver;
import com.atakmap.android.util.ATAKUtilities;
import com.atakmap.app.R;
import com.atakmap.coremap.conversions.Angle;
import com.atakmap.coremap.conversions.AngleUtilities;
import com.atakmap.coremap.conversions.Span;
import com.atakmap.coremap.conversions.SpanUtilities;
import com.atakmap.coremap.log.Log;
import com.atakmap.coremap.maps.coords.GeoCalculations;
import com.atakmap.coremap.maps.coords.GeoPoint;
import com.atakmap.coremap.maps.coords.GeoPointMetaData;
Expand Down Expand Up @@ -94,6 +97,28 @@ public String toString() {
}
}

@Override
public void setVisible(boolean visible) {
//if the current "new" state of the map item is now visible then we must
//check to associated route visibility
if(visible){
//make sure we have the routeUid set inside metadata
if(getMetaString("routeUID",null) != null){
MapItem item = RouteMapReceiver.getInstance().getRouteGroup().findItem("uid",getMetaString("routeUID",""));

//make sure its a route and if the route is not visible then dont call super() for updating the map item
//in this case the doghouse map items visibility to show, if the route is visible then we just call the super()
//which updates the map item to true/false
if(item instanceof Route && !item.getVisible()){
return;
}
}else{
Log.w("Doghouse","Warning Doghouse is missing RouteUID metadata this shouldnt happen");
}
}
super.setVisible(visible);
}

public static final int MAX_FIELDS = 10;
public static final int MAX_DENSITY = 200;
public static final String META_ROUTE_UID = "routeUID";
Expand Down
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 a73b359

Please sign in to comment.