From 9293690653511ebf00d3b2962ff38c1dde87c910 Mon Sep 17 00:00:00 2001
From: "M.Ziolkowski" <ziolek0321@gmail.com>
Date: Tue, 3 Oct 2017 17:58:31 +0200
Subject: [PATCH] Added Symbols: Block 2.X.1.1 and Penetrate 2.X.1.17
---
.../milstd2525/MilStd2525GraphicFactory.java | 1 +
.../graphics/areas/TasksBLetterShape.java | 287 ++++++++++++++++++
.../examples/symbology/TacticalGraphics.java | 24 +-
3 files changed, 311 insertions(+), 1 deletion(-)
create mode 100644 src/gov/nasa/worldwind/symbology/milstd2525/graphics/areas/TasksBLetterShape.java
diff --git a/src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525GraphicFactory.java b/src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525GraphicFactory.java
index d2b35999bc..b8fdc11c8a 100644
--- a/src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525GraphicFactory.java
+++ b/src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525GraphicFactory.java
@@ -79,6 +79,7 @@ protected void populateClassMap()
this.mapClass(DirectionOfAttackForFeint.class, DirectionOfAttackForFeint.getSupportedGraphics());
this.mapClass(HoldingLine.class, HoldingLine.getSupportedGraphics());
this.mapClass(LimitedAccessArea.class, LimitedAccessArea.getSupportedGraphics());
+ this.mapClass(TasksBLetterShape.class, TasksBLetterShape.getSupportedGraphics());
// Mobility/survivability
diff --git a/src/gov/nasa/worldwind/symbology/milstd2525/graphics/areas/TasksBLetterShape.java b/src/gov/nasa/worldwind/symbology/milstd2525/graphics/areas/TasksBLetterShape.java
new file mode 100644
index 0000000000..16f22c6f8a
--- /dev/null
+++ b/src/gov/nasa/worldwind/symbology/milstd2525/graphics/areas/TasksBLetterShape.java
@@ -0,0 +1,287 @@
+/*
+* Copyright (C) 2017 United States Government as represented by the Administrator of the
+* National Aeronautics and Space Administration.
+* All Rights Reserved.
+*/
+
+package gov.nasa.worldwind.symbology.milstd2525.graphics.areas;
+
+import gov.nasa.worldwind.WorldWind;
+import gov.nasa.worldwind.avlist.AVKey;
+import gov.nasa.worldwind.geom.*;
+import gov.nasa.worldwind.render.*;
+import gov.nasa.worldwind.symbology.TacticalGraphicLabel;
+import gov.nasa.worldwind.symbology.milstd2525.AbstractMilStd2525TacticalGraphic;
+import gov.nasa.worldwind.symbology.milstd2525.graphics.TacGrpSidc;
+import gov.nasa.worldwind.util.Logging;
+
+import java.util.*;
+
+/**
+ * Implementation of block graphics. This class implements the following graphics:
+ * <p/>
+ * <ul> <li>Block (2.X.1.1)</li> <li>Penetrate (2.X.1.17)</li> </ul>
+ *
+ * @author maciejziolkowski
+ * @version $Id: TaskBLetterShape.java 1 2017-10-04 17:45:02Z maciejziolkowski $
+ */
+public class TasksBLetterShape extends AbstractMilStd2525TacticalGraphic
+{
+
+ public TasksBLetterShape(String sidc)
+ {
+ super(sidc);
+ }
+
+ /**
+ * Indicates the graphics supported by this class.
+ *
+ * @return SIDC string that identify graphics that this class supports.
+ */
+ public static List<String> getSupportedGraphics()
+ {
+ return Arrays.asList(TacGrpSidc.TSK_BLK,
+ TacGrpSidc.TSK_PNE);
+ }
+
+ /**
+ * Create the label on the graphic.
+ */
+ @Override
+ protected void createLabels()
+ {
+ String code = this.maskedSymbolCode;
+ if (TacGrpSidc.TSK_PNE.equals(code))
+ {
+ addLabel("P");
+ }
+ else
+ {
+ addLabel("B");
+ }
+ }
+
+ /**
+ * Determine the appropriate position for the graphic's labels.
+ *
+ * @param dc Current draw context.
+ */
+ @Override
+ protected void determineLabelPositions(DrawContext dc)
+ {
+ Iterator<? extends Position> iterator = this.paths.get(1).getPositions().iterator();
+
+ // Find the first and last positions on the path
+ Position first = iterator.next();
+ Position second = first;
+ while (iterator.hasNext())
+ {
+ second = iterator.next();
+ }
+
+ TacticalGraphicLabel startLabel = this.labels.get(0);
+
+ // Position the labels at the ends of the path
+ LatLon ll = LatLon.interpolate(0.5, first, second);
+ startLabel.setPosition(new Position(ll, 0));
+ startLabel.setOrientationPosition(second);
+ startLabel.setTextAlign(AVKey.LEFT);
+ }
+
+ /**
+ * Center point beatween point1 and point2
+ */
+ private LatLon center;
+ /**
+ * Distance between Arrow position and point1
+ */
+ private Angle length;
+ private double lengthDouble;
+ /**
+ * Distance between center and point3
+ */
+ private Angle distance;
+ private double distanceDouble;
+ /**
+ * Angle
+ */
+ private Angle ang;
+ private Angle ang0;
+ private double angDouble;
+
+ /**
+ * First control point.
+ */
+ protected Position point1;
+ /**
+ * Second control point.
+ */
+ protected Position point2;
+ /**
+ * Third control point.
+ */
+ protected Position point3;
+
+ /**
+ * Path used to render the line.
+ */
+ protected ArrayList<Path> paths;
+
+ /**
+ * {@inheritDoc}
+ *
+ * @param positions Control points that orient the graphic. Must provide at least three points.
+ */
+ public void setPositions(Iterable<? extends Position> positions)
+ {
+ if (positions == null)
+ {
+ String message = Logging.getMessage("nullValue.PositionsListIsNull");
+ Logging.logger().severe(message);
+ throw new IllegalArgumentException(message);
+ }
+
+ try
+ {
+ Iterator<? extends Position> iterator = positions.iterator();
+ this.point1 = iterator.next();
+ this.point2 = iterator.next();
+ this.point3 = iterator.next();
+ }
+ catch (NoSuchElementException e)
+ {
+ String message = Logging.getMessage("generic.InsufficientPositions");
+ Logging.logger().severe(message);
+ throw new IllegalArgumentException(message);
+ }
+
+ this.paths = null; // Need to recompute path for the new control points
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iterable<? extends Position> getPositions()
+ {
+ return Arrays.asList(this.point1, this.point2, this.point3);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Position getReferencePosition()
+ {
+ return this.point1;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void doRenderGraphic(DrawContext dc)
+ {
+ for (Path path : this.paths)
+ {
+ path.render(dc);
+ }
+ }
+
+ /**
+ * Compute positions and create the paths required to draw graphic.
+ *
+ * @param dc Current draw context.
+ */
+ @Override
+ protected void computeGeometry(DrawContext dc)
+ {
+ if (this.paths == null)
+ {
+ this.paths = new ArrayList<Path>();
+
+ // Create paths for the block
+ String code = this.maskedSymbolCode;
+ center = LatLon.getCenter(Arrays.asList(point1, point2));
+ distance = LatLon.greatCircleDistance(center, this.point3);
+ // Position of the center point
+ Position centerPosition = new Position(center, 0);
+ // Size the arrow
+ LatLon lengthArrow = LatLon.interpolate(0.125, center, point1);
+ // Position the arrow
+ Position lengthArrowPosition = new Position(lengthArrow, 0);
+ length = LatLon.greatCircleDistance(lengthArrowPosition, this.point1);
+ // Angle between point1 and point2
+ ang = LatLon.greatCircleAzimuth(point1, point2);
+ // Zeroing the angle
+ angDouble = ang.getDegrees();
+ ang0 = ang.addDegrees(-angDouble);
+ lengthDouble = length.getRadians();
+ distanceDouble = distance.getRadians();
+
+ // This is the condition which changing in length arrow proportional to the graphic
+ if (lengthDouble * 1.3 > distanceDouble)
+ {
+ length = length.divide(4);
+ }
+
+ if (TacGrpSidc.TSK_BLK.equals(code))
+ {
+ // Create the paths from point1 to point2
+ this.paths.add(createPath(Arrays.asList(this.point1, this.point2)));
+ // Create the paths from centerPosition to point3
+ this.paths.add(createPath(Arrays.asList(centerPosition, this.point3)));
+ }
+ else
+ {
+ // Angle up and down line of the arrow
+ Angle ang295 = ang0.add(Angle.fromDegrees(295));
+ Angle ang245 = ang0.add(Angle.fromDegrees(245));
+ // position up and down line of arrow
+ Position positionLineUpOfArrow = new Position(
+ LatLon.greatCircleEndPosition(centerPosition, ang295, length), 0);
+ Position positionLineDownOfArrow = new Position(
+ LatLon.greatCircleEndPosition(centerPosition, ang245, length), 0);
+ // Create the paths from point1 to point2
+ this.paths.add(createPath(Arrays.asList(this.point1, this.point2)));
+ // Create the paths from centerPosition to point3
+ this.paths.add(createPath(Arrays.asList(centerPosition, this.point3)));
+ // Create the arrow
+ this.paths.add(
+ createPath(Arrays.asList(positionLineDownOfArrow, centerPosition, positionLineUpOfArrow)));
+ }
+ }
+ super.computeGeometry(dc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void applyDelegateOwner(Object owner)
+ {
+ if (this.paths == null)
+ {
+ return;
+ }
+
+ for (Path path : this.paths)
+ {
+ path.setDelegateOwner(owner);
+ }
+ }
+
+ /**
+ * Create and configure the Path used to render this graphic.
+ *
+ * @param positions Positions that define the path.
+ *
+ * @return New path configured with defaults appropriate for this type of graphic.
+ */
+ protected Path createPath(List<Position> positions)
+ {
+ Path path = new Path(positions);
+ path.setFollowTerrain(true);
+ path.setPathType(AVKey.GREAT_CIRCLE);
+ path.setAltitudeMode(WorldWind.CLAMP_TO_GROUND);
+ path.setDelegateOwner(this.getActiveDelegateOwner());
+ path.setAttributes(this.getActiveShapeAttributes());
+ return path;
+ }
+}
diff --git a/src/gov/nasa/worldwindx/examples/symbology/TacticalGraphics.java b/src/gov/nasa/worldwindx/examples/symbology/TacticalGraphics.java
index 05f4ddeb3d..7f3afcc150 100644
--- a/src/gov/nasa/worldwindx/examples/symbology/TacticalGraphics.java
+++ b/src/gov/nasa/worldwindx/examples/symbology/TacticalGraphics.java
@@ -478,11 +478,33 @@ protected void createAreaGraphics(RenderableLayer layer)
TacticalGraphicFactory factory = new MilStd2525GraphicFactory();
TacticalGraphic graphic;
+ /////////////////////////////////////////////
+ // Block (2.X.1.1)
+ /////////////////////////////////////////////
+ List<Position> positions = Arrays.asList(
+ Position.fromDegrees(34.9349, -117.6303),
+ Position.fromDegrees(34.9843, -117.6303),
+ Position.fromDegrees(34.9596, -117.4891));
+ graphic = factory.createGraphic("GFTPB---------X", positions, null);
+ graphic.setValue(AVKey.DISPLAY_NAME, "Block: (2.X.1.1)");
+ layer.addRenderable(graphic);
+
+ /////////////////////////////////////////////
+ // Penetrate (2.X.1.17)
+ /////////////////////////////////////////////
+ positions = Arrays.asList(
+ Position.fromDegrees(35.0614, -117.6525),
+ Position.fromDegrees(35.0130, -117.6514),
+ Position.fromDegrees(35.0352, -117.7514));
+ graphic = factory.createGraphic("GFTPP---------X", positions, null);
+ graphic.setValue(AVKey.DISPLAY_NAME, "Penetrate: (2.X.1.17)");
+ layer.addRenderable(graphic);
+
/////////////////////////////////////////////
// Assembly area (2.X.2.1.3.2)
/////////////////////////////////////////////
- List<Position> positions = Arrays.asList(
+ positions = Arrays.asList(
Position.fromDegrees(34.9130, -117.1897),
Position.fromDegrees(34.9789, -117.1368),
Position.fromDegrees(34.9706, -116.9900),