From a5ec61fd8cd2e604d21cd36003f36e2b51e3291a Mon Sep 17 00:00:00 2001
From: Michael James <mjames@ucar.edu>
Date: Wed, 17 Jan 2018 11:28:19 -0700
Subject: [PATCH] cave updates for macOS 17.1.1-5

---
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../localization/plotModels/stqPlotDesign.svg |  54 --------
 cave/com.raytheon.uf.viz.d2d.ui/plugin.xml    |   5 -
 .../feature.xml                               |  36 ------
 .../com.raytheon.viz.gfe/META-INF/MANIFEST.MF |   1 -
 .../localization/bundles/maps/nhadomain.xml   |  36 ------
 .../bundles/maps/stormsurgeww.xml             |  36 ------
 .../raytheon/viz/gfe/core/DataManager.java    |  18 ---
 .../localization/bundles/SurfaceColorTemp.xml |   4 +-
 .../localization/bundles/SurfacePlotMetar.xml |  54 ++++----
 .../localization/bundles/SurfacePlotWinds.xml |   5 +
 .../localization/bundles/SynSurfacePlot.xml   |  21 ++-
 .../localization/menus/obs/baseSurface.xml    | 121 +++++++++++++++++-
 .../bundles/satellite/goesr/goesrFullDisk.xml |   2 +-
 .../menus/satellite/goesr/goesrLevel2.xml     |  58 ++++-----
 .../menus/satellite/goesr/goesrMenu.xml       |  24 +---
 .../localization/bundles/maps/ldad.xml        |  46 -------
 .../localization/bundles/maps/ldadPrecip.xml  |  46 -------
 18 files changed, 204 insertions(+), 367 deletions(-)
 delete mode 100644 cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/stqPlotDesign.svg
 delete mode 100644 cave/com.raytheon.viz.gfe/localization/bundles/maps/nhadomain.xml
 delete mode 100644 cave/com.raytheon.viz.gfe/localization/bundles/maps/stormsurgeww.xml
 delete mode 100644 cave/com.raytheon.viz.spi/localization/bundles/maps/ldad.xml
 delete mode 100644 cave/com.raytheon.viz.spi/localization/bundles/maps/ldadPrecip.xml

diff --git a/cave/com.raytheon.uf.viz.d2d.gfe/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.gfe/META-INF/MANIFEST.MF
index 8b76352e51..1b8204fc95 100644
--- a/cave/com.raytheon.uf.viz.d2d.gfe/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.d2d.gfe/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.swt;bundle-version="3.8.1",
  com.raytheon.uf.viz.core;bundle-version="1.14.2",
- com.raytheon.uf.common.dataplugin.gfe;bundle-version="1.15.0",
  com.raytheon.uf.viz.core.grid;bundle-version="1.15.0",
  com.raytheon.uf.common.colormap,
  com.raytheon.uf.common.dataplugin,
@@ -20,7 +19,8 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.8.1",
  com.raytheon.uf.viz.productbrowser,
  com.raytheon.viz.volumebrowser;bundle-version="1.15.0",
  javax.measure,
