diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml index ad49ec6a27..91abe2f3ea 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml @@ -22,7 +22,7 @@ - + - + - + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/hfoGoes.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/hfoGoes.xml index 6c36019466..ab7f8874d0 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/hfoGoes.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/hfoGoes.xml @@ -36,7 +36,7 @@ - + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml index 92e30a4c9e..95b41cda39 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml @@ -135,7 +135,7 @@ - + diff --git a/docs/python/satellite-imagery.md b/docs/python/satellite-imagery.md index 01ec26db1d..295fc18d04 100644 --- a/docs/python/satellite-imagery.md +++ b/docs/python/satellite-imagery.md @@ -51,7 +51,7 @@ Available sectors and products - Imager Visible * East CONUS: - Imager 11 micron IR - - Imager 13 micron (IR) + - Imager 13 micron IR - Imager 3.9 micron IR - Imager 6.7-6.5 micron IR (WV) - Imager Visible @@ -104,7 +104,7 @@ Available sectors and products - Sounder Visible imagery * Hawaii Regional: - Imager 11 micron IR - - Imager 13 micron (IR) + - Imager 13 micron IR - Imager 3.9 micron IR - Imager 6.7-6.5 micron IR (WV) - Imager Visible @@ -136,7 +136,7 @@ Available sectors and products - Sounder Based Derived Precipitable Water (PW) * Puerto Rico Regional: - Imager 11 micron IR - - Imager 13 micron (IR) + - Imager 13 micron IR - Imager 3.9 micron IR - Imager 6.7-6.5 micron IR (WV) - Imager Visible @@ -153,7 +153,7 @@ Available sectors and products - Sounder Based Derived Surface Skin Temp (SFC Skin) * West CONUS: - Imager 11 micron IR - - Imager 13 micron (IR) + - Imager 13 micron IR - Imager 3.9 micron IR - Imager 6.7-6.5 micron IR (WV) - Imager Visible diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java index 37dfb5ae41..529a3cd8cc 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java @@ -101,7 +101,7 @@ public class D2DSatDatabase extends VGridDatabase { *
      * "East CONUS/Imager Visible"
      * "East CONUS/Imager 11 micron IR"
-     * "East CONUS/Imager 13 micron (IR)"
+     * "East CONUS/Imager 13 micron IR"
      * "East CONUS/Imager 3.9 micron IR"
      * 
* diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py index e67458b5c0..53b603dc25 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py @@ -2685,7 +2685,7 @@ else: #######DCS3501 WEST_CONUS # # "East CONUS/Imager Visible" # "East CONUS/Imager 11 micron IR" -# "East CONUS/Imager 13 micron (IR)" +# "East CONUS/Imager 13 micron IR" # "East CONUS/Imager 3.9 micron IR" # @@ -2701,7 +2701,7 @@ elif SID == "HFO": elif SID == "SJU": SATDATA = [("East CONUS/Imager Visible", "visibleEast"), ("East CONUS/Imager 11 micron IR", "ir11East"), - ("East CONUS/Imager 13 micron (IR)", "ir13East"), + ("East CONUS/Imager 13 micron IR", "ir13East"), ("East CONUS/Imager 3.9 micron IR", "ir39East"), ("East CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporEast")] @@ -2713,12 +2713,12 @@ elif SID == "GUM": else: SATDATA = [("West CONUS/Imager Visible", "visibleWest"), ("West CONUS/Imager 11 micron IR", "ir11West"), - ("West CONUS/Imager 13 micron (IR)", "ir13West"), + ("West CONUS/Imager 13 micron IR", "ir13West"), ("West CONUS/Imager 3.9 micron IR", "ir39West"), ("West CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporWest"), ("East CONUS/Imager Visible", "visibleEast"), ("East CONUS/Imager 11 micron IR", "ir11East"), - ("East CONUS/Imager 13 micron (IR)", "ir13East"), + ("East CONUS/Imager 13 micron IR", "ir13East"), ("East CONUS/Imager 3.9 micron IR", "ir39East"), ("East CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporEast")] diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml index f31c3ef789..e8cdf54071 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml index c20467dfa3..0730b8a7a7 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml @@ -47,7 +47,7 @@ Imager 11 micron IR Imager 12 micron IR - Imager 13 micron (IR) + Imager 13 micron IR Imager 13 micron IR diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java index e05d706143..126959b3f3 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java @@ -520,7 +520,7 @@ public class GiniSatelliteDecoder { */ if ((mapProjection == SatSpatialFactory.PROJ_LAMBERT) && (record.getPhysicalElement() - .equalsIgnoreCase("Imager 13 micron (IR)")) + .equalsIgnoreCase("Imager 13 micron IR")) && (record.getSectorID() .equalsIgnoreCase("West CONUS"))) { nx = 1100; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/physicalElements.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/physicalElements.xml index 3674f948ce..18e1ce1a0b 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/physicalElements.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/physicalElements.xml @@ -24,7 +24,7 @@ - +