From ecd6e64d6940784d474b4b202aa3e3d92aed26cd Mon Sep 17 00:00:00 2001
From: Michael James <Michael.James@noaa.gov>
Date: Wed, 30 Nov 2016 14:32:40 -0600
Subject: [PATCH] radar menu mosaic fix

---
 .../bundles/DefaultRadarMosaic.xml            |  62 +++----
 .../bundles/DefaultRadarMosaicDPprecip.xml    |  92 ++++-----
 .../bundles/DefaultRadarMosaicTwoPanel.xml    | 124 ++++++-------
 .../bundles/DefaultRadarMosaicVILCompRefl.xml | 175 ++++++++----------
 .../bundles/DefaultTDWRRadarMosaic.xml        |  62 +++----
 .../menus/radar/baseRadarMenu.xml             |   2 +-
 6 files changed, 228 insertions(+), 289 deletions(-)

diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml
index c571fba1c3..26804da0b1 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml
@@ -24,9 +24,6 @@
 								<constraint constraintValue="${product}"
 									constraintType="IN" />
 							</mapping>
-							<mapping key="icao">
-								<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
-							</mapping>
 							<mapping key="primaryElevationAngle">
 								<constraint constraintValue="${elevation}"
 									constraintType="EQUALS" />
@@ -35,38 +32,33 @@
 								<constraint constraintValue="radar" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
-						<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
-							<resource>
-								<loadProperties loadWithoutData="true">
-									<capabilities>
-										<capability xsi:type="imagingCapability"
-											interpolationState="false" brightness="1.0" contrast="1.0"
-											alpha="1.0" />
-									</capabilities>
-								</loadProperties>
-								<properties isSystemResource="false" isBlinking="false"
-									isMapLayer="false" isHoverOn="false" isVisible="true" />
-								<resourceData xsi:type="radarResourceData"
-									isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-									<metadataMap>
-										<mapping key="productCode">
-											<constraint constraintValue="${product}"
-												constraintType="IN" />
-										</mapping>
-										<mapping key="icao">
-											<constraint constraintValue="kxxx" constraintType="EQUALS" />
-										</mapping>
-										<mapping key="primaryElevationAngle">
-											<constraint constraintValue="${elevation}"
-												constraintType="EQUALS" />
-										</mapping>
-										<mapping key="pluginName">
-											<constraint constraintValue="radar" constraintType="EQUALS" />
-										</mapping>
-									</metadataMap>
-								</resourceData>
-							</resource>
-						</resourceFactory>
+						<resource>
+							<loadProperties loadWithoutData="true">
+								<capabilities>
+									<capability xsi:type="imagingCapability"
+										interpolationState="false" brightness="1.0" contrast="1.0"
+										alpha="1.0" />
+								</capabilities>
+							</loadProperties>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false" isVisible="true" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+								<metadataMap>
+									<mapping key="productCode">
+										<constraint constraintValue="${product}"
+											constraintType="IN" />
+									</mapping>
+									<mapping key="primaryElevationAngle">
+										<constraint constraintValue="${elevation}"
+											constraintType="EQUALS" />
+									</mapping>
+									<mapping key="pluginName">
+										<constraint constraintValue="radar" constraintType="EQUALS" />
+									</mapping>
+								</metadataMap>
+							</resourceData>
+						</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml
index 967dacc405..e9190d5c86 100755
--- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicDPprecip.xml
@@ -27,10 +27,6 @@
                                 <constraint constraintValue="${product}"
                                     constraintType="IN" />
                             </mapping>
-                            <mapping key="icao">
-                                <constraint constraintValue="${mosaicIcaoList}"
-                                    constraintType="IN" />
-                            </mapping>
                             <mapping key="primaryElevationAngle">
                                 <constraint constraintValue="${elevation}"
                                     constraintType="EQUALS" />
@@ -44,54 +40,46 @@
                                     constraintType="EQUALS" />
                             </mapping>
                         </metadataMap>
