From e9f78d8f52dd80aa2e0c1cd9f2dde005a006b8a1 Mon Sep 17 00:00:00 2001
From: Zihou Wang <Zihou.Wang@noaa.gov>
Date: Wed, 9 Jul 2014 19:13:06 +0000
Subject: [PATCH] VLab Issue #3990 - DR_17356 Enhancement to Radar Display of
 SAILS 0.5 degree products; closes #3990

Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: f61e935c0372ee19768f2080da1f8fa21fb9aeb1
---
 .../SailsTextContributor.java                 | 33 ++++++++++++++
 .../viz/radar/textcontributors/UpperText.java |  2 +
 .../base/styleRules/RadarUpperText.xml        | 43 ++++++++++++++++---
 3 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100755 cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/SailsTextContributor.java

diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/SailsTextContributor.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/SailsTextContributor.java
new file mode 100755
index 0000000000..6472c728c4
--- /dev/null
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/SailsTextContributor.java
@@ -0,0 +1,33 @@
+package com.raytheon.viz.radar.textcontributors;
+
+import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
+
+/**
+ *
+ * Display "SAILS" at upper text for SAILS products
+ *
+ * <pre>
+ *
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * 07/08/2014   DR17356    zwang       Initial creation
+ *
+ * </pre>
+ *
+ * @author zwang
+ * @version 1.0
+ */
+
+public class SailsTextContributor implements IRadarTextContributor {
+
+    @Override
+    public String contributeText(RadarRecord record) {
+        String sailsStr = "";
+
+        if (record.getPrimaryElevationAngle() <= 0.5 && record.getElevationNumber() > 2)
+            sailsStr = "SAILS";
+
+        return sailsStr;
+    }
+}
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperText.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperText.java
index b35f749628..2f75d1d716 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperText.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperText.java
@@ -39,6 +39,7 @@ import javax.xml.bind.annotation.XmlElements;
  * ------------ ---------- ----------- --------------------------
  * Sep 7, 2010            bsteffen     Initial creation
  * 03/05/2013   DCS51     zwang        Handle GFM product
+ * 07/08/2013   DR17356   zwang        Tag SAILS product
  * 
  * </pre>
  * 
@@ -60,6 +61,7 @@ public class UpperText {
             @XmlElement(name = "productDependentDate", type = ProdDepDateTextContributor.class),
             @XmlElement(name = "productDependentUSPMax", type = USPMaxTextContributor.class),
             @XmlElement(name = "productDependentDVLMax", type = DigitalVilMaxTextContributor.class),
+            @XmlElement(name = "sails", type = SailsTextContributor.class),
             @XmlElement(name = "gfmCount", type = GfmTextContributor.class),
             @XmlElement(name = "srmMovement", type = SrmMovementTextContributor.class),
             @XmlElement(name = "srmSource", type = SrmSourceTextContributor.class) })
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/RadarUpperText.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/RadarUpperText.xml
index 2c0833dbc7..d48a1bad0b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/RadarUpperText.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/RadarUpperText.xml
@@ -26,11 +26,17 @@
 <upperTextSet>
 
 	<!-- Reflectivities -->
-	<upperText productCodes='187 186 181 180 153 98 97 96 95 94 38 37 36 35 21 20 19 18 17 16'>
+	<upperText productCodes='187 186 181 180 98 97 96 95 38 37 36 35 21 20 19 18 17 16'>
 		<vcp />
 		<resolution />
 		<productDependent format='MX: %ddBZ' index='3' />
 	</upperText>
+	<upperText productCodes='153 94'>
+		<vcp />
+		<resolution />
+		<productDependent format='MX: %ddBZ' index='3' />
+		<sails />
+	</upperText>
 	<upperText productCodes='32'>
 		<vcp />
 		<productDependent format='MX: %ddBZ' index='3' />
@@ -46,7 +52,7 @@
 	</upperText>
 	
 	<!-- Velocities -->
-	<upperText productCodes='183 182 154 99 27 26 25 24 23 22'>
+	<upperText productCodes='183 182 27 26 25 24 23 22'>
 		<vcp />
 		<resolution />
 		<productDependent format='MN: %dkt' index='3' />
@@ -55,13 +61,29 @@
 		<srmSource />
 		<srmMovement />
 	</upperText>
+	<upperText productCodes='154 99'>
+		<vcp />
+		<resolution />
+		<productDependent format='MN: %dkt' index='3' />
+		<productDependent format='MX: %dkt' index='4' />
+		<blank />
+		<sails />
+		<srmSource />
+		<srmMovement />
+	</upperText>
 	
 	<!-- Base Spectrum Width -->
-	<upperText productCodes='185 155 30 29 28'>
+	<upperText productCodes='185 30 29 28'>
 		<vcp />
 		<resolution />
 		<productDependent format='MX: %dkt' index='3' />
 	</upperText>
+	<upperText productCodes='155'>
+		<vcp />
+		<resolution />
+		<productDependent format='MX: %dkt' index='3' />
+		<sails />
+	</upperText>
 	
 	<!-- Storm Rel Vel Region -->
    <upperText productCodes='55'>
@@ -286,6 +308,7 @@
 		<resolution />
 		<productDependent format='MN: %.1fdB' index='3' multiplier='0.1' />
 		<productDependent format='MX: %.1fdB' index='4' multiplier='0.1' />
+		<sails />
 	</upperText>
 
 	<!-- Corr Coeff -->
@@ -294,6 +317,7 @@
 		<resolution />
 		<productDependent format='MN: %.3f' index='3' multiplier='0.004' />
 		<productDependent format='MX: %.3f' index='4' multiplier='0.004' />
+		<sails />
 	</upperText>
 	
 	<!-- Spec Diff Phase -->
@@ -302,16 +326,25 @@
 		<resolution />
 		<productDependent format='MN: %.2f Deg/km' index='3' multiplier='0.05' />
 		<productDependent format='MX: %.2f Deg/km' index='4' multiplier='0.05' />
+		<sails />
 	</upperText>
 	
 	<!-- hydro class -->
-	<upperText productCodes='164 165 177'>
+	<upperText productCodes='177'>
 		<vcp />
 		<resolution />
 		<productDependent format='Filter Size: %d' index='3'>
 			<flag value='0' label='' />
 		</productDependent>
 	</upperText>
+	<upperText productCodes='164 165'>
+		<vcp />
+		<resolution />
+		<productDependent format='Filter Size: %d' index='3'>
+			<flag value='0' label='' />
+		</productDependent>
+		<sails />
+	</upperText>
 	
 	<!-- Dual Pol Precip -->
 	<upperText productCodes='169'>
@@ -398,4 +431,4 @@
 		<gfmCount />
 	</upperText>
 
-</upperTextSet>
\ No newline at end of file
+</upperTextSet>