Add possibility to control Placemark label visibility via PlacemarkAttributes.

Author: EMaksymenko

worldwind/src/main/java/gov/nasa/worldwind/shape/Placemark.java

@@ -994,8 +994,8 @@ protected void prepareDrawableLeader(RenderContext rc, DrawableLines drawable) {
      * @return True if there is a valid label and label attributes.
      */
     protected boolean mustDrawLabel(RenderContext rc) {
-        return this.label != null
-            && !this.label.isEmpty()
+        return this.activeAttributes.drawLabel
+            && this.label != null && !this.label.isEmpty()
             && this.activeAttributes.labelAttributes != null;
     }
 

worldwind/src/main/java/gov/nasa/worldwind/shape/PlacemarkAttributes.java

@@ -25,6 +25,8 @@ public class PlacemarkAttributes {
 
     protected double minimumImageScale;
 
+    protected boolean drawLabel;
+
     protected boolean drawLeader;
 
     protected boolean depthTest;
@@ -43,6 +45,7 @@ public PlacemarkAttributes() {
         this.imageOffset = Offset.center();
         this.imageScale = 1;
         this.minimumImageScale = 0;
+        this.drawLabel = true;
         this.drawLeader = false;
         this.depthTest = true;
         this.labelAttributes = new TextAttributes();
@@ -68,6 +71,7 @@ public PlacemarkAttributes(PlacemarkAttributes attributes) {
         this.imageOffset = new Offset(attributes.imageOffset);
         this.imageScale = attributes.imageScale;
         this.minimumImageScale = attributes.minimumImageScale;
+        this.drawLabel = attributes.drawLabel;
         this.drawLeader = attributes.drawLeader;
         this.depthTest = attributes.depthTest;
         this.labelAttributes = attributes.labelAttributes != null ? new TextAttributes(attributes.labelAttributes) : null;
@@ -85,6 +89,7 @@ public PlacemarkAttributes set(PlacemarkAttributes attributes) {
         this.imageOffset.set(attributes.imageOffset);
         this.imageScale = attributes.imageScale;
         this.minimumImageScale = attributes.minimumImageScale;
+        this.drawLabel = attributes.drawLabel;
         this.drawLeader = attributes.drawLeader;
         this.depthTest = attributes.depthTest;
 
@@ -135,6 +140,7 @@ public boolean equals(Object o) {
             && this.imageOffset.equals(that.imageOffset)
             && this.imageScale == that.imageScale
             && this.minimumImageScale == that.minimumImageScale
+            && this.drawLabel == that.drawLabel
             && this.drawLeader == that.drawLeader
             && this.depthTest == that.depthTest
             && ((this.labelAttributes == null) ? (that.labelAttributes == null) : this.labelAttributes.equals(that.labelAttributes))
@@ -152,6 +158,7 @@ public int hashCode() {
         result = 31 * result + (int) (temp ^ (temp >>> 32));
         temp = Double.doubleToLongBits(this.minimumImageScale);
         result = 31 * result + (int) (temp ^ (temp >>> 32));
+        result = 31 * result + (this.drawLabel ? 1 : 0);
         result = 31 * result + (this.drawLeader ? 1 : 0);
         result = 31 * result + (this.depthTest ? 1 : 0);
         result = 31 * result + (this.labelAttributes != null ? this.labelAttributes.hashCode() : 0);
@@ -263,6 +270,23 @@ public PlacemarkAttributes setMinimumImageScale(double minimumImageScale) {
         return this;
     }
 
+    /**
+     * Returns whether to draw a placemark's label.
+     */
+    public boolean isDrawLabel() {
+        return drawLabel;
+    }
+
+    /**
+     * Sets whether to draw a placemark's label.
+     *
+     * @param drawLabel The new draw label setting.
+     */
+    public PlacemarkAttributes setDrawLabel(boolean drawLabel) {
+        this.drawLabel = drawLabel;
+        return this;
+    }
+
     /**
      * Returns whether to draw a line from the placemark's geographic position to the ground.
      */