From a9db8e6eb55d4f525bdc82903d7fcbde8cdf5afb Mon Sep 17 00:00:00 2001
From: ucar-tmeyer <tiffanym@ucar.edu>
Date: Tue, 24 Jan 2023 14:58:33 +0000
Subject: [PATCH] Removed LDAD surface obs and added GOES-R Viz plugin to
 awips.product for RPM building

---
 .../feature.xml                               | 18 ------------
 .../localization/bundles/SurfacePlot.xml      | 29 ++-----------------
 .../awips.product                             |  1 +
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
index fe5a62440e..f5140af1b4 100644
--- a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
@@ -110,17 +110,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.dataplugin.ldad"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.raytheon.uf.common.dataplugin.ldadmesonet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
 
    <plugin
          id="com.raytheon.uf.common.dataplugin.lsr"
@@ -136,13 +125,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.dataplugin.qc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.svrwx"
          download-size="0"
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml
index ac5a608161..ce82e6170e 100644
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml
@@ -43,7 +43,7 @@
                                 isBlinking="false" isMapLayer="false"
                                 isHoverOn="false" isVisible="true" />
                             <resourceData xsi:type="plotResourceData"
-                                plotSource="METAR/Maritime/LDAD"
+                                plotSource="METAR/Maritime"
                                 plotModelFile="stdObsDesign.svg"
                                 spiFile="basemaps/MTR.spi"
                                 isUpdatingOnMetadataOnly="true"
@@ -68,7 +68,7 @@
                                 isBlinking="false" isMapLayer="false"
                                 isHoverOn="false" isVisible="true" />
                             <resourceData xsi:type="plotResourceData"
-                                plotSource="METAR/Maritime/LDAD"
+                                plotSource="METAR/Maritime"
                                 plotModelFile="maritimeDesign.svg"
                                 isUpdatingOnMetadataOnly="true"
                                 retrieveData="false"
@@ -89,32 +89,9 @@
                                 </metadataMap>
                             </resourceData>
                         </resource>
-                        <resource>
-                            <loadProperties
-                                loadWithoutData="true" />
-                            <properties isSystemResource="false"
-                                isBlinking="false" isMapLayer="false"
-                                isHoverOn="false" isVisible="true" />
-                            <resourceData xsi:type="plotResourceData"
-                                plotSource="METAR/Maritime/LDAD"
-                                plotModelFile="ldadMesoDesign.svg"
-                                isUpdatingOnMetadataOnly="true"
-                                retrieveData="false"
-                                isRequeryNecessaryOnTimeMatch="true">
-                                <binOffset posOffset="1800"
-                                    negOffset="1800" virtualOffset="0" />
-                                <metadataMap>
-                                    <mapping key="pluginName">
-                                        <constraint
-                                            constraintValue="ldadmesonet"
-                                            constraintType="EQUALS" />
-                                    </mapping>
-                                </metadataMap>
-                            </resourceData>
-                        </resource>
                     </resourceData>
                 </resource>
             </descriptor>
         </displays>
     </displayList>
-</bundle>
\ No newline at end of file
+</bundle>
diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product
index 3ac9729b4e..bcbdddc5aa 100644
--- a/cave/com.raytheon.viz.product.awips/awips.product
+++ b/cave/com.raytheon.viz.product.awips/awips.product
@@ -127,6 +127,7 @@
       <feature id="com.raytheon.uf.viz.ffmp.feature"/>
       <feature id="com.raytheon.uf.viz.scan.feature"/>
       <feature id="com.raytheon.uf.viz.fssobs.feature"/>
+      <feature id="com.raytheon.uf.viz.satellite.goesr.feature" installMode="root"/>
    </features>
 
    <configurations>