-                        <resourceFactory xsi:type="radarMosaicResourceFactory"
-                            values="${mosaicIcaoList}" key="kxxx">
-                            <resource>
-                                <loadProperties
-                                    loadWithoutData="true">
-                                    <capabilities>
-                                        <capability xsi:type="imagingCapability"
-                                            interpolationState="false"
-                                            brightness="1.0" contrast="1.0"
-                                            alpha="1.0" />
-                                    </capabilities>
-                                </loadProperties>
-                                <properties isSystemResource="false"
-                                    isBlinking="false" isMapLayer="false"
-                                    isHoverOn="false" isVisible="true" />
-                                <resourceData xsi:type="radarResourceData"
-                                    isUpdatingOnMetadataOnly="false"
-                                    isRequeryNecessaryOnTimeMatch="true">
-                                    <metadataMap>
-                                        <mapping key="productCode">
-                                            <constraint
-                                                constraintValue="${product}"
-                                                constraintType="IN" />
-                                        </mapping>
-                                        <mapping key="icao">
-                                            <constraint
-                                                constraintValue="kxxx"
-                                                constraintType="EQUALS" />
-                                        </mapping>
-                                        <mapping key="primaryElevationAngle">
-                                            <constraint
-                                                constraintValue="${elevation}"
-                                                constraintType="EQUALS" />
-                                        </mapping>
-                                        <mapping key="layer">
-                                            <constraint
-                                                constraintValue="${layer}"
-                                                constraintType="EQUALS" />
-                                        </mapping>
-                                        <mapping key="pluginName">
-                                            <constraint
-                                                constraintValue="radar"
-                                                constraintType="EQUALS" />
-                                        </mapping>
-                                    </metadataMap>
-                                </resourceData>
-                            </resource>
-                        </resourceFactory>
+                         <resource>
+                             <loadProperties
+                                 loadWithoutData="true">
+                                 <capabilities>
+                                     <capability xsi:type="imagingCapability"
+                                         interpolationState="false"
+                                         brightness="1.0" contrast="1.0"
+                                         alpha="1.0" />
+                                 </capabilities>
+                             </loadProperties>
+                             <properties isSystemResource="false"
+                                 isBlinking="false" isMapLayer="false"
+                                 isHoverOn="false" isVisible="true" />
+                             <resourceData xsi:type="radarResourceData"
+                                 isUpdatingOnMetadataOnly="false"
+                                 isRequeryNecessaryOnTimeMatch="true">
+                                 <metadataMap>
+                                     <mapping key="productCode">
+                                         <constraint
+                                             constraintValue="${product}"
+                                             constraintType="IN" />
+                                     </mapping>
+                                     <mapping key="primaryElevationAngle">
+                                         <constraint
+                                             constraintValue="${elevation}"
+                                             constraintType="EQUALS" />
+                                     </mapping>
+                                     <mapping key="layer">
+                                         <constraint
+                                             constraintValue="${layer}"
+                                             constraintType="EQUALS" />
+                                     </mapping>
+                                     <mapping key="pluginName">
+                                         <constraint
+                                             constraintValue="radar"
+                                             constraintType="EQUALS" />
+                                     </mapping>
+                                 </metadataMap>
+                             </resourceData>
+                         </resource>
                     </resourceData>
                 </resource>
             </descriptor>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml
index ae37074d5d..431b02e157 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml
@@ -54,9 +54,6 @@
                             <mapping key="productCode">
                                 <constraint constraintValue="${product1}" constraintType="EQUALS"/>
                             </mapping>
-							<mapping key="icao">
-								<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
-							</mapping>
 							<mapping key="primaryElevationAngle">
 								<constraint constraintValue="${elevation}"
 									constraintType="EQUALS" />
@@ -65,38 +62,33 @@
                                 <constraint constraintValue="radar" constraintType="EQUALS"/>
                             </mapping>
                         </metadataMap>
