From 1c682e0af1a2faef5bdcf2fb4813ff31b7e5e2ef Mon Sep 17 00:00:00 2001
From: AWIPS User <mjames@unidata.ucar.edu>
Date: Wed, 22 Jul 2015 10:31:01 -0600
Subject: [PATCH] sat and radar menu organization

Former-commit-id: affd4212ede162849d853059c5c21f2e9fdb7895 [formerly 698c0b516628e21e7d8d3b1e05b2d88140d4380e] [formerly 8f8b9dd16ea8ae10522f0f5092dcc20a9676444f [formerly 0943c3edd5452f983c88c9fad2b4e759f4a705ca]]
Former-commit-id: fe06833d7f0b88c2fd77bec7b274dfbdaa6ab9cd [formerly 4c91c173268c8bb81ba0cee97906dcee789e201b]
Former-commit-id: d3b35a2e3a285bffe87c0e761bb15f7f89336a39
---
 .../localization/menus/radar/baseRadarMenu.xml              | 2 +-
 .../com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java  | 6 +++---
 .../plugin/satellite/mcidas/McidasSatelliteDecoder.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
index ea19fb8bfa..fa9336ad41 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
@@ -15,7 +15,7 @@
 		id="RadarMenuTwdrRadarsSubMenu">
 		<contribute xsi:type="subinclude" fileName="menus/radar/tdwrRadars.xml" />
 	</contribute>
-	<contribute xsi:type="titleItem" titleText="------ Unidata Composites ------"
+	<contribute xsi:type="titleItem" titleText="------ FNEXRAD Composites ------"
 		id="RadarMosaic" />
 	<!--  Unidata Composite -->
 	<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java
index b8a8512407..441045e1dc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java
@@ -235,11 +235,11 @@ public class RadarMenuUtil extends AbstractMenuUtil implements
         }
 
         Arrays.sort(menuTemplateFile.contributions);
-        // only want 12 radars in the dial radar menu, otherwise put it in
+        // only want 18 radars in the dial radar menu, otherwise put it in
         // submenus
-        if (menuTemplateFile.contributions.length > 12) {
+        if (menuTemplateFile.contributions.length > 18) {
             double numMenus = Math
-                    .ceil(((double) menuTemplateFile.contributions.length) / 12);
+                    .ceil(((double) menuTemplateFile.contributions.length) / 18);
             int perMenu = (int) (menuTemplateFile.contributions.length
                     / numMenus + 1);
             statusHandler.info("For " + menuTemplateFile.contributions.length
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java
index 70e244448d..55884ea12b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java
@@ -505,7 +505,7 @@ public class McidasSatelliteDecoder {
     private String getAreaName(int areaNumber) {
     	// GOES-West UNIWISC McIDAS AREA files
     	if ( (1161 <= areaNumber && areaNumber <= 1254) ||
-    			(1801 <= areaNumber && areaNumber <= 1851) ){
+    			(1801 <= areaNumber && areaNumber <= 1854) ){
     		areaNumber = 1161; 
     	// GOES-East UNIWISC McIDAS AREA files
     	} else if (1261 <= areaNumber && areaNumber <= 1524) {