- com.raytheon.uf.viz.core.maps;bundle-version="1.14.1"
+ com.raytheon.uf.viz.core.maps;bundle-version="1.14.1",
+ com.raytheon.uf.common.dataplugin.gfe;bundle-version="1.15.0"
 Export-Package: com.raytheon.uf.viz.d2d.gfe.browser,
  com.raytheon.uf.viz.d2d.gfe.rsc,
  com.raytheon.uf.viz.d2d.gfe.xy
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/stqPlotDesign.svg b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/stqPlotDesign.svg
deleted file mode 100644
index a5a2507df4..0000000000
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/stqPlotDesign.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<svg width="80" height="80" 
-viewBox="0 0 80 80" 
-overflow="visible" 
-xmlns="http://www.w3.org/2000/svg" 
-xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
-   <defs>
-
-<script type="text/python" plotDelegate="plotDelegate">
-
-class StqPlotDelegate(PlotDelegate):
-    def __init__(self):
-        PlotDelegate.__init__(self)
-
-    def getSampleText(self, rec):
-        projectName = rec.getString("projectName")
-        reqOfficial = rec.getString("reqOfficial")
-        emPhone = rec.getString("emPhone")
-        sampleString = "Project Name: %s\n\tOffcial Name: %s\n\tEmergency Phone: %s"%(projectName,reqOfficial,emPhone)
-
-        return sampleString
-
-plotDelegate = StqPlotDelegate()
-
-</script>
-
-<style type="text/css">
-<![CDATA[
-        @font-face { font-family: "WindSymbolFont";
-                src: url(WindSymbols.svg#WindSymbols); }
-        @font-face { font-family: "StandardFont";
-                src: url(Standard.svg#Standard); }
-        @font-face { font-family: "WxSymbolFont";
-                src: url(WxSymbols.svg#WxSymbols); }
-        @font-face { font-family: "SpecialSymbolFont";
-                src: url(SpecialSymbols.svg#SpecialSymbols); }
-        text.text
-            {
-                fill: none;
-                font-size: 1.2em;
-                stroke-width: 1px;
-                font-family: StandardFont;
-                font-size: 1.2em;
-            }
-]]>
-</style>
-
-<symbol overflow="visible" id="plotData" class="info">
-  <text id="stqsymbol" plotMode="text" class="text" plotParam="stqSymbol" x="0" y="0">0</text>
-  <text id="sample" plotMode="sample" class="text" plotParam="projectName,reqOfficial,emPhone">0</text>
-</symbol>
-</defs>
-<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>
-</svg>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index f5c0e67b7c..c70cd74782 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -121,11 +121,6 @@
                    name="exportSeparator"
                    visible="true">
              </separator>
-             <command
-                   commandId="com.raytheon.uf.viz.image.export.save"
-                   label="Save Image"
-                   style="push">
-             </command>
              <command
                    commandId="com.raytheon.uf.viz.kml.export.exportKML"
                    label="Save KML"
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index 835a0c6d4f..2c2b50cddf 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -113,10 +113,6 @@
          id="com.raytheon.uf.viz.archive.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.nwsauth.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.thinclient.feature"
          version="0.0.0"/>
@@ -153,10 +149,6 @@
          id="com.raytheon.uf.viz.d2d.ui.awips.feature"
          version="0.0.0"/>
 
-   <includes
-         id="edu.wisc.ssec.cimss.viz.convectprob.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.ncep.npp.feature"
          version="0.0.0"/>
@@ -173,38 +165,10 @@
          id="gov.noaa.gsd.viz.ensemble.feature"
          version="0.0.0"/>
 
-   <includes
-         id="gov.noaa.nws.obs.viz.geodata.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="gov.noaa.nws.ocp.uf.viz.gisdatastore.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="gov.noaa.nws.mdl.viz.awipsref.feature"
-         version="0.0.0"/>
-<!--
-   <includes
-         id="gov.noaa.nws.mdl.viz.boundaryTool.common.feature"
-         version="0.0.0"/>
--->
    <includes
          id="com.raytheon.uf.viz.aviation.advisory.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.d2d.gfe.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.viz.gfe.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.uf.viz.ncep.perspective.feature"
-         version="0.0.0"/>
-
    <requires>
       <import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
    </requires>
diff --git a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
index c715caf5e9..b59cc14c8e 100644
--- a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
@@ -34,7 +34,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.viz.kml.export;bundle-version="1.14.1",
  com.raytheon.uf.common.numeric;bundle-version="1.14.0",
  com.raytheon.uf.common.topo;bundle-version="1.14.0",
- com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.14.0",
  com.raytheon.uf.viz.core.grid;bundle-version="1.15.0",
  com.raytheon.uf.common.dataaccess;bundle-version="1.15.0",
  com.raytheon.uf.viz.core.point;bundle-version="1.15.0",
diff --git a/cave/com.raytheon.viz.gfe/localization/bundles/maps/nhadomain.xml b/cave/com.raytheon.viz.gfe/localization/bundles/maps/nhadomain.xml
deleted file mode 100644
index d54cdd1d51..0000000000
--- a/cave/com.raytheon.viz.gfe/localization/bundles/maps/nhadomain.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Created by config_local_shapefiles of config_awips2.sh on Tue Jul 28 
-    19:26:09 GMT 2015 -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="pointCapability"
-                                pointStyle="NONE" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="dbMapResourceData">
-                        <table>mapdata.nhadomain</table>
-                        <mapName>NHAdomain</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.gfe/localization/bundles/maps/stormsurgeww.xml b/cave/com.raytheon.viz.gfe/localization/bundles/maps/stormsurgeww.xml
deleted file mode 100644
index 00b83e3b3b..0000000000
--- a/cave/com.raytheon.viz.gfe/localization/bundles/maps/stormsurgeww.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Created by config_local_shapefiles of config_awips2.sh on Wed Jul 29 
-    19:20:36 GMT 2015 -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="pointCapability"
-                                pointStyle="NONE" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="dbMapResourceData">
-                        <table>mapdata.stormsurgeww</table>
-                        <mapName>StormSurgeWW</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
index 39bc1146aa..b011ab6d8d 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
@@ -38,7 +38,6 @@ import org.eclipse.ui.IWorkbenchWindow;
 import com.raytheon.uf.common.activetable.ActiveTableMode;
 import com.raytheon.uf.common.activetable.ActiveTableRecord;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetIscSendStatusRequest.IscSendStatus;
 import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest.IscQueryResponse;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
@@ -283,25 +282,8 @@ public class DataManager implements ISimulatedTimeChangeListener {
         iscInitJob.setSystem(true);
         iscInitJob.schedule();
 
-        // get the ISC states
-        ServerResponse<IscSendStatus> sr2 = client.iscSendStatus();
-        IscSendStatus iscSendStatus = sr2.getPayload();
-        this.sendISConSave = iscSendStatus.isSendISConSave();
-        this.sendISConPublish = iscSendStatus.isSendISConPublish();
-        this.requestISC = iscSendStatus.isRequestISC();
-
         // set the ISC send state, which initially sends the message
         new ISCSendStatusChangedMsg(false).send(); // initial state
-        if (CAVEMode.getMode().equals(CAVEMode.OPERATIONAL)
-                && ((SimulatedTime.getSystemTime().isRealTime()))
-                || (SimulatedTimeOperations.isTransmitAllowedinSimulatedTime())) {
-            try {
-                enableISCsend(true);
-            } catch (SimulatedTimeProhibitedOpException e) {
-                statusHandler.error(e.getLocalizedMessage(), e);
-            }
-        }
-        // this.queryString = "siteID='" + this.getSiteID() + "'";
         this.router.start();
 
         this.parmOp = new ParmOp(this);
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
index 3702a93c12..973c617287 100644
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
@@ -36,10 +36,10 @@
 						isMapLayer="false" isHoverOn="false"
 						isVisible="true" />
 					<resourceData xsi:type="metarTempResourceData" plotSource="Surface Temps [F]"
-						spiFile="basemaps/MTR.spi"
+						plotModelFile="colorTemp.svg" spiFile="basemaps/MTR.spi"
 						isUpdatingOnMetadataOnly="true" retrieveData="false"
 						isRequeryNecessaryOnTimeMatch="true" isTopOfTheHour="true" pixelSizeHint="45">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
+						<binOffset posOffset="600" negOffset="600" virtualOffset="0"/>
 						<metadataMap>
 							<mapping key="reportType">
 								<constraint constraintValue="METAR" constraintType="EQUALS" />
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotMetar.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotMetar.xml
index 1b919ef404..01f3d92700 100644
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotMetar.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotMetar.xml
@@ -24,34 +24,38 @@
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 			<descriptor xsi:type="mapDescriptor" currentAnimationMode="Temporal">
 				<resource>
-               		<loadProperties loadWithoutData="true">
-                   		<capabilities>
-						    <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
-						    <capability xsi:type="magnificationCapability" magnification="1.25"/>
-						    <capability xsi:type="densityCapability" density="2"/>
-						    <capability xsi:type="colorableCapability" colorAsString="white"/>
-						</capabilities>
-               		</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="METAR"
-						plotModelFile="stdObsDesign.svg" spiFile="basemaps/MTR.spi"
-						isUpdatingOnMetadataOnly="true" retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" isTopOfTheHour="true" pixelSizeHint="45">
-						<binOffset posOffset="600" negOffset="600" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="reportType">
-								<constraint constraintValue="METAR" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="obs" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
+	                <loadProperties loadWithoutData="true">
+                        <capabilities>
+                        </capabilities>
+	                    <resourceType>PLAIN_VIEW</resourceType>
+                    </loadProperties>
+					<resourceData xsi:type="plotBlendedResourceData">	
+						<resource>
+		               		<loadProperties loadWithoutData="true">
+		                   		<capabilities>
+		                   		</capabilities>
+		               		</loadProperties>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false"
+								isVisible="true" />
+							<resourceData xsi:type="plotResourceData" plotSource="METAR"
+								plotModelFile="stdObsDesign.svg" spiFile="basemaps/MTR.spi"
+								isUpdatingOnMetadataOnly="true" retrieveData="false"
+								isRequeryNecessaryOnTimeMatch="true" isTopOfTheHour="true" pixelSizeHint="45">
+								<binOffset posOffset="600" negOffset="600" virtualOffset="0"/>
+								<metadataMap>
+									<mapping key="reportType">
+										<constraint constraintValue="METAR" constraintType="EQUALS" />
+									</mapping>
+									<mapping key="pluginName">
+										<constraint constraintValue="obs" constraintType="EQUALS" />
+									</mapping>
+								</metadataMap>
+							</resourceData>
+						</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
 		</displays>
 	</displayList>
 </bundle>
-
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotWinds.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotWinds.xml
index a3f70e7948..f3a4570480 100644
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotWinds.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlotWinds.xml
@@ -44,6 +44,11 @@
 							<mapping key="reportType">
 								<constraint constraintValue="METAR" constraintType="EQUALS" />
 							</mapping>
+							<!--
+							<mapping key="windSpeed">
+                                <constraint constraintValue="0.01" constraintType="GREATER_THAN" />
+                            </mapping>
+							-->
 							<mapping key="pluginName">
 								<constraint constraintValue="obs" constraintType="EQUALS" />
 							</mapping>
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/SynSurfacePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SynSurfacePlot.xml
index 56b963edf7..d86e331828 100644
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/SynSurfacePlot.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/bundles/SynSurfacePlot.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
 <bundle>
 	<displayList>
 		<displays xsi:type="d2DMapRenderableDisplay"
@@ -27,4 +46,4 @@
 			</descriptor>
 		</displays>
 	</displayList>
-</bundle>
+</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
index 8d5da22270..d0fcdcb4e7 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
@@ -20,19 +20,17 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<contribute xsi:type="bundleItem" file="bundles/SurfaceColorTemp.xml" 
-		menuText="Surface Temperature" id="SurfaceColorTemp">
+		menuText="Surface Temperature" id="MetarPlot">
 	</contribute>
-	<!--
 	<contribute xsi:type="bundleItem" file="bundles/SurfacePlotWinds.xml"
-			menuText="Surface Winds" id="SurfacePlotWinds">
+			menuText="Surface Winds" id="MetarPlot">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/SurfacePlotMetar.xml"
-			menuText="METAR Station Plot" id="SurfacePlotMetar">
+			menuText="METAR Station Plot" id="MetarPlot">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/SurfaceMSLP.xml" 
-			menuText="METAR MSLP Plot" id="SurfaceMSLP">
+			menuText="METAR MSLP Plot" id="MetarPlot">
 	</contribute> 
-	-->
 	<contribute xsi:type="bundleItem" file="bundles/MetarPrecipPlot.xml" 
            menuText="METAR 24hr Precip" id="24HrPrecip">
         <substitute key="duration" value="24"/>
@@ -56,6 +54,117 @@
         <substitute key="duration" value="1"/>
         <substitute key="posOffset" value="1800"/>
         <substitute key="negOffset" value="1800"/>       
+    </contribute>
+	<contribute xsi:type="bundleItem" file="bundles/SynSurfacePlot.xml" 
+			menuText="Synoptic Plot" id="SynSurfacePlot">
+		<substitute key="svg" value="stdSynDesign.svg"/>
+		<substitute key="legend" value="Synoptic Data Plot"/>
+		<substitute key="posOffset" value="19800"/>
+	    <substitute key="negOffset" value="1800"/> 
+	</contribute>
+	<contribute xsi:type="subMenu" menuText="Other Plots">
+		<contribute xsi:type="bundleItem" file="bundles/15minSurfacePlot.xml"
+			menuText="15 min METARs" id="15MinSurfacePlot" />
+	    <contribute xsi:type="bundleItem" file="bundles/MetarPlot.xml" 
+               menuText="24Hr Chg" id="24HrChg">
+	        <substitute key="svg" value="metar24ChgDesign.svg"/>
+	        <substitute key="legend" value="METAR 24H Change"/> 
+	        <substitute key="posOffset" value="1800"/>
+	        <substitute key="negOffset" value="1800"/>    
+	    </contribute>
+	    <contribute xsi:type="bundleItem" file="bundles/MetarPlot.xml" 
+               menuText="Ceil/Vis Plot (AGL)" id="CeilVisPlotAGL">
+	        <substitute key="svg" value="metarCvDesign.svg"/>
+	        <substitute key="legend" value="Ceiling (agl) and Visibility"/> 
+	        <substitute key="posOffset" value="1800"/>
+	        <substitute key="negOffset" value="1800"/>    
+	    </contribute>
+	    <contribute xsi:type="bundleItem" file="bundles/MetarPlot.xml" 
+               menuText="Ceil/Vis Plot (MSL)" id="CeilVisPlotMSL">
+	        <substitute key="svg" value="metarCvMslDesign.svg"/>
+	        <substitute key="legend" value="Ceiling (msl) and Visibility"/>
+	        <substitute key="posOffset" value="1800"/>
+	        <substitute key="negOffset" value="1800"/> 	        
+	    </contribute>
+	    <contribute xsi:type="bundleItem" file="bundles/MetarPlot.xml" 
+               menuText="Wind Ch/HeatIdx" id="WindChHeatIdx">
+	        <substitute key="svg" value="metarHiWcDesign.svg"/>
+	        <substitute key="legend" value="Wind Chill/Heat Index plot"/>
+	        <substitute key="posOffset" value="1800"/>
+	        <substitute key="negOffset" value="1800"/> 	        
+	    </contribute> 
+			
+		<contribute xsi:type="bundleItem" file="bundles/ColoredASOSPlot.xml"
+	            menuText="Colorized SA Station Plot" id="ColoredASOSPlot">
+	            <dataURI>/obs/%</dataURI>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/ColoredStationPlot_Wind.xml" 
+                menuText="Colorized METAR (Wind)" id="ColoredStationPlotWindMETAR">
+	        <substitute key="reptype" value="METAR,SPECI"/>
+	        <substitute key="plgn" value="obs"/>
+	        <substitute key="pkwnd" value="coloredObsPkWindDesign.svg"/>
+	        <substitute key="wnd50P" value="coloredObsWind50PDesign.svg"/>
+	        <substitute key="wnd30T50" value="coloredObsWind30T50Design.svg"/>
+	        <substitute key="wndobslow" value="coloredObsWindLowDesign.svg"/>
+	        <substitute key="wxplot" value="coloredObsWxDesign.svg"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/ColoredStationPlot_CV.xml" 
+		                menuText="Colorized METAR (C/V)" id="ColoredStationPlotCVMETAR">
+		        <substitute key="reptype" value="METAR,SPECI"/>
+		        <substitute key="plgn" value="obs"/>
+		        <substitute key="transsky" value="coloredObsTransCloudDesign.svg"/>
+		        <substitute key="obscvfr" value="coloredObsObscVFRCloudDesign.svg"/>
+		        <substitute key="obscmvfr" value="coloredObsObscMVFRCloudDesign.svg"/>
+		        <substitute key="obscifr" value="coloredObsObscIFRCloudDesign.svg"/>
+		        <substitute key="obsclifr" value="coloredObsObscLIFRCloudDesign.svg"/>
+		        <substitute key="wxplot" value="coloredObsWxDesign.svg"/>
+		        <substitute key="offset" value="900"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/ColoredMaritimePlot_Wind.xml" 
+		                menuText="Colorized Maritime (Wind)" id="ColoredMaritimePlotWind">
+		        <substitute key="reptype" value="1003,1004,1005,1006"/>
+		        <substitute key="plgn" value="sfcobs"/>
+		        <substitute key="pkwnd" value="coloredMaritimePkWindDesign.svg"/>
+		        <substitute key="wnd64P" value="coloredMaritimeWind64PDesign.svg"/>
+		        <substitute key="wnd48T64" value="coloredMaritimeWind48T64Design.svg"/>
+		        <substitute key="wnd34T48" value="coloredMaritimeWind34T48Design.svg"/>
+		        <substitute key="wnd20T34" value="coloredMaritimeWind20T34Design.svg"/>
+		        <substitute key="wndmarlow" value="coloredMaritimeWindLowDesign.svg"/>
+		        <substitute key="wxplot" value="coloredMaritimeWxDesign.svg"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/ColoredStationPlot_CV.xml" 
+		                menuText="Colorized Maritime (C/V)" id="ColoredStationPlotCVMaritime">
+		        <substitute key="reptype" value="1003,1004,1005,1006"/>
+		        <substitute key="plgn" value="sfcobs"/>
+		        <substitute key="transsky" value="coloredMaritimeTransCloudDesign.svg"/>
+		        <substitute key="obscvfr" value="coloredMaritimeObscVFRCloudDesign.svg"/>
+		        <substitute key="obscmvfr" value="coloredMaritimeObscMVFRCloudDesign.svg"/>
+		        <substitute key="obscifr" value="coloredMaritimeObscIFRCloudDesign.svg"/>
+		        <substitute key="obsclifr" value="coloredMaritimeObscLIFRCloudDesign.svg"/>
+		        <substitute key="wxplot" value="coloredMaritimeWxDesign.svg"/>
+		        <substitute key="offset" value="1800"/>
+		</contribute>
+        <contribute xsi:type="separator" id="PrecipSeparator"/>
+	    
+	    <contribute xsi:type="titleItem" 
+			titleText="------ Precip ------" id="PrecipLine"/>
+
+	    
+		<contribute xsi:type="bundleItem" file="bundles/SynSurfacePlot.xml" 
+			menuText="Synoptic 6 hr Precip" id="synoptic6hrPrecip">
+			<substitute key="svg" value="synopticPrcp6Design.svg"/>
+			<substitute key="legend" value="Synoptic 6hr Precip Plot"/>
+			<substitute key="posOffset" value="0"/>
+		    <substitute key="negOffset" value="21600"/> 
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/SynSurfacePlot.xml" 
+				menuText="Synoptic 24 hr Precip" id="synoptic24hrPrecip">
+			<substitute key="svg" value="synopticPrcp24Design.svg"/>
+			<substitute key="legend" value="Synoptic 24hr Precip Plot"/>
+			<substitute key="posOffset" value="0"/>
+		    <substitute key="negOffset" value="43200"/> 
+		</contribute>
+		
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/Redbook.xml" 
               menuText="MSLP Analysis" id="MSLPressureAnalysis">
diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrFullDisk.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrFullDisk.xml
index cc1d08bae6..84e5ded026 100644
--- a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrFullDisk.xml
+++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrFullDisk.xml
@@ -36,7 +36,7 @@
 									constraintType="EQUALS" />
 							</mapping>
 							<mapping key="sectorID">
-								<constraint constraintValue="TFD"
+								<constraint constraintValue="EFD"
 									constraintType="EQUALS" />
 							</mapping>
 							<mapping key="creatingEntity">
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2.xml
index 40d42b4e66..8241e12861 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2.xml
@@ -7,56 +7,56 @@
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="ADP"/>
         <substitute key="colormap" value="Sat/GOESR-L2/ADP"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Aerosol Optical Depth" id="goesr-aod">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="AOD"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Clear Sky Mask" id="goesr-csm">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="CSM"/>
         <substitute key="colormap" value="Sat/GOESR-L2/CSM"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Optical Depth" id="goesr-cod">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="COD"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Particle Size" id="goesr-cth">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="CPSD"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Top Height" id="goesr-cth">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="CTH"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Top Phase" id="goesr-actp">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="ACTP"/>
         <substitute key="colormap" value="Sat/GOESR-L2/ACTP"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Top Pressure" id="goesr-ctp">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="CTP"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
    
     <contribute xsi:type="separator" id="id"/>
@@ -66,35 +66,35 @@
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="CAPE"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Derived K-Index" id="goesr-ki">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="KI"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Derived Lifted Index" id="goer-li">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="LI"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Derived Showalter Index" id="goer-si">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="SI"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Derived Total Totals" id="goer-tt">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="TT"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     
     <contribute xsi:type="separator" id="id"/>
@@ -104,21 +104,21 @@
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="FDC Area"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Fire Power" id="goesr-fdc-power">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="FDC Power"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Fire Temperature" id="goesr-fdc-temp">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="FDC Temp"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     
     <contribute xsi:type="separator" id="id"/>
@@ -128,21 +128,21 @@
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="LST"/>
         <substitute key="colormap" value="Sat/GOESR-L2/VTRSB"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Snow Cover" id="goesr-fsc">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="FSC"/>
         <substitute key="colormap" value="Sat/GOESR-L2/FSC"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Total Precip Water" id="goesr-tpw">
         <substitute key="entity" value="GOES-16" />
         <substitute key="element" value="TPW"/>
         <substitute key="colormap" value="Sat/Precip Water/Precip Water - New CIMSS Table"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
     </contribute>
     
     <contribute xsi:type="separator" id="id"/>
@@ -151,54 +151,54 @@
                 menuText="Moisture(11.2-12.3 u)" id="goesr-moisture">
         <substitute key="element" value="satMoisture"/>
         <substitute key="colormap" value="Grid/gridded data"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
         <substitute key="entity" value="GOES-16" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Phase(8.5-11.2 u)" id="goesr-cloud-phase">
         <substitute key="element" value="satCloudPhase"/>
         <substitute key="colormap" value="Grid/gridded data"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
         <substitute key="entity" value="GOES-16" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Fog (3.9-11.2 u)" id="goesr-fog">
         <substitute key="element" value="satFog"/>
         <substitute key="colormap" value="Grid/gridded data"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
         <substitute key="entity" value="GOES-16" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Snow (0.64-1.61 u)" id="goesr-snow">
         <substitute key="element" value="satSnow"/>
         <substitute key="colormap" value="Grid/gridded data"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
         <substitute key="entity" value="GOES-16" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Vegetation (0.64-0.87 u)" id="goesr-vegetation">
         <substitute key="element" value="satVegetation"/>
         <substitute key="colormap" value="Grid/gridded data"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
         <substitute key="entity" value="GOES-16" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Upper Level Info(11.2-6.19 u)" id="goesr-upper-level-info">
         <substitute key="element" value="satUpperLevelInfo"/>
         <substitute key="colormap" value="Grid/gridded data"/>
-        <substitute key="sector" value="TCONUS" />
+        <substitute key="sector" value="ECONUS" />
         <substitute key="entity" value="GOES-16" />
     </contribute>
     
     <contribute xsi:type="separator" id="id"/>
 
     <contribute xsi:type="subinclude" subMenu="Full Disk" fileName="menus/satellite/goesr/goesrLevel2FullDisk.xml" >
-      <substitute key="sector" value="TFD" />
+      <substitute key="sector" value="EFD" />
     </contribute>
     <contribute xsi:type="subinclude" subMenu="Mesoscale Sector 1" fileName="menus/satellite/goesr/goesrLevel2Meso.xml" >
-      <substitute key="sector" value="TMESO-1" />
+      <substitute key="sector" value="EMESO-1" />
     </contribute>
     <contribute xsi:type="subinclude" subMenu="Mesoscale Sector 2" fileName="menus/satellite/goesr/goesrLevel2Meso.xml" >
-      <substitute key="sector" value="TMESO-2" />
+      <substitute key="sector" value="EMESO-2" />
     </contribute>
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml
index 603bceda2c..8d0435febf 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml
@@ -25,29 +25,7 @@
         <contribute xsi:type="subMenu" menuText="Full Disk Imagery" id="goesrFullDisk">
         	<contribute xsi:type="subinclude" fileName="menus/satellite/goesr/goesrFullDiskByChannel.xml"/>
         </contribute>
-        
-        <contribute xsi:type="titleItem" titleText="------ RGB Composites ------" id="goesrRGBComposites"/>
-	    <contribute xsi:type="subinclude" subMenu="CONUS"
-	        fileName="menus/satellite/goesr/goesrRGBComposites.xml">
-	        <substitute key="sector" value="ECONUS" />
-	        <substitute key="entity" value="GOES-16" />
-	    </contribute>
-	    <contribute xsi:type="subinclude" subMenu="Full Disk"
-	        fileName="menus/satellite/goesr/goesrRGBComposites.xml">
-	        <substitute key="sector" value="EFD" />
-	        <substitute key="entity" value="GOES-16" />
-	    </contribute>
-	    <contribute xsi:type="subinclude" subMenu="Mesoscale 1"
-	        fileName="menus/satellite/goesr/goesrRGBComposites.xml">
-	        <substitute key="sector" value="EMESO-1" />
-	        <substitute key="entity" value="GOES-16" />
-	    </contribute>
-	    <contribute xsi:type="subinclude" subMenu="Mesoscale 2"
-	        fileName="menus/satellite/goesr/goesrRGBComposites.xml">
-	        <substitute key="sector" value="EMESO-2" />
-	        <substitute key="entity" value="GOES-16" />
-	    </contribute>
-	        
+       
         <contribute xsi:type="titleItem" titleText="------ By Sector ------" id="goesrBySector"/>
         <contribute xsi:type="subinclude" subMenu="All Channels" fileName="menus/satellite/goesr/goesrBySectorByChannel.xml" />
         <contribute xsi:type="subinclude" subMenu="Level 2 Products" fileName="menus/satellite/goesr/goesrLevel2.xml" />
diff --git a/cave/com.raytheon.viz.spi/localization/bundles/maps/ldad.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/ldad.xml
deleted file mode 100644
index 93b7e51be3..0000000000
--- a/cave/com.raytheon.viz.spi/localization/bundles/maps/ldad.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/ldad15.spi</filename>
-                        <mapName>LDAD Stations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.spi/localization/bundles/maps/ldadPrecip.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/ldadPrecip.xml
deleted file mode 100644
index a0c7214bab..0000000000
--- a/cave/com.raytheon.viz.spi/localization/bundles/maps/ldadPrecip.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/ldad15prcp.spi</filename>
-                        <mapName>LDAD Precip</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>