-						<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
-							<resource>
-								<loadProperties loadWithoutData="true">
-									<capabilities>
-										<capability xsi:type="imagingCapability"
-											interpolationState="false" brightness="1.0" contrast="1.0"
-											alpha="1.0" />
-									</capabilities>
-								</loadProperties>
-								<properties isSystemResource="false" isBlinking="false"
-									isMapLayer="false" isHoverOn="false" isVisible="true" />
-								<resourceData xsi:type="radarResourceData"
-									isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-									<metadataMap>
-										<mapping key="productCode">
-											<constraint constraintValue="${product1}"
-												constraintType="EQUALS" />
-										</mapping>
-										<mapping key="icao">
-											<constraint constraintValue="kxxx" constraintType="EQUALS" />
-										</mapping>
-										<mapping key="primaryElevationAngle">
-											<constraint constraintValue="${elevation}"
-												constraintType="EQUALS" />
-										</mapping>
-										<mapping key="pluginName">
-											<constraint constraintValue="radar" constraintType="EQUALS" />
-										</mapping>
-									</metadataMap>
-								</resourceData>
-							</resource>
-						</resourceFactory>
+						<resource>
+							<loadProperties loadWithoutData="true">
+								<capabilities>
+									<capability xsi:type="imagingCapability"
+										interpolationState="false" brightness="1.0" contrast="1.0"
+										alpha="1.0" />
+								</capabilities>
+							</loadProperties>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false" isVisible="true" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+								<metadataMap>
+									<mapping key="productCode">
+										<constraint constraintValue="${product1}"
+											constraintType="EQUALS" />
+									</mapping>
+									<mapping key="primaryElevationAngle">
+										<constraint constraintValue="${elevation}"
+											constraintType="EQUALS" />
+									</mapping>
+									<mapping key="pluginName">
+										<constraint constraintValue="radar" constraintType="EQUALS" />
+									</mapping>
+								</metadataMap>
+							</resourceData>
+						</resource>
                     </resourceData>
                 </resource>
             </descriptor>
@@ -124,9 +116,6 @@
                             <mapping key="productCode">
                                 <constraint constraintValue="${product2}" constraintType="EQUALS"/>
                             </mapping>
-							<mapping key="icao">
-								<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
-							</mapping>
 							<mapping key="primaryElevationAngle">
 								<constraint constraintValue="${elevation}"
 									constraintType="EQUALS" />
@@ -135,38 +124,33 @@
                                 <constraint constraintValue="radar" constraintType="EQUALS"/>
                             </mapping>
                         </metadataMap>
-						<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
-							<resource>
-								<loadProperties loadWithoutData="true">
-									<capabilities>
-										<capability xsi:type="imagingCapability"
-											interpolationState="false" brightness="1.0" contrast="1.0"
-											alpha="1.0" />
-									</capabilities>
-								</loadProperties>
-								<properties isSystemResource="false" isBlinking="false"
-									isMapLayer="false" isHoverOn="false" isVisible="true" />
-								<resourceData xsi:type="radarResourceData"
-									isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-									<metadataMap>
-										<mapping key="productCode">
-											<constraint constraintValue="${product2}"
-												constraintType="EQUALS" />
-										</mapping>
-										<mapping key="icao">
-											<constraint constraintValue="kxxx" constraintType="EQUALS" />
-										</mapping>
-										<mapping key="primaryElevationAngle">
-											<constraint constraintValue="${elevation}"
-												constraintType="EQUALS" />
-										</mapping>
-										<mapping key="pluginName">
-											<constraint constraintValue="radar" constraintType="EQUALS" />
-										</mapping>
-									</metadataMap>
-								</resourceData>
-							</resource>
-						</resourceFactory>
+						<resource>
+							<loadProperties loadWithoutData="true">
+								<capabilities>
+									<capability xsi:type="imagingCapability"
+										interpolationState="false" brightness="1.0" contrast="1.0"
+										alpha="1.0" />
+								</capabilities>
+							</loadProperties>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false" isVisible="true" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+								<metadataMap>
+									<mapping key="productCode">
+										<constraint constraintValue="${product2}"
+											constraintType="EQUALS" />
+									</mapping>
+									<mapping key="primaryElevationAngle">
+										<constraint constraintValue="${elevation}"
+											constraintType="EQUALS" />
+									</mapping>
+									<mapping key="pluginName">
+										<constraint constraintValue="radar" constraintType="EQUALS" />
+									</mapping>
+								</metadataMap>
+							</resourceData>
+						</resource>
                     </resourceData>
                 </resource>
             </descriptor>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml
index adcf639464..efbf17dc5e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml
@@ -42,106 +42,89 @@
 								<constraint constraintValue="37,36,57"
 									constraintType="IN" />
 							</mapping>
-							<mapping key="icao">
-								<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
-							</mapping>
 							<mapping key="pluginName">
 								<constraint constraintValue="radar" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
