Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4

Former-commit-id: 07d163170f [formerly cbfd380b43] [formerly 76bd6575b6] [formerly 76bd6575b6 [formerly 47ae6015e5]] [formerly a24794ca7b [formerly 76bd6575b6 [formerly 47ae6015e5] [formerly a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]]
Former-commit-id: a24794ca7b
Former-commit-id: f7c6785d6d9d9e74292b4274283e724146705826 [formerly d87cfe22daebbd0f64708e2b5401b5a9bc43a95e] [formerly 065b05e38c [formerly 0e9a17540d]]
Former-commit-id: 065b05e38c
Former-commit-id: 7288e9be2a

cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/RadarHelper.java

@@ -72,6 +72,8 @@ import com.raytheon.viz.awipstools.common.StormTrackData;
  * 03/07/2012   DR 14660   D. Friedman Added time-based getSTIData* functions.
  * 03/01/2013   DR 15496   zwang       Handle the expanded GSM
  *                                     Correct some status according to B14 ICD
+ * 08/20/2014   DR17214    zwang       Report more status for VCP supplemental Info
+ *                                     according to RPG B16 ICD 
  * 
  * </pre>
  * 
@@ -178,7 +180,7 @@ public class RadarHelper {
             "RDA 1", "RDA 2" };
     
     public static final String[] vcpInfoStr = { "AVSET",
-        "SAILS", "Site-Specific VCP" };
+        " SAILS", " Site-Specific VCP", " RxRN", " CBT" };
 
 	/**
 	 * The default maximimum difference in time used when retrieving STI data (15 minutes.)

cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java

@@ -55,6 +55,7 @@ import com.raytheon.viz.radar.rsc.RadarResourceData;
  * ------------ ---------- ----------- --------------------------
  * May 13, 2010            mnash     Initial creation
  * 03/01/2013   DR 15496   zwang     Handled expanded GSM, display more status
+ * 07/16/2014   DR 17214   zwang     Handled B15 GSM change about super res flag
  * 
  * </pre>
  * 
@@ -282,49 +283,75 @@ public class RadarGSMResource extends AbstractRadarResource<RadarXYDescriptor> {
             }
 
             // Plot elevations
-            double[] elevations = message.getElevation().clone();
+            double[] elev = message.getElevation().clone();
             char[] charArray = Integer.toBinaryString(
                     message.getSuperResolutionCuts()).toCharArray();
             
-            elevations = Arrays.copyOf(elevations, message.getNumCuts());
-            Arrays.sort(elevations);
+            // Find the index of the SAILS elevation
+            int sailsIndex = -1;
+            for (int i = 1; i < elev.length; i++) {
+                if (elev[i] == elev[0]) {
+                    sailsIndex = i;
+                    break;
+                }
+            }
+
+            //Ignore the super res flag for SAILS
+            if (sailsIndex != -1 && sailsIndex < charArray.length) {
+                charArray[charArray.length - sailsIndex - 1] = '0';
+            }
+
+            // Remove elevation 0 and duplicate elevations
+            Arrays.sort(elev);
+            int j = 0;
+            int k = 1;
+            while (k < elev.length){
+                if (elev[j] == 0) {
+                    elev[j] = elev[k];
+                    k++;
+                }
+                else if (elev[k] == elev[j]) {
+                    k++;
+                }
+                else {
+                    j++;
+                    elev[j] = elev[k];
+                    k++;
+                }
+            }
+
+            double[] elevations = Arrays.copyOf(elev,  j+1);
+
             for (int left = 0, right = elevations.length - 1; left < right; left++, right--) {
                 double tmp = elevations[left];
                 elevations[left] = elevations[right];
                 elevations[right] = tmp;
             }
 
-            int count = 0;
+            // Handle the super res flag
+            boolean[] superResElev = new boolean[elevations.length];
+            // Initiate all flags to non super res
             for (int i = 0; i < elevations.length; i++) {
-                if (elevations[i] == 0) {
-                    count++;
-                }
+                superResElev[i] = false;
             }
             
-            boolean[] superResElev = new boolean[elevations.length];
+            // Ignore the flag for SAILS
             for (int i = 0; i < charArray.length; i++) {
-                if (charArray[i] == '1') {
-                    superResElev[i] = true;
-                } else {
-                    superResElev[i] = false;
+                if (charArray[charArray.length - i - 1] == '1') {
+                    superResElev[elevations.length - i - 1] = true;
                 } 
             }
 
             List<String> theTemp = new ArrayList<String>();
             for (int i = 0; i < elevations.length; i++) {
-                if (elevations[i] != 0) {
+                
                 String s = "";
-                    if (superResElev[elevations.length - i - count - 1] == true) {
+                if (superResElev[i] == true) {
                     s = "S";
                 } else {
                     s = "";
                 }
-                    theTemp.add(Double.toString(elevations[i] / 10) + "     "
-                            + s);
-                } else {
-                    theTemp.add(Double.toString(elevations[i] / 10));
-                    break;
-                }
+                theTemp.add(Double.toString(elevations[i] / 10) + "     " + s);
             }
 
             int height = 780;

edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/RadarUpperText.xml

@@ -67,9 +67,9 @@
 		<productDependent format='MN: %dkt' index='3' />
 		<productDependent format='MX: %dkt' index='4' />
 		<blank />
-		<sails />
 		<srmSource />
 		<srmMovement />
+		<sails />
 	</upperText>
 	
 	<!-- Base Spectrum Width -->