From c56d4154c8abdda1e6cabcc384a2b0620b8392a8 Mon Sep 17 00:00:00 2001
From: ucar-tmeyer <tiffanym@ucar.edu>
Date: Mon, 27 Nov 2023 19:22:38 +0000
Subject: [PATCH] Update radar menu (and associated bundle) for FNEXRAD
 displays

---
 .../bundles/DefaultRadarComposite.xml         | 41 +++++++++++++++
 .../menus/radar/baseRadarMenu.xml             | 50 ++++++++++++++++++-
 2 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarComposite.xml

diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarComposite.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarComposite.xml
new file mode 100644
index 0000000000..f695b7ea17
--- /dev/null
+++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarComposite.xml
@@ -0,0 +1,41 @@
+
+<bundle>
+    <displayList>
+        <displays xsi:type="d2DMapRenderableDisplay" density="1.0" magnification="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <descriptor xsi:type="mapDescriptor">
+                <resource>
+                    <loadProperties loadWithoutData="true">
+                        <capabilities>
+                            <capability xsi:type="colorMapCapability">
+                                <colorMapParameters colorMapName="${colormap}"/>
+                            </capability>
+                            <capability xsi:type="imagingCapability" interpolationState="${interpolate}" brightness="1.0" contrast="1.0" alpha="1.0"/>
+                        </capabilities>
+                        <resourceType>PLAN_VIEW</resourceType>
+	                    <perspectiveProperty  xsi:type="d2dLoadProperties" overlayMatchTolerance="1"/>
+                    </loadProperties>
+                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
+                    </properties>
+                    <resourceData xsi:type="satResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+                        <metadataMap>
+                            <mapping key="pluginName">
+                                <constraint constraintValue="satellite" constraintType="EQUALS"/>
+                            </mapping>
+                            <mapping key="physicalElement">
+                                <constraint constraintValue="${element}" constraintType="EQUALS"/>
+                            </mapping>
+                            <mapping key="sectorID">
+                                <constraint constraintValue="NEXRCOMP" constraintType="EQUALS"/>
+                            </mapping>
+                            <mapping key="creatingEntity">
+								<constraint constraintValue="NEXRCOMP" constraintType="EQUALS"/>
+							</mapping>
+                        </metadataMap>
+                    </resourceData>
+                </resource>
+                <timeMatcher xsi:type="d2DTimeMatcher" deltaFilter="0" forecastFilter="0"/>
+				<numberOfFrames>36</numberOfFrames>
+            </descriptor>
+        </displays>
+    </displayList>
+</bundle>
\ No newline at end of file
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 11d08d8f26..dcd0dee643 100755
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
@@ -27,10 +27,56 @@
  	<contribute xsi:type="bundleItem" file="bundles/nexradAvailability.xml"
                         menuText="NEXRAD Display" id="NEXRADDisplay">
  	</contribute>
-	<contribute xsi:type="subinclude" subMenu="Dial Radars" id="allDialRadar" fileName="menus/radar/dialRadars.xml"/>
+	<contribute xsi:type="subinclude" subMenu="NEXRAD Radars" id="allDialRadar" fileName="menus/radar/dialRadars.xml"/>
     <contribute xsi:type="subinclude" subMenu="TDWR Radars" id="tdwrRadar" fileName="menus/radar/tdwrRadars.xml" />
 	<contribute xsi:type="separator" id="seperator" />
-		
+        <contribute xsi:type="titleItem" titleText="------ FNEXRAD Composites ------"
+                id="RadarMosaic" />
+        <!--  Unidata Composite -->
+        <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+                menuText="DHR - Digital Hybrid Reflectivity" id="DHR">
+        <substitute key="element" value="DHR"/>
+        <substitute key="colormap" value="Radar/DHR"/>
+                <substitute key="interpolate" value="false"/>
+    </contribute>
+        <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+                menuText="DVL - Digital VIL" id="DVL">
+        <substitute key="element" value="DVL"/>
+        <substitute key="colormap" value="Radar/OSF/Digital VIL"/>
+                <substitute key="interpolate" value="false"/>
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+                menuText="EET - Enhanced Echo Tops" id="EET">
+        <substitute key="element" value="EET"/>
+        <substitute key="colormap" value="Radar/Enhanced Echo Tops"/>
+                <substitute key="interpolate" value="false"/>
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+                menuText="HHC - Hybrid Hydrometeor Classification" id="HHC">
+        <substitute key="element" value="HHC"/>
+        <substitute key="colormap" value="Radar/HHC NEXRCOMP"/>
+                <substitute key="interpolate" value="false"/>
+    </contribute>
+    <!-- 
+    <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+                menuText="DAA - One-Hour Digital Accum Array" id="DAA">
+        <substitute key="element" value="DAA"/>
+        <substitute key="colormap" value="Radar/8-bit STP"/>
+                <substitute key="interpolate" value="true"/>
+    </contribute>
+        <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+                menuText="DTA - Storm-Total Precipitation" id="DTA">
+        <substitute key="element" value="DTA"/>
+        <substitute key="colormap" value="Radar/8-bit STP"/>
+                <substitute key="interpolate" value="true"/>
+    </contribute>
+        <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+                menuText="OHA - One-Hour Accumulation" id="OHA">
+        <substitute key="element" value="OHA"/>
+        <substitute key="colormap" value="Radar/8-bit STP"/>
+                <substitute key="interpolate" value="true"/>
+    </contribute>
+	-->	
 	<contribute xsi:type="titleItem" titleText="------ Mosaic ------"
         id="RadarMosaic" />