-						<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
-			            	<resource>
-								<loadProperties>
-									<capabilities>
-										<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-									</capabilities>
-								</loadProperties>
-								<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-								</properties>
-								<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
-									<metadataMap>
-										<mapping key="productCode">
-											<constraint constraintValue="37,36,57" constraintType="IN" />
-										</mapping>
-										<mapping key="icao">
-											<constraint constraintValue="kxxx" constraintType="EQUALS" />
-										</mapping>
-										<mapping key="pluginName">
-											<constraint constraintValue="radar" constraintType="EQUALS" />
-										</mapping>
-									</metadataMap>
-			                        <resource>
-						                <loadProperties>
-				    		            	<capabilities>
-				            		       		<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-				                                <capability xsi:type="rangeRingsOverlayCapability" />
-				                			</capabilities>
-				                		</loadProperties>
-			                            <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-			                            </properties>
-			                            <resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-			                                <metadataMap>
-			                                    <mapping key="productCode">
-			                                        <constraint constraintValue="37" constraintType="EQUALS" />
-			                                    </mapping>
-			                                    <mapping key="icao">
-			                                        <constraint constraintValue="kxxx" constraintType="EQUALS" />
-			                                    </mapping>
-			                                    <mapping key="pluginName">
-			                                        <constraint constraintValue="radar" constraintType="EQUALS" />
-			                                    </mapping>
-			                                </metadataMap>
-			                            </resourceData>
-			                        </resource>
-			                        <resource>
-						                <loadProperties>
-				    		            	<capabilities>
-				            		       		<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-				                                <capability xsi:type="rangeRingsOverlayCapability" />
-				                			</capabilities>
-				                		</loadProperties>
-			                            <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-			                            </properties>
-			                            <resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-			                                <metadataMap>
-			                                    <mapping key="productCode">
-			                                        <constraint constraintValue="36" constraintType="EQUALS" />
-			                                    </mapping>
-			                                    <mapping key="icao">
-			                                        <constraint constraintValue="kxxx" constraintType="EQUALS" />
-			                                    </mapping>
-			                                    <mapping key="pluginName">
-			                                        <constraint constraintValue="radar" constraintType="EQUALS" />
-			                                    </mapping>
-			                                </metadataMap>
-			                            </resourceData>
-			                        </resource>
-			                        <resource>
-						                <loadProperties>
-				    		            	<capabilities>
-				            		       		<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
-				                                <capability xsi:type="rangeRingsOverlayCapability" />
-				                			</capabilities>
-				                		</loadProperties>
-			                            <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
-			                            </properties>
-			                            <resourceData xsi:type="radarResourceData" mode="CZ" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-			                                <metadataMap>
-			                                    <mapping key="productCode">
-			                                        <constraint constraintValue="57" constraintType="EQUALS" />
-			                                    </mapping>
-			                                    <mapping key="icao">
-			                                        <constraint constraintValue="kxxx" constraintType="EQUALS" />
-			                                    </mapping>
-			                                    <mapping key="pluginName">
-			                                        <constraint constraintValue="radar" constraintType="EQUALS" />
-			                                    </mapping>
-			                                </metadataMap>
-			                            </resourceData>
-			                        </resource>
-			                    </resourceData>
-			            	</resource>
-                		</resourceFactory>
+		            	<resource>
+							<loadProperties>
+								<capabilities>
+									<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
+								</capabilities>
+							</loadProperties>
+							<properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
+							</properties>
+							<resourceData xsi:type="bestResResourceData" productIdentifierKey="productCode" retrieveData="false">
+								<metadataMap>
+									<mapping key="productCode">
+										<constraint constraintValue="37,36,57" constraintType="IN" />
+									</mapping>
+									<mapping key="pluginName">
+										<constraint constraintValue="radar" constraintType="EQUALS" />
+									</mapping>
+								</metadataMap>
+		                        <resource>
+					                <loadProperties>
+			    		            	<capabilities>
+			            		       		<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
+			                                <capability xsi:type="rangeRingsOverlayCapability" />
+			                			</capabilities>
+			                		</loadProperties>
+		                            <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
+		                            </properties>
+		                            <resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+		                                <metadataMap>
+		                                    <mapping key="productCode">
+		                                        <constraint constraintValue="37" constraintType="EQUALS" />
+		                                    </mapping>
+		                                    <mapping key="pluginName">
+		                                        <constraint constraintValue="radar" constraintType="EQUALS" />
+		                                    </mapping>
+		                                </metadataMap>
+		                            </resourceData>
+		                        </resource>
+		                        <resource>
+					                <loadProperties>
+			    		            	<capabilities>
+			            		       		<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
+			                                <capability xsi:type="rangeRingsOverlayCapability" />
+			                			</capabilities>
+			                		</loadProperties>
+		                            <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
+		                            </properties>
+		                            <resourceData xsi:type="radarResourceData" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+		                                <metadataMap>
+		                                    <mapping key="productCode">
+		                                        <constraint constraintValue="36" constraintType="EQUALS" />
+		                                    </mapping>
+		                                    <mapping key="pluginName">
+		                                        <constraint constraintValue="radar" constraintType="EQUALS" />
+		                                    </mapping>
+		                                </metadataMap>
+		                            </resourceData>
+		                        </resource>
+		                        <resource>
+					                <loadProperties>
+			    		            	<capabilities>
+			            		       		<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0" />
+			                                <capability xsi:type="rangeRingsOverlayCapability" />
+			                			</capabilities>
+			                		</loadProperties>
+		                            <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
+		                            </properties>
+		                            <resourceData xsi:type="radarResourceData" mode="CZ" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+		                                <metadataMap>
+		                                    <mapping key="productCode">
+		                                        <constraint constraintValue="57" constraintType="EQUALS" />
+		                                    </mapping>
+		                                    <mapping key="pluginName">
+		                                        <constraint constraintValue="radar" constraintType="EQUALS" />
+		                                    </mapping>
+		                                </metadataMap>
+		                            </resourceData>
+		                        </resource>
+		                    </resourceData>
+		            	</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml
index 505dc7fb3f..baac0bff37 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultTDWRRadarMosaic.xml
@@ -24,9 +24,6 @@
 								<constraint constraintValue="${product}"
 									constraintType="IN" />
 							</mapping>
-							<mapping key="icao">
-								<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
-							</mapping>
 							<mapping key="primaryElevationAngle">
 								<constraint constraintValue="${elevation}"
 									constraintType="IN" />
@@ -35,38 +32,33 @@
 								<constraint constraintValue="radar" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
-						<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
-							<resource>
-								<loadProperties loadWithoutData="true">
-									<capabilities>
-										<capability xsi:type="imagingCapability"
-											interpolationState="false" brightness="1.0" contrast="1.0"
-											alpha="1.0" />
-									</capabilities>
-								</loadProperties>
-								<properties isSystemResource="false" isBlinking="false"
-									isMapLayer="false" isHoverOn="false" isVisible="true" />
-								<resourceData xsi:type="radarResourceData"
-									isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
-									<metadataMap>
-										<mapping key="productCode">
-											<constraint constraintValue="${product}"
-												constraintType="IN" />
-										</mapping>
-										<mapping key="icao">
-											<constraint constraintValue="kxxx" constraintType="EQUALS" />
-										</mapping>
-										<mapping key="primaryElevationAngle">
-											<constraint constraintValue="${elevation}"
-												constraintType="IN" />
-										</mapping>
-										<mapping key="pluginName">
-											<constraint constraintValue="radar" constraintType="EQUALS" />
-										</mapping>
-									</metadataMap>
-								</resourceData>
-							</resource>
-						</resourceFactory>
+						<resource>
+							<loadProperties loadWithoutData="true">
+								<capabilities>
+									<capability xsi:type="imagingCapability"
+										interpolationState="false" brightness="1.0" contrast="1.0"
+										alpha="1.0" />
+								</capabilities>
+							</loadProperties>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false" isVisible="true" />
+							<resourceData xsi:type="radarResourceData"
+								isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+								<metadataMap>
+									<mapping key="productCode">
+										<constraint constraintValue="${product}"
+											constraintType="IN" />
+									</mapping>
+									<mapping key="primaryElevationAngle">
+										<constraint constraintValue="${elevation}"
+											constraintType="IN" />
+									</mapping>
+									<mapping key="pluginName">
+										<constraint constraintValue="radar" constraintType="EQUALS" />
+									</mapping>
+								</metadataMap>
+							</resourceData>
+						</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
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 440c760ff1..7c0f2e5781 100755
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
@@ -57,7 +57,7 @@
         <substitute key="colormap" value="Radar/8-bit STP"/>
 		<substitute key="interpolate" value="true"/>
     </contribute>
-	<contribute xsi:type="titleItem" titleText="------ Local Mosaic ------"
+	<contribute xsi:type="titleItem" titleText="------ NEXRAD Mosaic ------"
 		id="RadarMosaic" />
 	<contribute xsi:type="bundleItem" file="bundles/DefaultRadarMosaic.xml"
 		menuText="N0Q - Base Reflectivity" id="Radar05Reflectivity">