From 8e336dfa7894583b04320b2353f2a710d0b011fb Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 13 Sep 2016 12:43:42 -0600 Subject: [PATCH] remove goesr from awips2-builds --- .../.project | 17 - .../build.properties | 1 - .../feature.xml | 39 - .../.classpath | 7 - .../.project | 28 - .../META-INF/MANIFEST.MF | 23 - .../build.properties | 6 - .../bundles/satellite/GoesrLegacyProfile.xml | 47 - .../satellite/GoesrLegacyProfileMap.xml | 47 - .../menus/satellite/goesr/profile-index.xml | 31 - .../menus/satellite/goesr/profileByPoint.xml | 75 - .../menus/satellite/goesr/profileMenu.xml | 67 - .../plugin.xml | 31 - .../GoesrLegacyProfileResourceData.java | 162 --- .../GoesrLegacySoundingProvider.java | 171 --- .../legacyprofile/GoesrProfileBuilder.java | 165 --- .../map/GoesrProfileMapInputHandler.java | 170 --- .../map/GoesrProfileMapResource.java | 340 ----- .../map/GoesrProfileMapResourceData.java | 61 - .../.classpath | 7 - .../.project | 28 - .../META-INF/MANIFEST.MF | 12 - .../build.properties | 5 - .../dataplugin/goesr/dmw/DMWRecord.java | 245 ---- .../satellite/goesr/DerivedMotionWinds.xml | 173 --- .../base/menus/satellite/goesr/dmw-index.xml | 25 - .../menus/satellite/goesr/dmwByChannel.xml | 126 -- .../base/menus/satellite/goesr/dmwByScene.xml | 38 - .../base/menus/satellite/goesr/dmwMenu.xml | 31 - .../base/plotModels/goesr/dmwPlotDesign.svg | 49 - .../.project | 17 - .../build.properties | 1 - .../feature.xml | 41 - .../.classpath | 7 - .../.project | 28 - .../META-INF/MANIFEST.MF | 20 - .../build.properties | 5 - .../res/pointdata/dmwdb.xml | 30 - .../res/spring/dmw-common.xml | 20 - .../res/spring/dmw-ingest.xml | 51 - .../uf/edex/plugin/goesr/dmw/dao/DMWDao.java | 130 -- .../plugin/goesr/dmw/decoder/DMWDecoder.java | 312 ---- .../base/purge/dmwPurgeRules.xml | 6 - .../edex_static/base/distribution/dmw.xml | 23 - .../base/plugin-filters/dmw_filters.xml | 32 - .../.classpath | 7 - .../.project | 28 - .../META-INF/MANIFEST.MF | 20 - .../build.properties | 5 - .../com.raytheon.uf.edex.plugin.goesr.ecl | 0 .../documents/GOESR_CONUS.xml | 124 -- .../documents/GOESR_FullDisk.xml | 119 -- .../documents/GOESR_Mesoscale.xml | 125 -- .../documents/ncml-2.2.xsd | 273 ---- .../res/spring/goesr-ingest.xml | 57 - .../uf/edex/plugin/goesr/GoesrDecoder.java | 243 ---- .../decoder/lookup/AttributeMatcher.java | 96 -- .../goesr/decoder/lookup/AttributeValue.java | 163 --- .../goesr/decoder/lookup/DataDescription.java | 425 ------ .../decoder/lookup/DataMaskDescription.java | 83 -- .../decoder/lookup/DateAttributeValue.java | 74 - .../decoder/lookup/ProductDescription.java | 259 ---- .../decoder/lookup/ProductDescriptions.java | 73 - .../exception/GoesrDecoderException.java | 51 - .../exception/GoesrProjectionException.java | 67 - .../geospatial/GoesrProjectionFactory.java | 226 --- .../geospatial/GoesrSatelliteHeight.java | 64 - .../crs/GeostationaryCrsFactory.java | 75 - .../goesr/geospatial/crs/GoesrCrsFactory.java | 169 --- .../crs/LambertConformalCrsFactory.java | 64 - .../geospatial/crs/MercatorCrsFactory.java | 65 - .../NorthPolarStereographicCrsFactory.java | 65 - .../AbstractCenterEnvelopeFactory.java | 148 -- .../AbstractDimensionEnvelopeFactory.java | 121 -- .../envelope/DimensionEnvelopeFactory.java | 93 -- .../geospatial/envelope/GoesrEnvelope.java | 128 -- .../envelope/GoesrEnvelopeFactory.java | 59 - .../envelope/ImageBoundsEnvelopeFactory.java | 116 -- .../ProductCenterEnvelopeFactory.java | 122 -- .../envelope/TileCenterEnvelopeFactory.java | 98 -- .../satellite/goesr/goesrBestResConus.xml | 191 --- .../satellite/goesr/goesrBestResRegion.xml | 164 --- .../satellite/goesr/goesrConusLegacyBlend.xml | 89 -- .../satellite/goesr/goesrRGBComposite.xml | 97 -- .../base/colormaps/Sat/GOESR-L2/ACTP.cmap | 29 - .../base/colormaps/Sat/GOESR-L2/ADP.cmap | 31 - .../base/colormaps/Sat/GOESR-L2/CSM.cmap | 25 - .../base/colormaps/Sat/GOESR-L2/FSC.cmap | 473 ------ .../base/colormaps/Sat/GOESR-L2/RRQPE.cmap | 622 -------- .../base/colormaps/Sat/GOESR-L2/VTRSB.cmap | 1273 ----------------- .../base/colormaps/Sat/IR/CIMSS_IR.cmap | 264 ---- .../base/colormaps/Sat/WV/CIMSS_WV.cmap | 264 ---- .../base/colormaps/Sat/WV/CIMSS_WV2.cmap | 261 ---- .../definitions/satCloudPhase.xml | 26 - .../derivedParameters/definitions/satFog.xml | 26 - .../definitions/satMoisture.xml | 26 - .../derivedParameters/definitions/satSnow.xml | 26 - .../definitions/satUpperLevelInfo.xml | 26 - .../definitions/satVegetation.xml | 26 - .../menus/satellite/goesr/goesr-index.xml | 35 - .../goesr/goesrBestResConusByChannel.xml | 118 -- .../goesr/goesrBestResRegionByChannel.xml | 118 -- .../menus/satellite/goesr/goesrByChannel.xml | 102 -- .../goesr/goesrBySectorByChannel.xml | 77 - .../goesr/goesrBySectorLocallyDerived.xml | 77 - .../goesr/goesrBySectorRGBComposites.xml | 77 - .../satellite/goesr/goesrConusWithLegacy.xml | 40 - .../menus/satellite/goesr/goesrLevel2.xml | 46 - .../satellite/goesr/goesrLevel2Conus.xml | 84 -- .../menus/satellite/goesr/goesrLevel2Fire.xml | 40 - .../satellite/goesr/goesrLevel2FullDisk.xml | 103 -- .../menus/satellite/goesr/goesrLevel2Meso.xml | 71 - .../satellite/goesr/goesrLevel2Stability.xml | 52 - .../satellite/goesr/goesrLevel2Volcano.xml | 34 - .../satellite/goesr/goesrLocallyDerived.xml | 52 - .../base/menus/satellite/goesr/goesrMenu.xml | 68 - .../satellite/goesr/goesrRGBComposites.xml | 43 - .../satellite/himawari/himawari-index.xml | 35 - .../satellite/himawari/himawariByChannel.xml | 102 -- .../menus/satellite/himawari/himawariMenu.xml | 27 - .../base/purge/satellitePurgeRulesGOESR.xml | 68 - .../purge/satellitePurgeRulesHimawari.xml | 28 - .../goesr/descriptions/Level2/ACTP.xml | 30 - .../goesr/descriptions/Level2/ADP.xml | 47 - .../goesr/descriptions/Level2/AOD.xml | 31 - .../goesr/descriptions/Level2/COD.xml | 31 - .../goesr/descriptions/Level2/CPSD.xml | 31 - .../goesr/descriptions/Level2/CSM.xml | 30 - .../goesr/descriptions/Level2/CTH.xml | 36 - .../goesr/descriptions/Level2/CTP.xml | 30 - .../goesr/descriptions/Level2/CTT.xml | 30 - .../goesr/descriptions/Level2/DSI.xml | 75 - .../goesr/descriptions/Level2/FDC.xml | 47 - .../goesr/descriptions/Level2/FSC.xml | 34 - .../descriptions/Level2/GOES-East-Sectors.xml | 46 - .../descriptions/Level2/GOES-West-Sectors.xml | 46 - .../Level2/Level2CommonDescription.xml | 46 - .../goesr/descriptions/Level2/RRQPE.xml | 31 - .../goesr/descriptions/Level2/SST.xml | 30 - .../goesr/descriptions/Level2/TPW.xml | 30 - .../goesr/descriptions/Level2/VAA.xml | 39 - .../goesr/descriptions/Level2/VMP.xml | 31 - .../goesr/descriptions/Level2/VTP.xml | 30 - .../satellite/goesr/descriptions/README.txt | 40 - .../Sectorized_CMI/CMIDataDescription.xml | 31 - .../Sectorized_CMI/GOES-East-Sectors.xml | 53 - .../Sectorized_CMI/GOES-West-Sectors.xml | 57 - .../Sectorized_CMI/Himawari-Sectors.xml | 26 - .../styleRules/goesrCMI-ImageryStyleRules.xml | 82 -- .../goesrDerivedImageryStyleRules.xml | 100 -- .../styleRules/goesrL2-ImageryStyleRules.xml | 446 ------ .../styleRules/himawariImageryStyleRules.xml | 85 -- .../edex_static/base/distribution/goesr.xml | 8 - 153 files changed, 14000 deletions(-) delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.feature/.project delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.feature/build.properties delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.feature/feature.xml delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.classpath delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.project delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/META-INF/MANIFEST.MF delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/build.properties delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfile.xml delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileByPoint.xml delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileMenu.xml delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/plugin.xml delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacyProfileResourceData.java delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacySoundingProvider.java delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrProfileBuilder.java delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapInputHandler.java delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResource.java delete mode 100644 cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResourceData.java delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.classpath delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.project delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/META-INF/MANIFEST.MF delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/build.properties delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/src/com/raytheon/uf/common/dataplugin/goesr/dmw/DMWRecord.java delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/bundles/satellite/goesr/DerivedMotionWinds.xml delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmw-index.xml delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByChannel.xml delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByScene.xml delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwMenu.xml delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/plotModels/goesr/dmwPlotDesign.svg delete mode 100644 edexOsgi/com.raytheon.uf.edex.goesr.feature/.project delete mode 100644 edexOsgi/com.raytheon.uf.edex.goesr.feature/build.properties delete mode 100644 edexOsgi/com.raytheon.uf.edex.goesr.feature/feature.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.classpath delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.project delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/META-INF/MANIFEST.MF delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/build.properties delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/pointdata/dmwdb.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-common.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-ingest.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/dao/DMWDao.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/decoder/DMWDecoder.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/common_static/base/purge/dmwPurgeRules.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/distribution/dmw.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/plugin-filters/dmw_filters.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/.classpath delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/.project delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/META-INF/MANIFEST.MF delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/build.properties delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/com.raytheon.uf.edex.plugin.goesr.ecl delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_CONUS.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_FullDisk.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_Mesoscale.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/ncml-2.2.xsd delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/res/spring/goesr-ingest.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/GoesrDecoder.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeMatcher.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeValue.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataDescription.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataMaskDescription.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DateAttributeValue.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescription.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescriptions.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrDecoderException.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrProjectionException.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrProjectionFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrSatelliteHeight.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GeostationaryCrsFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GoesrCrsFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/LambertConformalCrsFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/MercatorCrsFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/NorthPolarStereographicCrsFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractCenterEnvelopeFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractDimensionEnvelopeFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/DimensionEnvelopeFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelope.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelopeFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ImageBoundsEnvelopeFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ProductCenterEnvelopeFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/TileCenterEnvelopeFactory.java delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResConus.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResRegion.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrConusLegacyBlend.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrRGBComposite.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ACTP.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ADP.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/CSM.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/FSC.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/RRQPE.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/VTRSB.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/IR/CIMSS_IR.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV2.cmap delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satFog.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satMoisture.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satSnow.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satVegetation.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesr-index.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResConusByChannel.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResRegionByChannel.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrByChannel.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorByChannel.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorLocallyDerived.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorRGBComposites.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrConusWithLegacy.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Conus.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Fire.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2FullDisk.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Meso.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Stability.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Volcano.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLocallyDerived.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrMenu.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrRGBComposites.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawari-index.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariByChannel.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariMenu.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesGOESR.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesHimawari.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ACTP.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ADP.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/AOD.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/COD.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CPSD.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CSM.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTH.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTP.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTT.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/DSI.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FDC.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FSC.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-East-Sectors.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-West-Sectors.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/Level2CommonDescription.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/RRQPE.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/SST.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/TPW.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VAA.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VMP.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VTP.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/README.txt delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/CMIDataDescription.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-East-Sectors.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-West-Sectors.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/Himawari-Sectors.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrCMI-ImageryStyleRules.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrDerivedImageryStyleRules.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrL2-ImageryStyleRules.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/himawariImageryStyleRules.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/edex_static/base/distribution/goesr.xml diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.feature/.project b/cave/com.raytheon.uf.viz.satellite.goesr.feature/.project deleted file mode 100644 index 570f2cda5b..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - com.raytheon.uf.viz.satellite.goesr.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.feature/build.properties b/cave/com.raytheon.uf.viz.satellite.goesr.feature/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.feature/feature.xml b/cave/com.raytheon.uf.viz.satellite.goesr.feature/feature.xml deleted file mode 100644 index c7c32bc499..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.feature/feature.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Contains plugin(s) that allow custom visualization for data from the GOES-R series of satellites. - - - -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. - - - - - diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.classpath b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.classpath deleted file mode 100644 index 098194ca4b..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.project b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.project deleted file mode 100644 index 1c2782d855..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.raytheon.uf.viz.satellite.goesr.legacyprofile - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/META-INF/MANIFEST.MF deleted file mode 100644 index 1a9e50d412..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/META-INF/MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: GOES-R Legacy Profile Displays -Bundle-SymbolicName: com.raytheon.uf.viz.satellite.goesr.legacyprofile;singleton:=true -Bundle-Version: 1.15.0.qualifier -Bundle-Vendor: Raytheon -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: com.raytheon.uf.viz.d2d.nsharp;bundle-version="1.14.1", - com.raytheon.uf.viz.core;bundle-version="1.14.6", - gov.noaa.nws.ncep.edex.common, - gov.noaa.nws.ncep.ui.nsharp, - com.raytheon.uf.common.dataplugin;bundle-version="1.14.0", - com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.14.0", - javax.measure;bundle-version="1.0.0", - com.raytheon.uf.common.datastorage;bundle-version="1.14.0", - com.raytheon.viz.satellite;bundle-version="1.14.0", - com.raytheon.uf.viz.points;bundle-version="1.0.0", - com.raytheon.uf.viz.sounding;bundle-version="1.14.0", - org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.ui;bundle-version="3.8.2", - com.raytheon.viz.ui;bundle-version="1.14.1", - com.raytheon.uf.common.geospatial;bundle-version="1.14.2", - com.raytheon.uf.viz.core.grid;bundle-version="1.15.0" diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/build.properties b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/build.properties deleted file mode 100644 index 15f66d39dc..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - localization/,\ - plugin.xml diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfile.xml b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfile.xml deleted file mode 100644 index d3657dc9eb..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfile.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml deleted file mode 100644 index 975b0be2ba..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml deleted file mode 100644 index 0c002b2f1b..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - -<<<<<<< HEAD:cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml - - - -======= - - ->>>>>>> origin/unidata_16.2.2:cave/com.raytheon.viz.pointdata/localization/menus/mping/index.xml diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileByPoint.xml b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileByPoint.xml deleted file mode 100644 index 4e31b43a33..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileByPoint.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileMenu.xml b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileMenu.xml deleted file mode 100644 index a75453a2b3..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profileMenu.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/plugin.xml b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/plugin.xml deleted file mode 100644 index 999a739604..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/plugin.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacyProfileResourceData.java b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacyProfileResourceData.java deleted file mode 100644 index e6fb07e6b2..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacyProfileResourceData.java +++ /dev/null @@ -1,162 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.viz.satellite.goesr.legacyprofile; - -import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingCube; -import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingCube.QueryStatus; -import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingProfile; -import gov.noaa.nws.ncep.ui.nsharp.NsharpStationInfo; - -import java.awt.Point; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - -import org.geotools.geometry.DirectPosition2D; -import org.geotools.referencing.CRS; -import org.geotools.referencing.crs.DefaultGeographicCRS; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.TransformException; - -import com.raytheon.uf.common.dataplugin.HDF5Util; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.satellite.SatMapCoverage; -import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; -import com.raytheon.uf.common.dataquery.requests.DbQueryRequest; -import com.raytheon.uf.common.dataquery.requests.RequestConstraint; -import com.raytheon.uf.common.dataquery.responses.DbQueryResponse; -import com.raytheon.uf.common.datastorage.DataStoreFactory; -import com.raytheon.uf.common.datastorage.IDataStore; -import com.raytheon.uf.common.datastorage.Request; -import com.raytheon.uf.common.datastorage.records.IDataRecord; -import com.raytheon.uf.common.serialization.comm.RequestRouter; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.common.time.DataTime; -import com.raytheon.uf.viz.d2d.nsharp.rsc.D2DNSharpResourceData; -import com.raytheon.uf.viz.points.PointsDataManager; - -/** - * Resource data which allows loading GOESR Legacy Moisture/Temperature profiles - * into NSharp in the D2D perspective. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 30, 2015  4335     bsteffen    Initial creation
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ -@XmlAccessorType(XmlAccessType.NONE) -public class GoesrLegacyProfileResourceData extends D2DNSharpResourceData { - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(GoesrLegacyProfileResourceData.class); - - public GoesrLegacyProfileResourceData() { - super(); - } - - @Override - protected void preparePointInfo() { - if (coordinate == null && pointName != null) { - coordinate = PointsDataManager.getInstance().getCoordinate( - pointName); - } - - } - - @Override - protected NcSoundingCube getSoundingCube(NsharpStationInfo stnInfo) { - DataTime time = new DataTime(stnInfo.getReftime()); - DbQueryRequest pdoRequest = new DbQueryRequest(getMetadataMap()); - pdoRequest.addConstraint(PluginDataObject.DATATIME_ID, - new RequestConstraint(time.toString())); - pdoRequest.setEntityClass(SatelliteRecord.class); - try { - DbQueryResponse response = (DbQueryResponse) RequestRouter - .route(pdoRequest); - /* This should be of size 1 in all normal circumstances. */ - Map requestMap = new HashMap( - 2); - GoesrProfileBuilder builder = new GoesrProfileBuilder(); - for (SatelliteRecord record : response - .getEntityObjects(SatelliteRecord.class)) { - SatMapCoverage coverage = record.getCoverage(); - Request request = requestMap.get(coverage); - if (request == null) { - request = getRequest(coverage); - requestMap.put(coverage, request); - } - if (request != null) { - IDataStore dataStore = DataStoreFactory - .getDataStore(HDF5Util.findHDF5Location(record)); - IDataRecord dataRecord = dataStore.retrieve( - record.getDataURI(), - SatelliteRecord.SAT_DATASET_NAME, request); - builder.addRecord(record, dataRecord, 0); - } - } - if (builder.isEmpty()) { - return null; - } - NcSoundingProfile profile = builder.toNcSoundingProfile(); - NcSoundingCube cube = new NcSoundingCube(Arrays.asList(profile)); - cube.setRtnStatus(QueryStatus.OK); - return cube; - } catch (Exception e) { - statusHandler.error("Error occured retrieving GOESR profile data.", - e); - } - return null; - } - - private Request getRequest(SatMapCoverage coverage) - throws FactoryException, TransformException { - MathTransform ll2crs = CRS.findMathTransform( - DefaultGeographicCRS.WGS84, coverage.getCrs(), true); - MathTransform crs2grid = coverage.getGridGeometry().getCRSToGrid2D(); - DirectPosition2D point = new DirectPosition2D(coordinate.x, - coordinate.y); - ll2crs.transform(point, point); - crs2grid.transform(point, point); - int nx = coverage.getNx(); - int ny = coverage.getNy(); - if (point.y < 0 || point.y >= ny || Double.isNaN(point.y)) { - return null; - } else if (point.x < 0 || point.x >= nx || Double.isNaN(point.x)) { - return null; - } else { - return Request.buildPointRequest(new Point((int) Math - .round(point.x), (int) Math.round(point.y))); - } - } - - -} diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacySoundingProvider.java b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacySoundingProvider.java deleted file mode 100644 index 85bdb06cf2..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrLegacySoundingProvider.java +++ /dev/null @@ -1,171 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.viz.satellite.goesr.legacyprofile; - -import java.io.FileNotFoundException; -import java.util.HashMap; -import java.util.Map; - -import org.geotools.geometry.DirectPosition2D; -import org.geotools.referencing.CRS; -import org.geotools.referencing.crs.DefaultGeographicCRS; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.TransformException; - -import com.raytheon.uf.common.dataplugin.HDF5Util; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.satellite.SatMapCoverage; -import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; -import com.raytheon.uf.common.dataquery.requests.DbQueryRequest; -import com.raytheon.uf.common.dataquery.requests.RequestConstraint; -import com.raytheon.uf.common.dataquery.responses.DbQueryResponse; -import com.raytheon.uf.common.datastorage.DataStoreFactory; -import com.raytheon.uf.common.datastorage.IDataStore; -import com.raytheon.uf.common.datastorage.Request; -import com.raytheon.uf.common.datastorage.StorageException; -import com.raytheon.uf.common.datastorage.records.IDataRecord; -import com.raytheon.uf.common.serialization.comm.RequestRouter; -import com.raytheon.uf.common.sounding.VerticalSounding; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.common.time.DataTime; -import com.raytheon.uf.viz.sounding.providers.AbstractVerticalSoundingProvider; -import com.vividsolutions.jts.geom.Coordinate; - -/** - * Provider which allows GOESR Legacy Moisture/Temperature profiles to be used - * for popup skewt - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 30, 2015  4335     bsteffen    Initial creation
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ -public class GoesrLegacySoundingProvider extends - AbstractVerticalSoundingProvider { - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(GoesrLegacySoundingProvider.class); - - @Override - public String getSoundingSource() { - return "GOES"; - } - - @Override - protected SatelliteRecord[] queryForData( - Map constraints, DataTime time, - Coordinate location) { - DbQueryRequest request = new DbQueryRequest(constraints); - - RequestConstraint timeConstraint = new RequestConstraint( - time.toString()); - request.addConstraint(PluginDataObject.DATATIME_ID, timeConstraint); - DbQueryResponse response; - try { - response = (DbQueryResponse) RequestRouter.route(request); - } catch (Exception e) { - statusHandler.error("Unable to request satellite data.", e); - return new SatelliteRecord[0]; - } - SatelliteRecord[] records = response - .getEntityObjects(SatelliteRecord.class); - for (SatelliteRecord record : records) { - IDataStore dataStore = DataStoreFactory.getDataStore(HDF5Util - .findHDF5Location(record)); - try { - IDataRecord dataRecord = dataStore.retrieve( - record.getDataURI(), SatelliteRecord.SAT_DATASET_NAME, - Request.ALL); - record.setMessageData(dataRecord); - } catch (FileNotFoundException | StorageException e) { - statusHandler.error("Unable to retrieve satellite data.", e); - } - - } - return records; - } - - @Override - protected VerticalSounding createSounding(DataTime time, - SatelliteRecord[] records, Coordinate location) { - GoesrProfileBuilder builder = new GoesrProfileBuilder(); - /* This should be of size 1 in normal circumstances. */ - Map indexMap = new HashMap( - 2); - for (SatelliteRecord record : records) { - IDataRecord dataRecord = (IDataRecord) record.getMessageData(); - if (dataRecord == null) { - continue; - } - SatMapCoverage coverage = record.getCoverage(); - Integer index = indexMap.get(coverage); - if (index == null) { - try { - index = getDataIndex(coverage, location); - } catch (Exception e) { - statusHandler.error( - "Error determining satellite data location", e); - continue; - } - indexMap.put(coverage, index); - } - if (index >= 0) { - builder.addRecord(record, dataRecord, index); - } - - } - if (builder.isEmpty()) { - return null; - } - VerticalSounding sounding = builder.toVerticalSounding(); - sounding.setStationId(getSoundingSource()); - return sounding; - } - - private int getDataIndex(SatMapCoverage coverage, Coordinate coordinate) - throws FactoryException, TransformException { - MathTransform ll2crs = CRS.findMathTransform( - DefaultGeographicCRS.WGS84, coverage.getCrs(), true); - MathTransform crs2grid = coverage.getGridGeometry().getCRSToGrid2D(); - DirectPosition2D point = new DirectPosition2D(coordinate.x, - coordinate.y); - ll2crs.transform(point, point); - crs2grid.transform(point, point); - int nx = coverage.getNx(); - int ny = coverage.getNy(); - if (point.y < 0 || point.y >= ny || Double.isNaN(point.y)) { - return -1; - } else if (point.x < 0 || point.x >= nx || Double.isNaN(point.x)) { - return -1; - } else { - return nx * (int) point.y + (int) point.x; - } - } - -} diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrProfileBuilder.java b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrProfileBuilder.java deleted file mode 100644 index ac6e9d4a50..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/GoesrProfileBuilder.java +++ /dev/null @@ -1,165 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.viz.satellite.goesr.legacyprofile; - -import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer; -import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingProfile; - -import java.lang.reflect.Array; -import java.text.ParseException; -import java.text.ParsePosition; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.NavigableMap; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.measure.quantity.Dimensionless; -import javax.measure.quantity.Temperature; -import javax.measure.unit.SI; -import javax.measure.unit.Unit; -import javax.measure.unit.UnitFormat; - -import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; -import com.raytheon.uf.common.datastorage.records.IDataRecord; -import com.raytheon.uf.common.sounding.VerticalSounding; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.viz.d2d.nsharp.SoundingLayerBuilder; - -/** - * Common code to build {@link VerticalSounding} or a {@link NcSoundingProfile} - * from satellite records which contain GOESR Legacy Moisture/Temperature - * profile information. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 30, 2015  4335     bsteffen    Initial creation
- * May 13, 2015  4445     bsteffen    Remove GOESR sounding layer builder.
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ -public class GoesrProfileBuilder { - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(GoesrLegacySoundingProvider.class); - - private final Pattern physicalElementPattern = Pattern - .compile("^V([TM])P-(\\d{1,4}\\.\\d{2})hPa$"); - - private NavigableMap map = new TreeMap<>(); - - public boolean isEmpty() { - return map.isEmpty(); - } - - public void addRecord(SatelliteRecord record, IDataRecord dataRecord, - int index) { - Matcher paramMatcher = physicalElementPattern.matcher(record - .getPhysicalElement()); - if (!paramMatcher.matches()) { - statusHandler.warn("Cannot add " + record + " to the sounding"); - return; - } - double pressure = Double.parseDouble(paramMatcher.group(2)); - Unit unit; - try { - unit = getDataUnit(record, dataRecord.getDataAttributes()); - } catch (ParseException e) { - statusHandler.error("Cannot add " + record + " to the sounding", e); - return; - } - int value = (Array.getInt(dataRecord.getDataObject(), index)); - if (value == dataRecord.getFillValue().doubleValue()) { - return; - } else { - value = value & 0xFFFF; - } - SoundingLayerBuilder layer = map.get(pressure); - if (layer == null) { - layer = new SoundingLayerBuilder(); - layer.addPressure(pressure, SI.HECTO(SI.PASCAL)); - map.put(pressure, layer); - } - if ("T".equals(paramMatcher.group(1))) { - layer.addTemperature(value, unit.asType(Temperature.class)); - } else { - layer.addRelativeHumidity(value, unit.asType(Dimensionless.class)); - } - } - - public VerticalSounding toVerticalSounding() { - VerticalSounding sounding = new VerticalSounding(); - for (SoundingLayerBuilder builder : map.values()) { - sounding.addLayer(builder.toSoundingLayer()); - } - Collections.reverse(sounding.getLayerData()); - return sounding; - } - - public NcSoundingProfile toNcSoundingProfile() { - List ncLayers = new ArrayList<>(map.size()); - for (SoundingLayerBuilder builder : map.descendingMap().values()) { - ncLayers.add(builder.toNcSoundingLayer()); - } - NcSoundingProfile profile = new NcSoundingProfile(); - profile.setSoundingLyLst(ncLayers); - return profile; - } - - private static Unit getDataUnit(SatelliteRecord record, - Map dataAttributes) throws ParseException { - - Unit recordUnit = UnitFormat.getUCUMInstance().parseProductUnit( - record.getUnits(), new ParsePosition(0)); - Unit units = recordUnit != null ? recordUnit : Unit.ONE; - if (dataAttributes == null) { - return units; - } - Number offset = (Number) dataAttributes - .get(SatelliteRecord.SAT_ADD_OFFSET); - Number scale = (Number) dataAttributes - .get(SatelliteRecord.SAT_SCALE_FACTOR); - - if (offset != null) { - double offsetVal = offset.doubleValue(); - if (offsetVal != 0.0) { - units = units.plus(offsetVal); - } - } - if (scale != null) { - double scaleVal = scale.doubleValue(); - if (scaleVal != 0.0) { - units = units.times(scaleVal); - } - } - return units; - } - -} diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapInputHandler.java b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapInputHandler.java deleted file mode 100644 index 5890164207..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapInputHandler.java +++ /dev/null @@ -1,170 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.viz.satellite.goesr.legacyprofile.map; - -import gov.noaa.nws.ncep.ui.nsharp.display.NsharpSkewTPaneDescriptor; -import gov.noaa.nws.ncep.ui.nsharp.display.NsharpSkewTPaneDisplay; - -import java.util.HashMap; - -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Cursor; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchPart; - -import com.raytheon.uf.common.dataquery.requests.RequestConstraint; -import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType; -import com.raytheon.uf.viz.core.DescriptorMap; -import com.raytheon.uf.viz.core.IDisplayPaneContainer; -import com.raytheon.uf.viz.core.drawables.AbstractRenderableDisplay; -import com.raytheon.uf.viz.core.drawables.ResourcePair; -import com.raytheon.uf.viz.core.procedures.Bundle; -import com.raytheon.uf.viz.core.rsc.LoadProperties; -import com.raytheon.uf.viz.satellite.goesr.legacyprofile.GoesrLegacyProfileResourceData; -import com.raytheon.viz.ui.BundleProductLoader; -import com.raytheon.viz.ui.UiUtil; -import com.raytheon.viz.ui.VizWorkbenchManager; -import com.raytheon.viz.ui.editor.AbstractEditor; -import com.raytheon.viz.ui.input.InputAdapter; -import com.vividsolutions.jts.geom.Coordinate; - -/** - * Input handler for GOESR Legacy Moisture/Temperature profiles availability - * resource - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 30, 2015  4335     bsteffen    Initial creation
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ -public class GoesrProfileMapInputHandler extends InputAdapter { - - private GoesrProfileMapResource resource; - - private Cursor handCursor; - - private boolean overDataPoint = false; - - private int downX, downY; - - public GoesrProfileMapInputHandler(GoesrProfileMapResource resource) { - this.resource = resource; - Display display = Display.getCurrent(); - handCursor = new Cursor(display, SWT.CURSOR_HAND); - } - - public void dispose() { - handCursor.dispose(); - } - - @Override - public boolean handleMouseMove(int x, int y) { - boolean wasData = overDataPoint; - overDataPoint = false; - - if (resource.isEditable()) { - Coordinate sampleCoord = resource.getResourceContainer() - .translateClick(x, y); - if (sampleCoord != null) { - overDataPoint = resource.isDataPoint(sampleCoord); - } - } - - if (wasData && !overDataPoint) { - getShell().setCursor(null); - } else if (!wasData && overDataPoint) { - getShell().setCursor(handCursor); - } - - return super.handleMouseMove(x, y); - } - - @Override - public boolean handleMouseDown(int x, int y, int mouseButton) { - if (mouseButton == 1) { - downX = x; - downY = y; - } - return super.handleMouseDown(x, y, mouseButton); - } - - @Override - public boolean handleMouseUp(int x, int y, int mouseButton) { - int downX = this.downX; - int downY = this.downY; - this.downX = this.downY = -1; - if (overDataPoint && mouseButton == 1 && downX == x && downY == y) { - HashMap metadataMap = new HashMap<>( - resource.getResourceData().getMetadataMap()); - metadataMap.put("physicalElement", new RequestConstraint( - "V%P-%hPa", ConstraintType.LIKE)); - GoesrLegacyProfileResourceData resourceData = new GoesrLegacyProfileResourceData(); - resourceData.setMetadataMap(metadataMap); - resourceData.setSoundingType("GOES"); - resourceData.setCoordinate(resource.getResourceContainer() - .translateClick(x, y)); - ResourcePair pair = new ResourcePair(); - pair.setResourceData(resourceData); - pair.setLoadProperties(new LoadProperties()); - NsharpSkewTPaneDisplay display = new NsharpSkewTPaneDisplay(); - display.setDescriptor(new NsharpSkewTPaneDescriptor()); - display.getDescriptor().getResourceList().add(pair); - String editorId = DescriptorMap.getEditorId(display.getDescriptor() - .getClass().getName()); - AbstractEditor editor = UiUtil.createOrOpenEditor(editorId, - display.cloneDisplay()); - Bundle b = new Bundle(); - b.setDisplays(new AbstractRenderableDisplay[] { display }); - Job j = new BundleProductLoader(editor, b); - j.schedule(); - return true; - } - return super.handleMouseUp(x, y, mouseButton); - } - - @Override - public boolean handleMouseExit(Event event) { - overDataPoint = false; - getShell().setCursor(null); - return super.handleMouseExit(event); - } - - private Shell getShell() { - IDisplayPaneContainer container = resource.getResourceContainer(); - if (container instanceof IWorkbenchPart) { - return ((IWorkbenchPart) container).getSite().getShell(); - } else { - return VizWorkbenchManager.getInstance().getCurrentWindow() - .getShell(); - } - } - -} diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResource.java b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResource.java deleted file mode 100644 index a81611b984..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResource.java +++ /dev/null @@ -1,340 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.viz.satellite.goesr.legacyprofile.map; - -import java.io.FileNotFoundException; -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.BitSet; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.geotools.coverage.grid.GeneralGridGeometry; -import org.geotools.geometry.DirectPosition2D; -import org.geotools.referencing.CRS; -import org.geotools.referencing.crs.DefaultGeographicCRS; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.TransformException; - -import com.raytheon.uf.common.dataplugin.HDF5Util; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; -import com.raytheon.uf.common.datastorage.DataStoreFactory; -import com.raytheon.uf.common.datastorage.IDataStore; -import com.raytheon.uf.common.datastorage.Request; -import com.raytheon.uf.common.datastorage.StorageException; -import com.raytheon.uf.common.datastorage.records.IDataRecord; -import com.raytheon.uf.common.time.DataTime; -import com.raytheon.uf.viz.core.DrawableCircle; -import com.raytheon.uf.viz.core.IGraphicsTarget; -import com.raytheon.uf.viz.core.drawables.PaintProperties; -import com.raytheon.uf.viz.core.drawables.PaintStatus; -import com.raytheon.uf.viz.core.exception.VizException; -import com.raytheon.uf.viz.core.grid.display.AbstractGriddedDisplay; -import com.raytheon.uf.viz.core.map.IMapDescriptor; -import com.raytheon.uf.viz.core.rsc.AbstractVizResource; -import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType; -import com.raytheon.uf.viz.core.rsc.LoadProperties; -import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability; -import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability; -import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability; -import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability; -import com.raytheon.viz.ui.input.EditableManager; -import com.vividsolutions.jts.geom.Coordinate; - -/** - * GOESR Legacy Moisture/Temperature profiles availability resource. Draws - * points on map where data is available, user can click points to load - * sounding. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 30, 2015  4335     bsteffen    Initial creation
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ - -public class GoesrProfileMapResource extends - AbstractVizResource { - - private GoesrProfileMapInputHandler inputManager; - - private Map records = new HashMap<>(); - - private Map displays = new HashMap<>(); - - private Job loadJob = new Job("Loading Profile Availability") { - - @Override - protected IStatus run(IProgressMonitor monitor) { - DataTime[] timesToLoad = getDataTimes(); - for (DataTime time : timesToLoad) { - SatelliteRecord record = records.get(time); - if (record == null) { - continue; - } - IDataStore dataStore = DataStoreFactory.getDataStore(HDF5Util - .findHDF5Location(record)); - IDataRecord dataRecord = null; - try { - dataRecord = dataStore.retrieve(record.getDataURI(), - SatelliteRecord.SAT_DATASET_NAME, Request.ALL); - } catch (FileNotFoundException | StorageException e) { - statusHandler.error( - "Unable to retrieve satellite data for " + record, - e); - continue; - } - GoesrProfileMapDisplay display = new GoesrProfileMapDisplay( - dataRecord, descriptor, record.getGridGeometry(), 5); - display.setASync(false); - displays.put(time, display); - issueRefresh(); - } - return Status.OK_STATUS; - } - - }; - - /** - * @param resourceData - * @param loadProperties - */ - protected GoesrProfileMapResource(GoesrProfileMapResourceData resourceData, - LoadProperties loadProperties) { - super(resourceData, loadProperties); - this.inputManager = new GoesrProfileMapInputHandler(this); - this.dataTimes = new ArrayList(); - getCapability(EditableCapability.class).setEditable(true); - } - - @Override - protected void resourceDataChanged(ChangeType type, Object updateObject) { - if (type == ChangeType.DATA_UPDATE) { - if (updateObject instanceof PluginDataObject[]) { - addRecords((PluginDataObject[]) updateObject); - } - } - super.resourceDataChanged(type, updateObject); - } - - public synchronized void addRecords(PluginDataObject... records) { - for (PluginDataObject record : records) { - if (record instanceof SatelliteRecord) { - this.records - .put(record.getDataTime(), (SatelliteRecord) record); - } - } - - List dataTimes = new ArrayList( - this.records.keySet()); - Collections.sort(dataTimes); - this.dataTimes = dataTimes; - loadJob.schedule(); - } - - @Override - public synchronized void remove(DataTime dataTime) { - records.remove(dataTime); - GoesrProfileMapDisplay display = displays.remove(dataTime); - if (display != null) { - display.dispose(); - } - super.remove(dataTime); - } - - protected void resetDisplays() { - Map displays = this.displays; - this.displays = new HashMap<>(); - for (GoesrProfileMapDisplay display : displays.values()) { - display.dispose(); - } - } - - @Override - protected void disposeInternal() { - inputManager.dispose(); - getResourceContainer().unregisterMouseHandler(inputManager); - resetDisplays(); - } - - @Override - public void project(CoordinateReferenceSystem crs) throws VizException { - resetDisplays(); - loadJob.schedule(); - } - - @Override - protected void paintInternal(IGraphicsTarget target, - PaintProperties paintProps) throws VizException { - DataTime time = paintProps.getDataTime(); - if (time == null) { - return; - } - GoesrProfileMapDisplay display = displays.get(time); - if (display != null) { - display.setColor(getCapability(ColorableCapability.class) - .getColor()); - display.setDensity(getCapability(DensityCapability.class) - .getDensity()); - display.setMagnification(getCapability( - MagnificationCapability.class).getMagnification()); - display.paint(target, paintProps); - } else if (loadJob.getState() == Job.RUNNING) { - updatePaintStatus(PaintStatus.INCOMPLETE); - } - } - - @Override - protected void initInternal(IGraphicsTarget target) throws VizException { - EditableManager.makeEditable(this, - getCapability(EditableCapability.class).isEditable()); - getResourceContainer().registerMouseHandler(inputManager); - } - - public boolean isEditable() { - return getCapability(EditableCapability.class).isEditable() - && getProperties().isVisible(); - } - - @Override - public String getName() { - return "GOES-R Legacy Temperature/Moisture Availability"; - } - - public boolean isDataPoint(Coordinate sampleCoord) { - DataTime time = descriptor.getTimeForResource(this); - if (time == null) { - return false; - } - GoesrProfileMapDisplay display = displays.get(time); - if (display == null) { - return false; - } - GeneralGridGeometry dataGeometry = display.getGridGeometryOfData(); - DirectPosition2D point = new DirectPosition2D(sampleCoord.x, - sampleCoord.y); - try { - MathTransform ll2crs = CRS.findMathTransform( - DefaultGeographicCRS.WGS84, - dataGeometry.getCoordinateReferenceSystem(), true); - MathTransform crs2grid = dataGeometry.getGridToCRS().inverse(); - ll2crs.transform(point, point); - crs2grid.transform(point, point); - } catch (TransformException | FactoryException e) { - statusHandler.error("", e); - return false; - } - int nx = dataGeometry.getGridRange().getSpan(0); - int ny = dataGeometry.getGridRange().getSpan(1); - if (point.y < 0 || point.y >= ny || Double.isNaN(point.y)) { - return false; - } else if (point.x < 0 || point.x >= nx || Double.isNaN(point.x)) { - return false; - } else { - return display.isDataPoint(point.x, point.y); - } - } - - private static class GoesrProfileMapDisplay extends - AbstractGriddedDisplay { - - private final int nx; - - private final BitSet dataMap; - - public GoesrProfileMapDisplay(IDataRecord dataRecord, - IMapDescriptor descriptor, - GeneralGridGeometry gridGeometryOfGrid, double size) { - super(descriptor, gridGeometryOfGrid, size, 6); - Object array = dataRecord.getDataObject(); - int fill = dataRecord.getFillValue().intValue(); - /* Don't waste space, we only need to know which points have data. */ - int length = Array.getLength(array); - dataMap = new BitSet(length); - for (int i = 0; i < length; i += 1) { - dataMap.set(i, Array.getInt(array, i) != fill); - } - this.nx = (int) dataRecord.getSizes()[0]; - } - - public boolean isDataPoint(double x, double y) { - int index = (int) (nx * Math.round(y) + Math.round(x)); - return dataMap.get(index); - } - - public GeneralGridGeometry getGridGeometryOfData() { - return gridGeometryOfGrid; - } - - @Override - protected DrawableCircle getResource(Coordinate coord) { - if (!isDataPoint(coord.x, coord.y)) { - return null; - } - DrawableCircle circle = new DrawableCircle(); - circle.screenRadius = size * magnification; - circle.numberOfPoints = (int) (circle.screenRadius * 4); - circle.basics.color = color; - circle.filled = true; - return circle; - } - - @Override - protected DrawableCircle createResource(Coordinate coord) - throws VizException { - return getResource(coord); - } - - @Override - protected void paint(PaintProperties paintProps, - Collection renderables) throws VizException { - List circles = new ArrayList( - renderables.size()); - for (GridCellRenderable gridCell : renderables) { - gridCell.resource.setCoordinates(gridCell.plotLocation.x, - gridCell.plotLocation.y); - circles.add(gridCell.resource); - } - target.drawCircle(circles.toArray(new DrawableCircle[0])); - } - - @Override - protected void disposeResources() { - /* DrawableCircles do not need to be disposed. */ - } - } -} diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResourceData.java b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResourceData.java deleted file mode 100644 index be75361562..0000000000 --- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/src/com/raytheon/uf/viz/satellite/goesr/legacyprofile/map/GoesrProfileMapResourceData.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.viz.satellite.goesr.legacyprofile.map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.viz.core.exception.VizException; -import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData; -import com.raytheon.uf.viz.core.rsc.AbstractVizResource; -import com.raytheon.uf.viz.core.rsc.LoadProperties; - -/** - * - * Serialization information for {@link GoesrProfileMapResource}. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 30, 2015  4335     bsteffen    Initial creation
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ -@XmlAccessorType(XmlAccessType.NONE) -public class GoesrProfileMapResourceData extends AbstractRequestableResourceData { - - @Override - protected AbstractVizResource constructResource( - LoadProperties loadProperties, PluginDataObject[] objects) - throws VizException { - GoesrProfileMapResource resource = new GoesrProfileMapResource(this, - loadProperties); - resource.addRecords(objects); - return resource; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.classpath b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.classpath deleted file mode 100644 index 098194ca4b..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.project b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.project deleted file mode 100644 index 7dbfe32dff..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.raytheon.uf.common.dataplugin.goesr.dmw - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/META-INF/MANIFEST.MF deleted file mode 100644 index b1d20a2964..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: GOES-R Derived Motion Winds -Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.goesr.dmw -Bundle-Version: 1.15.0.qualifier -Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.14.0", - com.raytheon.uf.common.serialization;bundle-version="1.14.2", - com.raytheon.uf.common.pointdata;bundle-version="1.14.0", - com.raytheon.uf.common.geospatial;bundle-version="1.14.2" -Export-Package: com.raytheon.uf.common.dataplugin.goesr.dmw diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/build.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/build.properties deleted file mode 100644 index 544aa7de88..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - utility/ diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/src/com/raytheon/uf/common/dataplugin/goesr/dmw/DMWRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/src/com/raytheon/uf/common/dataplugin/goesr/dmw/DMWRecord.java deleted file mode 100644 index 2a04ec3bcc..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/src/com/raytheon/uf/common/dataplugin/goesr/dmw/DMWRecord.java +++ /dev/null @@ -1,245 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.common.dataplugin.goesr.dmw; - -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.annotations.DataURI; -import com.raytheon.uf.common.dataplugin.persist.IPersistable; -import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; -import com.raytheon.uf.common.geospatial.ISpatialEnabled; -import com.raytheon.uf.common.geospatial.ISpatialObject; -import com.raytheon.uf.common.pointdata.PointDataView; -import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; -import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; -import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; - -/** - * GOES-R Derived Motion Wind Record. - * - * 
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Apr 6, 2015  4334       nabowle     Initial creation
- *
- *
- * - * @author nabowle - * @version 1.0 - */ -@Entity -@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "dmwseq") -@Table(name = DMWRecord.PLUGIN_NAME, uniqueConstraints = { @UniqueConstraint(columnNames = { - "orbitalSlot", "scene", "channel", "refTime", "latitude", "longitude" }) }) -@DynamicSerialize -public class DMWRecord extends PersistablePluginDataObject implements - ISpatialEnabled, IPersistable { - - /** Serializable id */ - private static final long serialVersionUID = 1L; - - public static final String PLUGIN_NAME = "dmw"; - - @Embedded - @DynamicSerializeElement - private PointDataView pointDataView; - - @Embedded - @DataURI(position = 1, embedded = true) - @DynamicSerializeElement - private SurfaceObsLocation location; - - @DataURI(position = 2) - @DynamicSerializeElement - @Column(nullable = false, length = 9) - private String orbitalSlot; - - @DataURI(position = 3) - @DynamicSerializeElement - @Column(nullable = false, length = 10) - private String scene; - - @DataURI(position = 4) - @DynamicSerializeElement - @Column(nullable = false) - private int channel; - - /** - * Required to be in the DataURI for viz updates, but not used for the - * unique constraint. - */ - @DataURI(position = 5) - @DynamicSerializeElement - @Column - private float windSpd; - - @DynamicSerializeElement - @Column - private float windDir; - - - /** - * Constructor. - */ - public DMWRecord() { - super(); - pointDataView = new PointDataView(); - } - - /** - * Constructs a record from a dataURI - * - * @param uri - * The dataURI - */ - public DMWRecord(String uri) { - super(uri); - pointDataView = new PointDataView(); - } - - /* - * (non-Javadoc) - * - * @see com.raytheon.uf.common.dataplugin.PluginDataObject#getPluginName() - */ - @Override - public String getPluginName() { - return PLUGIN_NAME; - } - - @Override - public ISpatialObject getSpatialObject() { - return location; - } - - /** - * @return the location - */ - public SurfaceObsLocation getLocation() { - return location; - } - - /** - * @param location - * the location to set - */ - public void setLocation(SurfaceObsLocation location) { - this.location = location; - } - - /** - * @return the channel - */ - public int getChannel() { - return channel; - } - - /** - * @param channel - * the channel to set - */ - public void setChannel(int channel) { - this.channel = channel; - } - - /** - * @return the orbitalSlot - */ - public String getOrbitalSlot() { - return orbitalSlot; - } - - /** - * @param orbitalSlot - * the orbitalSlot to set - */ - public void setOrbitalSlot(String orbitalSlot) { - this.orbitalSlot = orbitalSlot; - } - - /** - * @return the scene - */ - public String getScene() { - return scene; - } - - /** - * @param scene - * the scene to set - */ - public void setScene(String scene) { - this.scene = scene; - } - - /** - * @return the windDir - */ - public float getWindDir() { - return windDir; - } - - /** - * @param windDir - * the windDir to set - */ - public void setWindDir(float windDir) { - this.windDir = windDir; - } - - /** - * @return the windSpd - */ - public float getWindSpd() { - return windSpd; - } - - /** - * @param windSpd - * the windSpd to set - */ - public void setWindSpd(float windSpd) { - this.windSpd = windSpd; - } - - /** - * @return the pointDataView - */ - public PointDataView getPointDataView() { - return pointDataView; - } - - /** - * @param pointDataView - * the pointDataView to set - */ - public void setPointDataView(PointDataView pointDataView) { - this.pointDataView = pointDataView; - } -} diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/bundles/satellite/goesr/DerivedMotionWinds.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/bundles/satellite/goesr/DerivedMotionWinds.xml deleted file mode 100644 index 0eb96c6861..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/bundles/satellite/goesr/DerivedMotionWinds.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmw-index.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmw-index.xml deleted file mode 100644 index 2712d7b1b4..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmw-index.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByChannel.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByChannel.xml deleted file mode 100644 index a6d6800b2a..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByChannel.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByScene.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByScene.xml deleted file mode 100644 index 405355cdf7..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwByScene.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwMenu.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwMenu.xml deleted file mode 100644 index b325c0a0e5..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/menus/satellite/goesr/dmwMenu.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/plotModels/goesr/dmwPlotDesign.svg b/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/plotModels/goesr/dmwPlotDesign.svg deleted file mode 100644 index 2cec8e5346..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goesr.dmw/utility/common_static/base/plotModels/goesr/dmwPlotDesign.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - 0 - 0 - 0 - - - 75 - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.goesr.feature/.project b/edexOsgi/com.raytheon.uf.edex.goesr.feature/.project deleted file mode 100644 index f566c74b22..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.goesr.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - com.raytheon.uf.edex.goesr.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/edexOsgi/com.raytheon.uf.edex.goesr.feature/build.properties b/edexOsgi/com.raytheon.uf.edex.goesr.feature/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.goesr.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/edexOsgi/com.raytheon.uf.edex.goesr.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.goesr.feature/feature.xml deleted file mode 100644 index 2b61521a44..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.goesr.feature/feature.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - [Enter Feature Description here.] - - - - [Enter Copyright Description here.] - - - - [Enter License Description here.] - - - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.classpath deleted file mode 100644 index 098194ca4b..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.project b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.project deleted file mode 100644 index f797d57103..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.raytheon.uf.edex.plugin.goesr.dmw - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/META-INF/MANIFEST.MF deleted file mode 100644 index 2b244685f4..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: GOES-R Derived Motion Winds -Bundle-SymbolicName: com.raytheon.uf.edex.plugin.goesr.dmw -Bundle-Version: 1.15.0.qualifier -Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: com.raytheon.uf.common.pointdata;bundle-version="1.14.0", - com.raytheon.uf.edex.pointdata, - com.raytheon.uf.common.dataplugin;bundle-version="1.14.0", - com.raytheon.uf.common.datastorage;bundle-version="1.14.0", - com.raytheon.uf.common.status;bundle-version="1.14.1", - net.sf.cglib;bundle-version="2.1.3", - com.raytheon.uf.edex.database;bundle-version="1.14.1", - com.raytheon.uf.common.wmo;bundle-version="1.14.0", - com.raytheon.edex.common;bundle-version="1.14.1", - ucar.nc2, - com.raytheon.uf.common.dataplugin.goesr.dmw;bundle-version="1.15.0" -Export-Package: com.raytheon.uf.edex.plugin.goesr.dmw.dao, - com.raytheon.uf.edex.plugin.goesr.dmw.decoder diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/build.properties deleted file mode 100644 index 5791d48d5f..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - res/ diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/pointdata/dmwdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/pointdata/dmwdb.xml deleted file mode 100644 index 451c048615..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/pointdata/dmwdb.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-common.xml deleted file mode 100644 index ec11fdb831..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-common.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-ingest.xml deleted file mode 100644 index 458a18f5de..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/res/spring/dmw-ingest.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - dmw - - - - - - - - - - - java.lang.Throwable - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/dao/DMWDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/dao/DMWDao.java deleted file mode 100644 index 4c5ce9364e..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/dao/DMWDao.java +++ /dev/null @@ -1,130 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.edex.plugin.goesr.dmw.dao; - -import java.io.File; -import java.io.FileNotFoundException; -import java.util.Map; - -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.PluginException; -import com.raytheon.uf.common.dataplugin.goesr.dmw.DMWRecord; -import com.raytheon.uf.common.datastorage.StorageException; -import com.raytheon.uf.common.datastorage.StorageStatus; -import com.raytheon.uf.common.pointdata.PointDataContainer; -import com.raytheon.uf.common.pointdata.PointDataDescription; -import com.raytheon.uf.edex.pointdata.PointDataPluginDao; - -/** - * Dao for Derived Motion Winds. - * - * 
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Apr 7, 2015  4334       nabowle     Initial creation
- * 
- *
- * - * @author nabowle - * @version 1.0 - */ - -public class DMWDao extends PointDataPluginDao { - - /** - * @param pluginName - * @throws PluginException - */ - public DMWDao(String pluginName) throws PluginException { - super(pluginName); - } - - /* - * (non-Javadoc) - * - * @see - * com.raytheon.uf.edex.pointdata.PointDataPluginDao#getKeysRequiredForFileName - * () - */ - @Override - public String[] getKeysRequiredForFileName() { - return new String[] { "dataTime.refTime" }; - } - - /* - * (non-Javadoc) - * - * @see com.raytheon.uf.edex.pointdata.PointDataPluginDao#newObject() - */ - @Override - public DMWRecord newObject() { - return new DMWRecord(); - } - - - - /* - * The following methods are overridden to effectively be NOOPs in order to - * bypass HDF5. - */ - - /** - * Does nothing and returns a new StorageStatus. - */ - @Override - public StorageStatus persistToHDF5(PluginDataObject... records) { - return new StorageStatus(); - } - - /** - * Does nothing and returns a new PointDataDescription. - */ - @Override - public PointDataDescription getPointDataDescription(Map obj) { - return new PointDataDescription(); - } - - /** - * Does nothing and returns a new PointDataContainer. - */ - @Override - public PointDataContainer getPointData(File file, int[] indexes, int[] ids, - String[] attributes, LevelRequest request) throws StorageException, - FileNotFoundException { - return new PointDataContainer(); - } - - /* - * (non-Javadoc) - * - * @see - * com.raytheon.uf.edex.pointdata.PointDataPluginDao#getPointDataFileName - * (com.raytheon.uf.common.dataplugin.PluginDataObject) - */ - @Override - public String getPointDataFileName(DMWRecord p) { - // not needed for this datatype, but must be overridden. - return "dmw.h5"; - } - -} diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/decoder/DMWDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/decoder/DMWDecoder.java deleted file mode 100644 index a5e00f2af2..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/src/com/raytheon/uf/edex/plugin/goesr/dmw/decoder/DMWDecoder.java +++ /dev/null @@ -1,312 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.edex.plugin.goesr.dmw.decoder; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.TimeZone; -import java.util.UUID; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import ucar.ma2.Array; -import ucar.nc2.Attribute; -import ucar.nc2.NetcdfFile; -import ucar.nc2.Variable; - -import com.raytheon.edex.esb.Headers; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.goesr.dmw.DMWRecord; -import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.common.time.DataTime; - -/** - * Decoder for Derived Motion Wind products. - * - * 
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Apr 7, 2015  4334       nabowle     Initial creation
- *
- *
- * - * @author nabowle - * @version 1.0 - */ - -public class DMWDecoder { - /** - * The only Data Quality Flag indicating valid data. Any non-zero value - * indicates an invalid point. - */ - private static final int VALID_DQF = 0; - - private static final String MESOSCALE = "Mesoscale"; - - /** Pattern to extract mesoscale scene number from the dataset name. */ - private static final Pattern MESO_SCENE_PATTERN = Pattern - .compile("DMWM(?\\d)"); - - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(DMWDecoder.class); - - private static final Calendar epoch; - - private static final String COVERAGE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.S'Z'"; - - static { - epoch = Calendar.getInstance(TimeZone.getTimeZone("GMT")); - epoch.clear(); - epoch.setTimeZone(TimeZone.getTimeZone("GMT")); - epoch.set(Calendar.YEAR, 2000); - epoch.set(Calendar.MONTH, Calendar.JANUARY); - epoch.set(Calendar.DAY_OF_MONTH, 1); - epoch.set(Calendar.HOUR_OF_DAY, 12); - epoch.set(Calendar.MINUTE, 0); - epoch.set(Calendar.SECOND, 0); - epoch.set(Calendar.MILLISECOND, 0); - } - - /** - * Constructor. - */ - public DMWDecoder() { - super(); - } - - /** - * Decode a GOES-R DMW file. - * - * @param data - * The file data. - * @param headers - * The headers. - * @return The decoded objects. - */ - public PluginDataObject[] decode(byte[] data, Headers headers) { - - String traceId = ""; - - List records = new ArrayList<>(); - - if (headers != null) { - traceId = (String) headers.get("traceId"); - } - - try { - if (data != null && data.length > 0) { - try { - decodeData(data, traceId, records); - } catch (Exception e) { - statusHandler.error(traceId + "-Error in decode", e); - } finally { - if (records.isEmpty()) { - statusHandler.info(String.format("%s - Decoded no obs", - traceId)); - } else { - statusHandler.info(String.format("%s - Decoded %d obs", - traceId, records.size())); - } - } - } else { - statusHandler.info(traceId + "- No data in file"); - } - } catch (Exception e) { - statusHandler.error(traceId + "- Decoder error", e); - } - - return records.toArray(new PluginDataObject[0]); - } - - /** - * Decodes the file, adding valid obs to the records list. - * - * @param messageData - * The data. - * @param traceId - * The traceId. - * @param records - * The list to add valid records to. - * @throws Exception - * if there's any unrecoverable issues with the file. - */ - private void decodeData(byte[] messageData, String traceId, - List records) throws Exception { - NetcdfFile dataFile = NetcdfFile.openInMemory(UUID.randomUUID() - .toString(), messageData); - - Variable latVar = dataFile.findVariable("lat"); - Variable lonVar = dataFile.findVariable("lon"); - Variable spdVar = dataFile.findVariable("wind_speed"); - Variable dirVar = dataFile.findVariable("wind_direction"); - Variable dqfVar = dataFile.findVariable("DQF"); // quality factor - - // Full Disk, CONUS, or Mesoscale. - String scene = dataFile.findGlobalAttribute("scene_id") - .getStringValue(); - if (MESOSCALE.equals(scene)) { - // determine which mesoscale scene from dataset name. - String dataset = dataFile.findGlobalAttribute("dataset_name") - .getStringValue(); - Matcher matcher = MESO_SCENE_PATTERN.matcher(dataset); - if (matcher.find()) { - String mesoScene = matcher.group("mesoscene"); - scene = scene + mesoScene; - } else { - statusHandler.info(traceId - + " - Using default Mesoscale Scene."); - scene = scene + "1"; - } - } - String orbitalSlot = dataFile.findGlobalAttribute("orbital_slot") - .getStringValue(); - int channel = dataFile.findVariable("band_id").readScalarInt(); - - if (latVar == null || lonVar == null || spdVar == null - || dirVar == null || dqfVar == null) { - throw new IllegalArgumentException( - "File does not contain a valid derived motion wind product."); - } - Array lats = latVar.read(); - Array lons = lonVar.read(); - Array spds = spdVar.read(); - Array dirs = dirVar.read(); - Array dqfs = dqfVar.read(); - - long latsSize = lats.getSize(); - if (latsSize != lons.getSize() || latsSize != spds.getSize() - || latsSize != dirs.getSize() || latsSize != dqfs.getSize()) { - throw new IllegalArgumentException( - "File data is not of the same length."); - } - - Calendar datetime = getDateTime(dataFile, traceId); - - double lat; - double lon; - float speed; - float direction; - byte quality; - DMWRecord record; - SurfaceObsLocation location; - while (lats.hasNext() && lons.hasNext() && spds.hasNext() - && dirs.hasNext() && dqfs.hasNext()) { - lat = lats.nextDouble(); - lon = lons.nextDouble(); - speed = spds.nextFloat(); - direction = dirs.nextFloat(); - quality = dqfs.nextByte(); - - if (quality == VALID_DQF) { - record = new DMWRecord(); - record.setScene(scene); - record.setChannel(channel); - record.setOrbitalSlot(orbitalSlot); - - location = new SurfaceObsLocation(); - location.assignLocation((float) lat, (float) lon); - location.generateCoordinateStationId(); - record.setLocation(location); - - record.setWindSpd(Float.valueOf(speed)); - record.setWindDir(Float.valueOf(direction)); - - record.setDataTime(new DataTime(datetime)); - - records.add(record); - } - } - } - - /** - * @param dataFile - * The NetCDF File - * @return The mid-point between the start and end image scan. - * @throws Exception - * If the dates are invalid. - */ - private Calendar getDateTime(NetcdfFile dataFile, String traceId) throws Exception { - /* - * TODO: Using the time variable doesn't match the coverage start/end - * dates. Not sure if I'm wrong or it's the data. Also, some time values - * are not filled, so for now I'm parsing the coverage date attributes - */ - // Variable timeVar = dataFile.findVariable("time"); - // double timeOffset = timeVar.readScalarDouble(); - // int timeSec = (int) (timeOffset); - - // Calendar date = (Calendar) epoch.clone(); - // date.add(Calendar.SECOND, timeSec); - // date.add(Calendar.MILLISECOND, (int) ((timeOffset - timeSec) * - // 1000)); - - // return date; - - Calendar date; - - SimpleDateFormat sdf = new SimpleDateFormat(COVERAGE_FORMAT); - sdf.setTimeZone(TimeZone.getTimeZone("GMT")); - - Attribute startAttr = dataFile - .findGlobalAttribute("time_coverage_start"); - Attribute endAttr = dataFile.findGlobalAttribute("time_coverage_end"); - - Date start; - Date end; - if (startAttr != null && endAttr != null) { - start = sdf.parse(startAttr.getStringValue()); - end = sdf.parse(endAttr.getStringValue()); - - Calendar startCal = (Calendar) epoch.clone(); - startCal.setTime(start); - Calendar endCal = (Calendar) epoch.clone(); - endCal.setTime(end); - - long midpointMs = (startCal.getTimeInMillis() + endCal.getTimeInMillis()) / 2; - - date = (Calendar) epoch.clone(); - date.setTimeInMillis(midpointMs); - } else if (endAttr != null) { - end = sdf.parse(endAttr.getStringValue()); - date = (Calendar) epoch.clone(); - date.setTime(end); - statusHandler.warn(traceId - + " - Using coverage end date as reftime."); - } else if (startAttr != null) { - start = sdf.parse(startAttr.getStringValue()); - date = (Calendar) epoch.clone(); - date.setTime(start); - statusHandler.warn(traceId - + " - Using coverage start date as reftime."); - } else { - throw new IllegalArgumentException("Coverage period not found."); - } - - return date; - } -} diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/common_static/base/purge/dmwPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/common_static/base/purge/dmwPurgeRules.xml deleted file mode 100644 index e2b69acb36..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/common_static/base/purge/dmwPurgeRules.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - 02-00:00:00 - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/distribution/dmw.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/distribution/dmw.xml deleted file mode 100644 index 3458e019fd..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/distribution/dmw.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - ^.*(DMW[A-Z0-9]{1,}-M[0-9]C[0-9]{2}).*\.nc$ - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/plugin-filters/dmw_filters.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/plugin-filters/dmw_filters.xml deleted file mode 100644 index 4ec5f4af57..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr.dmw/utility/edex_static/base/plugin-filters/dmw_filters.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Exclude SouthernHemisphere - EXCLUDE - -0.1 - -180.0 - -90.0 - 180.0 - - Point.DMW - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/.classpath deleted file mode 100644 index 16d067f284..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/.project b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/.project deleted file mode 100644 index 568a0932a6..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.raytheon.uf.edex.plugin.goesr - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/META-INF/MANIFEST.MF deleted file mode 100644 index 58b9966867..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: GOESR Decoder -Bundle-SymbolicName: com.raytheon.uf.edex.plugin.goesr -Bundle-Version: 1.15.0.qualifier -Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: javax.measure, - ucar.nc2, - com.raytheon.uf.common.status, - com.raytheon.uf.common.dataplugin.satellite, - com.raytheon.edex.plugin.satellite, - com.raytheon.uf.common.geospatial, - com.raytheon.uf.edex.database, - com.raytheon.uf.common.dataplugin, - com.raytheon.uf.common.datastorage, - com.raytheon.uf.edex.core, - com.raytheon.uf.common.localization;bundle-version="1.14.1", - org.slf4j;bundle-version="1.7.5" -Export-Package: com.raytheon.uf.edex.plugin.goesr diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/build.properties deleted file mode 100644 index 5791d48d5f..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - res/ diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/com.raytheon.uf.edex.plugin.goesr.ecl b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/com.raytheon.uf.edex.plugin.goesr.ecl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_CONUS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_CONUS.xml deleted file mode 100644 index f30789c2fb..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_CONUS.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_FullDisk.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_FullDisk.xml deleted file mode 100644 index 3374f1b4c2..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_FullDisk.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_Mesoscale.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_Mesoscale.xml deleted file mode 100644 index 983d2c4097..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/GOESR_Mesoscale.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/ncml-2.2.xsd b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/ncml-2.2.xsd deleted file mode 100644 index 3d285eae7d..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/documents/ncml-2.2.xsd +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/res/spring/goesr-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/res/spring/goesr-ingest.xml deleted file mode 100644 index e32bbde947..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/res/spring/goesr-ingest.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - satellite - - - goes-r - - - - - - - - - - java.lang.Throwable - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/GoesrDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/GoesrDecoder.java deleted file mode 100644 index 1e293374d5..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/GoesrDecoder.java +++ /dev/null @@ -1,243 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.uf.edex.plugin.goesr; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; - -import javax.measure.unit.SI; -import javax.xml.bind.JAXB; - -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ucar.nc2.NetcdfFile; - -import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; -import com.raytheon.uf.common.datastorage.records.IDataRecord; -import com.raytheon.uf.common.localization.IPathManager; -import com.raytheon.uf.common.localization.LocalizationFile; -import com.raytheon.uf.common.localization.exception.LocalizationException; -import com.raytheon.uf.edex.plugin.goesr.decoder.lookup.ProductDescription; -import com.raytheon.uf.edex.plugin.goesr.decoder.lookup.ProductDescriptions; -import com.raytheon.uf.edex.plugin.goesr.exception.GoesrDecoderException; -import com.raytheon.uf.edex.plugin.goesr.geospatial.GoesrProjectionFactory; -import com.raytheon.uf.edex.plugin.goesr.geospatial.GoesrSatelliteHeight; - -/** - * This decoder attempts to open a potential GOES-R netCDF file, decode the data - * contained in it, and make it available to be stored. - * - * 
- * The code implements the 
- * Ground Segment (GS) to Advanced Weather Interactive Processing System (AWIPS)
- * Interface Control Document (ICD)
- * DOCUMENT CONTROL NUMBER: 7034704 CDRL SE-08 REVISION B
- * Date 31 MAY 2012
- * *****
- * Some variances between the code and the revision are noted. These are
- * due to discrepancies between the ICD and the sample data. These have
- * been reported.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * May 31, 2012  796      jkorman     Initial creation
- * Jul  5, 2013  2123     mschenke    Changed to use in-memory netcdf object
- * Feb 13, 2015  4043     bsteffen    Include scene number in sector.
- * Apr 17, 2015  4336     bsteffen    Rewrite to be configurable for other attribute conventions.
- * 
- * 

- * 
- * @author jkorman
- * @version 1.0
- */
-
-public class GoesrDecoder {
-
-    private static final transient Logger logger = LoggerFactory
-            .getLogger(GoesrDecoder.class);
-
-    private GoesrProjectionFactory projectionFactory;
-
-    private ProductDescriptions descriptions;
-
-    public GoesrDecoder() {
-
-    }
-
-    /**
-     * Decode raw bytes into Satellite Records
-     * 
-     * @param name
-     *            he name of the dataset, typically the filename, may be null in
-     *            which case a UUID is used.
-     * @param goesrData
-     *            bytes must be in netcdf format with no additional headers.
-     * @return Satellite Records.
-     */
-    public SatelliteRecord[] decode(String name, byte[] goesrData) {
-        if (projectionFactory == null) {
-            logger.error("Cannot decode goesr data because no projection factory is available.");
-            return new SatelliteRecord[0];
-        } else if (descriptions == null) {
-            logger.error("Cannot decode goesr data because no descriptions were loaded.");
-        }
-
-        if (name == null) {
-            /*
-             * Name is not used by anything in this plugin but is needed to
-             * construct the NetcdfFile
-             */
-            name = UUID.randomUUID().toString();
-        }
-
-        NetcdfFile cdfFile = null;
-        try {
-            cdfFile = NetcdfFile.openInMemory(name, goesrData);
-            List records = decodeFile(cdfFile);
-            for (Iterator it = records.iterator(); it
-                    .hasNext();) {
-                SatelliteRecord record = it.next();
-                if (record.getDataTime() == null) {
-                    logger.error(
-                            "Discarding Record due to missing DataTime: %",
-                            record);
-                    it.remove();
-                } else if (record.getPhysicalElement() == null) {
-                    logger.error(
-                            "Discarding Record due to missing physical element: %",
-                            record);
-                    it.remove();
-                } else if (record.getSectorID() == null) {
-                    logger.error(
-                            "Discarding Record due to missing sector ID: %",
-                            record);
-                    it.remove();
-                }
-                IDataRecord dataRecord = (IDataRecord) record.getMessageData();
-                dataRecord.setGroup(record.getDataURI());
-            }
-
-            return records.toArray(new SatelliteRecord[0]);
-        } catch (Throwable t) {
-            logger.error("Uncaught error in decoder ", t);
-        } finally {
-            if (cdfFile != null) {
-                try {
-                    cdfFile.close();
-                } catch (IOException e) {
-                    logger.error("Unable to close goes-r netcdf file.", e);
-                }
-            }
-        }
-        return new SatelliteRecord[0];
-    }
-
-    /**
-     * Decode the GOES-R data and return the data in a SatelliteRecord. If an
-     * error occurs or the decoder is unable to decode the data, a null
-     * reference may be returned.
-     * 
-     * @return The decoded GOES-R satellite data.
-     */
-    public List decodeFile(NetcdfFile cdfFile) {
-        List records = new ArrayList<>(1);
-        List descriptions = new ArrayList<>();
-        for (ProductDescription description : this.descriptions
-                .getDescriptions()) {
-            try {
-                if (description.match(cdfFile)) {
-                    if (description.hasData()) {
-                        records.addAll(description.getData(cdfFile,
-                                projectionFactory));
-                    } else {
-                        descriptions.add(description);
-                    }
-                }
-            } catch (GoesrDecoderException e) {
-                logger.error("Could not create GOES-R data from description", e);
-            }
-        }
-        if (records.isEmpty()) {
-            logger.warn("No GOES-R records were found in {}",
-                    cdfFile.getLocation());
-        }
-        for (SatelliteRecord record : records) {
-            for (ProductDescription description : descriptions) {
-                try {
-                    description.describe(record, cdfFile);
-                } catch (GoesrDecoderException e) {
-                    logger.error("Could not create describe GOES-R data", e);
-                }
-            }
-            if (record.getSatHeight() == null) {
-                /*
-                 * Some data formats, which are in a geostationary projection,
-                 * do not define that satellite height, except in the projection
-                 * metadata.
-                 */
-                CoordinateReferenceSystem crs = record.getCoverage().getCrs();
-                double satHeight = GoesrSatelliteHeight.getOrbitalHeight(crs,
-                        SI.KILOMETER);
-                if (!Double.isNaN(satHeight)) {
-                    record.setSatHeight((int) satHeight);
-                }
-            }
-        }
-        return records;
-    }
-
-    public void setProjectionFactory(GoesrProjectionFactory projectionFactory) {
-        this.projectionFactory = projectionFactory;
-    }
-
-    /**
-     * The {@link IPathManager} is used to look up description files.
-     */
-    public void setPathManager(IPathManager pathManager) {
-        LocalizationFile[] files = pathManager.listStaticFiles(
-                "satellite/goesr/descriptions/", new String[] { ".xml" }, true,
-                true);
-        ProductDescriptions descriptions = new ProductDescriptions();
-        for (LocalizationFile file : files) {
-            logger.info("Loading goesr data description from " + file.getName());
-            try (InputStream inputStream = file.openInputStream()) {
-                ProductDescriptions unmarshalled = JAXB.unmarshal(inputStream,
-                        ProductDescriptions.class);
-                descriptions.addDescriptions(unmarshalled);
-            } catch (LocalizationException | IOException e) {
-                logger.error(
-                        "Unable to load product descriptions from "
-                                + file.getName(), e);
-            }
-        }
-        this.descriptions = descriptions;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeMatcher.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeMatcher.java
deleted file mode 100644
index ac7468bb5b..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeMatcher.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.decoder.lookup;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrDecoderException;
-
-/**
- * 
- * Object which can be used to test a {@link NetcdfFile} to see if it contains
- * global attributes that match a specified pattern.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-@XmlAccessorType(XmlAccessType.NONE)
-public class AttributeMatcher {
-
-    @XmlAttribute
-    private String attribute;
-
-    @XmlAttribute
-    private String pattern;
-
-    private transient Pattern compiled;
-
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public String getPattern() {
-        return pattern;
-    }
-
-    public void setPattern(String pattern) {
-        this.pattern = pattern;
-    }
-
-    public boolean matches(NetcdfFile cdfFile) throws GoesrDecoderException {
-        Attribute attr = cdfFile.findGlobalAttribute(attribute);
-        if (attr == null) {
-            return false;
-        }
-        if (compiled == null) {
-            try {
-                compiled = Pattern.compile(pattern);
-            } catch (PatternSyntaxException e) {
-                throw new GoesrDecoderException("Cannot parse pattern ["
-                        + pattern + "] for attribute + [" + attribute + "]", e);
-            }
-        }
-        return compiled.matcher(attr.getStringValue()).matches();
-
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeValue.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeValue.java
deleted file mode 100644
index 6ad57a2aff..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/AttributeValue.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.decoder.lookup;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord;
-import com.raytheon.uf.common.datastorage.records.IDataRecord;
-
-/**
- * Object which can be used to map attributes from a {@link NetcdfFile} to a
- * {@link SatelliteRecord}
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-@XmlAccessorType(XmlAccessType.NONE)
-public class AttributeValue {
-
-    @XmlAttribute
-    private String value;
-
-    @XmlAttribute
-    private String attribute;
-
-    @XmlAttribute
-    private String format;
-
-    @XmlAttribute
-    private String[] formatAttributes;
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public String getFormat() {
-        return format;
-    }
-
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
-    public String[] getFormatAttributes() {
-        return formatAttributes;
-    }
-
-    public void setFormatAttributes(String[] formatAttributes) {
-        this.formatAttributes = formatAttributes;
-    }
-
-    /**
-     * Pull the attributes from the netCDF that this object is describing.
-     * 
-     * @param cdfFile
-     * @return
-     */
-    public String getValue(NetcdfFile cdfFile, SatelliteRecord record) {
-        if (value != null) {
-            return value;
-        } else if (attribute != null) {
-            Attribute attr = cdfFile.findGlobalAttribute(attribute);
-            if (attr != null) {
-                return attr.getStringValue();
-            } else {
-                Object value = getAttributeFromRecord(record, attribute);
-                if (value != null) {
-                    return value.toString();
-                } else {
-                    return null;
-                }
-            }
-        } else if (format != null && formatAttributes != null) {
-            Object[] formatValues = new Object[formatAttributes.length];
-            for (int i = 0; i < formatAttributes.length; i += 1) {
-                Attribute attr = cdfFile
-                        .findGlobalAttribute(formatAttributes[i]);
-                if (attr == null) {
-                    formatValues[i] = getAttributeFromRecord(record,
-                            formatAttributes[i]);
-                    if (formatValues[i] == null) {
-                        return null;
-                    }
-                } else if (attr.getDataType().isNumeric()) {
-                    formatValues[i] = attr.getNumericValue();
-                } else {
-                    formatValues[i] = attr.getStringValue();
-                }
-            }
-            return String.format(format, formatValues);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * When in the Course of decoding records, it becomes necessary for one
-     * value to be sent from the {@link DataDescription} to an attribute of a
-     * data record, it can be added to the
-     * {@link IDataRecord#getDataAttributes()} and be used as though it were an
-     * attribute on the netcdf file.
-     */
-    private Object getAttributeFromRecord(SatelliteRecord record, String name) {
-        if (record == null) {
-            return null;
-        }
-        IDataRecord dataRecord = (IDataRecord) record.getMessageData();
-        if (dataRecord == null) {
-            return null;
-        }
-        Map attributes = dataRecord.getDataAttributes();
-        if (attributes == null) {
-            return null;
-        }
-        return attributes.get(name);
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataDescription.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataDescription.java
deleted file mode 100644
index db0da99c27..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataDescription.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.decoder.lookup;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
-import ucar.ma2.Array;
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.common.dataplugin.satellite.SatMapCoverage;
-import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord;
-import com.raytheon.uf.common.datastorage.DataStoreFactory;
-import com.raytheon.uf.common.datastorage.records.IDataRecord;
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrDecoderException;
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.GoesrProjectionFactory;
-
-/**
- * A description of the data contained with a {@link NetcdfFile} that can be
- * used to extract the message data for use in a {@link SatelliteRecord}
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-@XmlAccessorType(XmlAccessType.NONE)
-public class DataDescription {
-
-    private static final int BITSET_FILL = 0xFF;
-
-    @XmlAttribute
-    private String variable;
-
-    @XmlAttribute
-    private List bitset;
-
-    @XmlAttribute
-    private String maskVariable;
-
-    @XmlAttribute
-    private String verticalDimension;
-
-    @XmlElement(name = "mask")
-    private List masks;
-
-    public String getVariable() {
-        return variable;
-    }
-
-    public void setVariable(String variable) {
-        this.variable = variable;
-    }
-
-    public List getBitset() {
-        return bitset;
-    }
-
-    public void setBitset(List bitset) {
-        this.bitset = bitset;
-    }
-
-    public String getMaskVariable() {
-        return maskVariable;
-    }
-
-    public void setMaskVariable(String maskVariable) {
-        this.maskVariable = maskVariable;
-    }
-
-    public List getMasks() {
-        return masks;
-    }
-
-    public void setMasks(List masks) {
-        this.masks = masks;
-    }
-
-    public String getVerticalDimension() {
-        return verticalDimension;
-    }
-
-    public void setVerticalDimension(String verticalDimension) {
-        this.verticalDimension = verticalDimension;
-    }
-
-    /**
-     * Apply this description to the specified file and extract all
-     * {@link SatelliteRecord}s.
-     * 
-     * @param cdfFile
-     * @param projectionFactory
-     * @return
-     * @throws GoesrProjectionException
-     */
-    public List getData(NetcdfFile cdfFile,
-            GoesrProjectionFactory projectionFactory)
-            throws GoesrDecoderException {
-        if (variable != null) {
-            Variable dataVariable = cdfFile.findVariable(this.variable);
-            if (dataVariable != null) {
-                Attribute attr = dataVariable.findAttribute("grid_mapping");
-                Object data;
-                try {
-                    data = dataVariable.read().copyTo1DJavaArray();
-                } catch (IOException e) {
-                    throw new GoesrDecoderException("Unable to read data from "
-                            + this.variable, e);
-                }
-                SatMapCoverage coverage = projectionFactory.getCoverage(
-                        cdfFile, attr.getStringValue());
-
-                Map attributes = new HashMap<>();
-                attr = dataVariable.findAttribute("add_offset");
-                if (attr != null) {
-                    attributes.put(SatelliteRecord.SAT_ADD_OFFSET, attr
-                            .getNumericValue().floatValue());
-                }
-                attr = dataVariable.findAttribute("scale_factor");
-                if (attr != null) {
-                    attributes.put(SatelliteRecord.SAT_SCALE_FACTOR, attr
-                            .getNumericValue().floatValue());
-                }
-
-                Number fillValue = getFillValue(dataVariable, data);
-
-
-                String units = getUnits(dataVariable);
-
-                if (verticalDimension == null) {
-                    applyMask(cdfFile, data, fillValue);
-                    SatelliteRecord record = createNewRecord(coverage, data,
-                            fillValue, attributes);
-                    if (units != null) {
-                        record.setUnits(units);
-                    }
-                    return Arrays.asList(record);
-                } else {
-                    List records = build3D(cdfFile, coverage,
-                            data, fillValue, attributes);
-                    if (units != null) {
-                        for (SatelliteRecord record : records) {
-                            record.setUnits(units);
-                        }
-                    }
-                    return records;
-                }
-            }
-        } else if (bitset != null) {
-            try {
-                SatelliteRecord record = buildRecordFromBitset(cdfFile,
-                        projectionFactory);
-                return Arrays.asList(record);
-            } catch (IOException e) {
-                throw new GoesrDecoderException("Unable to read data from "
-                        + variable, e);
-            }
-        }
-        return null;
-    }
-
-    private void applyMask(NetcdfFile cdfFile, Object data, Number fillValue)
-            throws GoesrDecoderException {
-        if (this.maskVariable == null) {
-            return;
-        }
-        Variable maskVariable = cdfFile.findVariable(this.maskVariable);
-        Object maskData = null;
-        try {
-            maskData = maskVariable.read().copyTo1DJavaArray();
-        } catch (IOException e) {
-            throw new GoesrDecoderException("Unable to read data from "
-                    + this.variable, e);
-        }
-        /*
-         * Depending on the type one of bMaskData or sMaskData must be set to
-         * not null.
-         */
-        byte[] bMaskData = null;
-        short[] sMaskData = null;
-        if (maskData instanceof byte[]) {
-            bMaskData = (byte[]) maskData;
-        } else if (maskData instanceof short[]) {
-            sMaskData = (short[]) maskData;
-        } else {
-            throw new GoesrDecoderException("Unexpected data of type: "
-                    + data.getClass().getSimpleName());
-        }
-        /* Depending on the type one of bdata or sdata must be set to not null. */
-        byte[] bdata = null;
-        short[] sdata = null;
-        if (data instanceof short[]) {
-            sdata = (short[]) data;
-        } else if (data instanceof byte[]) {
-            bdata = (byte[]) data;
-        } else {
-            throw new GoesrDecoderException("Unexpected data of type: "
-                    + data.getClass().getSimpleName());
-        }
-        int length = java.lang.reflect.Array.getLength(data);
-        for (int i = 0; i < length; i += 1) {
-            boolean fill = true;
-            for (DataMaskDescription mask : this.masks) {
-                int maskVal = bMaskData == null ? sMaskData[i] : bMaskData[i];
-                if (mask.getValue() == maskVal) {
-                    if (!mask.isKeep()) {
-                        if (bdata == null) {
-                            sdata[i] = (short) mask.getFill();
-                        } else {
-                            bdata[i] = (byte) mask.getFill();
-                        }
-                    }
-                    fill = false;
-                    break;
-                }
-            }
-            if (fill) {
-                if (bdata == null) {
-                    sdata[i] = fillValue.shortValue();
-                } else {
-                    bdata[i] = fillValue.byteValue();
-                }
-            }
-        }
-    }
-
-    private List build3D(NetcdfFile cdfFile,
-            SatMapCoverage coverage, Object data, Number fillValue,
-            Map attributes) throws GoesrDecoderException {
-        Variable thirdD = cdfFile.findVariable(verticalDimension);
-        Array dimData;
-        try {
-            dimData = thirdD.read();
-        } catch (IOException e) {
-            throw new GoesrDecoderException("Unable to read data from "
-                    + this.verticalDimension, e);
-        }
-        List records = new ArrayList<>();
-        for (int i = 0; i < thirdD.getSize(); i += 1) {
-            int index = 0;
-            Object newData = null;
-            if (data instanceof short[]) {
-                short[] rawData = (short[]) data;
-                short[] cutData = new short[coverage.getNx() * coverage.getNy()];
-                for (int j = i; j < rawData.length; j += thirdD.getSize()) {
-                    cutData[index++] = rawData[j];
-                }
-                newData = cutData;
-            }else if(data instanceof byte[]){
-                byte[] rawData = (byte[]) data;
-                byte[] cutData = new byte[coverage.getNx() * coverage.getNy()];
-                for (int j = i; j < rawData.length; j += thirdD.getSize()) {
-                    cutData[index++] = rawData[j];
-                }
-                newData = cutData;
-            }else{
-                throw new GoesrDecoderException("Unexpected data of type: " + data.getClass().getSimpleName());
-            }
-            if (attributes == null) {
-                attributes = new HashMap<>(4);
-            } else {
-                attributes = new HashMap<>(attributes);
-            }
-            applyMask(cdfFile, newData, fillValue);
-            /*
-             * This allows the vertical dimension to be used in
-             * ProductDescriptions so that the records generated have unique
-             * attributes.
-             */
-            attributes.put(verticalDimension, dimData.getFloat(i));
-            SatelliteRecord record = createNewRecord(coverage, newData, fillValue,
-                    attributes);
-            records.add(record);
-        }
-        return records;
-    }
-
-    private SatelliteRecord buildRecordFromBitset(NetcdfFile cdfFile,
-            GoesrProjectionFactory projectionFactory) throws IOException,
-            GoesrDecoderException {
-        if (bitset.size() > 7) {
-            throw new GoesrDecoderException(
-                    "Bitset can only currently support 7 fields, this is too many: "
-                            + bitset.toString());
-        }
-        String grid_mapping = null;
-        byte[] data = null;
-        int bit = 0;
-        for (String variable : bitset) {
-            Variable dataVariable = cdfFile.findVariable(variable);
-            Attribute attr = dataVariable.findAttribute("grid_mapping");
-            if (grid_mapping == null) {
-                grid_mapping = attr.getStringValue();
-            } else if (attr != null
-                    && !attr.getStringValue().equals(grid_mapping)) {
-                throw new GoesrProjectionException(
-                        "Bitset projections do not match.");
-            }
-
-            Object rawField = dataVariable.read().copyTo1DJavaArray();
-            if (!(rawField instanceof byte[])) {
-                throw new GoesrDecoderException("Unexpected type["
-                        + rawField.getClass() + "] for variable[" + variable
-                        + "]");
-            }
-            byte[] field = (byte[]) rawField;
-            int fillValue = 0xFF & getFillValue(dataVariable, field).intValue();
-
-            if (data == null) {
-                data = field;
-                if (fillValue != BITSET_FILL) {
-                    for (int i = 0; i < field.length; i += 1) {
-                        if (fillValue == (0xFF & field[i])) {
-                            field[i] = (byte) BITSET_FILL;
-                        }
-                    }
-                }
-
-            } else {
-                for (int i = 0; i < field.length; i += 1) {
-                    if (fillValue == (0xFF & field[i])) {
-                        /*
-                         * Do Nothing, this is an assumption. When thinking
-                         * about a bitset, normally fill is not an option for an
-                         * input but this data has fill and it is used. Do
-                         * nothing means if the data is already filled it will
-                         * stay filled, so any index where all fields are filled
-                         * will be filled but if any one field is valid then all
-                         * filled fields will be 0s
-                         */
-                        continue;
-                    } else if (BITSET_FILL == (0xFF & field[i])) {
-                        data[i] = 0;
-                    }
-                    if (field[i] != 0) {
-                        data[i] = (byte) (data[i] + (1 << bit));
-                    }
-                }
-            }
-            bit += 1;
-        }
-        SatMapCoverage coverage = projectionFactory.getCoverage(cdfFile,
-                grid_mapping);
-        applyMask(cdfFile, data, BITSET_FILL);
-        return createNewRecord(coverage, data, BITSET_FILL, null);
-    }
-
-    private static String getUnits(Variable variable) {
-        Attribute attr = variable.findAttribute("units");
-        if (attr != null && !"1".equals(attr.getStringValue())) {
-            return attr.getStringValue();
-        }
-        return null;
-    }
-
-    private static SatelliteRecord createNewRecord(SatMapCoverage coverage,
-            Object data, Number fillValue, Map attributes) {
-        long[] sizes = new long[] { coverage.getNx(), coverage.getNy() };
-        IDataRecord storageRecord = DataStoreFactory.createStorageRecord(
-                SatelliteRecord.SAT_DATASET_NAME, null, data, 2, sizes);
-        storageRecord.setFillValue(fillValue);
-        storageRecord.setDataAttributes(attributes);
-        SatelliteRecord record = new SatelliteRecord();
-        record.setCoverage(coverage);
-        record.setMessageData(storageRecord);
-        return record;
-    }
-
-    private static Number getFillValue(Variable variable, Object data) {
-        Number fillValue = 0;
-        Attribute attr = variable.findAttribute("_FillValue");
-        if (attr != null) {
-            fillValue = attr.getNumericValue();
-            attr = variable.findAttribute("_Unsigned");
-            if (attr != null) {
-                boolean unsigned = attr.getStringValue().equals("true");
-                if (unsigned && fillValue.intValue() < 0) {
-                    if (data instanceof byte[]) {
-                        fillValue = 0xFF & (fillValue.intValue());
-                    } else if (data instanceof short[]) {
-                        fillValue = 0xFFFF & (fillValue.intValue());
-                    }
-                }
-            }
-        }
-        return fillValue;
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataMaskDescription.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataMaskDescription.java
deleted file mode 100644
index cf6f714ab2..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DataMaskDescription.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.decoder.lookup;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-
-/**
- * Handle the application of a quality control mask to a {@link DataDescription}
- * . Is used to indicate how data should be handled for particular data quality
- * mask values. The two ways the falgs can be ahndled is to keep, which uses the
- * original data value or to select an alternative fill value for the data. Any
- * quality control value that is not included is filled with the default data
- * mask.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-@XmlAccessorType(XmlAccessType.NONE)
-public class DataMaskDescription {
-
-    @XmlAttribute
-    private int value;
-
-    @XmlAttribute
-    private boolean keep;
-
-    @XmlAttribute
-    private int fill;
-
-    public int getValue() {
-        return value;
-    }
-
-    public void setValue(int value) {
-        this.value = value;
-    }
-
-    public boolean isKeep() {
-        return keep;
-    }
-
-    public void setKeep(boolean keep) {
-        this.keep = keep;
-    }
-
-    public int getFill() {
-        return fill;
-    }
-
-    public void setFill(int fill) {
-        this.fill = fill;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DateAttributeValue.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DateAttributeValue.java
deleted file mode 100644
index 58871e863e..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/DateAttributeValue.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.decoder.lookup;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrDecoderException;
-
-/**
- * An {@link AttributeValue} that includes a dateFormat so that dates can be
- * parsed.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-@XmlAccessorType(XmlAccessType.NONE)
-public class DateAttributeValue extends AttributeValue {
-
-    @XmlAttribute
-    private String dateFormat;
-
-    private transient SimpleDateFormat sdf;
-
-    public Date getDate(NetcdfFile cdfFile) throws GoesrDecoderException {
-        String val = getValue(cdfFile, null);
-        if (val == null || dateFormat == null) {
-            return null;
-        }
-        if (sdf == null) {
-            sdf = new SimpleDateFormat(dateFormat);
-        }
-        try {
-            return sdf.parse(val);
-        } catch (ParseException e) {
-            throw new GoesrDecoderException("Unable to parse [" + val
-                    + "] + using format [" + dateFormat + "]", e);
-        }
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescription.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescription.java
deleted file mode 100644
index ac9d985035..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescription.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.decoder.lookup;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord;
-import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrDecoderException;
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.GoesrProjectionFactory;
-
-/**
- * 
- * Contains the information necessary to match a {@link NetcdfFile} and its
- * global attributes to a {@link SatelliteRecord}. Logically this class is
- * copmposed of three parts, the {@link AttributeMatcher}s, the
- * {@link DataDescription}, and the {@link AttributeValue}s.
- * 
- * 
    
- * 
  • The {@link AttributeMatcher}s are evaluated to decide if this description
- * can be applied to the specified file.
- * 
  • The {@link DataDescription} is optional, when it is present it describes
- * how the data variables with the file are mapped into the message data of the
- * SatelliteRecord.
- * 
  • The {@link AttributeValue}s describe how to map netcdf attributes to the
- * attributes on the satellite record.
- * 

- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-@XmlAccessorType(XmlAccessType.NONE)
-public class ProductDescription {
-
-    @XmlElement(name = "match")
-    private List matches;
-
-    @XmlElement
-    private DataDescription data;
-
-    @XmlElement
-    private AttributeValue physicalElement;
-
-    @XmlElement
-    private AttributeValue creatingEntity;
-
-    @XmlElement
-    private AttributeValue source;
-
-    @XmlElement
-    private AttributeValue sectorID;
-
-    @XmlElement
-    private AttributeValue satHeight;
-
-    @XmlElement
-    private AttributeValue units;
-
-    @XmlElement
-    private DateAttributeValue dataTime;
-
-    public List getMatches() {
-        return matches;
-    }
-
-    public void setMatches(List matches) {
-        this.matches = matches;
-    }
-
-    public DataDescription getData() {
-        return data;
-    }
-
-    public void setData(DataDescription data) {
-        this.data = data;
-    }
-
-    public AttributeValue getPhysicalElement() {
-        return physicalElement;
-    }
-
-    public void setPhysicalElement(AttributeValue physicalElement) {
-        this.physicalElement = physicalElement;
-    }
-
-    public AttributeValue getCreatingEntity() {
-        return creatingEntity;
-    }
-
-    public void setCreatingEntity(AttributeValue creatingEntity) {
-        this.creatingEntity = creatingEntity;
-    }
-
-    public AttributeValue getSource() {
-        return source;
-    }
-
-    public void setSource(AttributeValue source) {
-        this.source = source;
-    }
-
-    public AttributeValue getSectorID() {
-        return sectorID;
-    }
-
-    public void setSectorID(AttributeValue sectorID) {
-        this.sectorID = sectorID;
-    }
-
-    public AttributeValue getUnits() {
-        return units;
-    }
-
-    public void setUnits(AttributeValue units) {
-        this.units = units;
-    }
-
-    public DateAttributeValue getDataTime() {
-        return dataTime;
-    }
-
-    public void setDataTime(DateAttributeValue dataTime) {
-        this.dataTime = dataTime;
-    }
-
-    public AttributeValue getSatHeight() {
-        return satHeight;
-    }
-
-    public void setSatHeight(AttributeValue satHeight) {
-        this.satHeight = satHeight;
-    }
-
-    /**
-     * Check if this description contains a {@link DataDescription}. If it does
-     * then it should not be used to describe other records, only those that are
-     * extracted from its own data description.
-     * 
-     * @return true if this dewscription contains a {@link DataDescription}.
-     */
-    public boolean hasData() {
-        return data != null;
-    }
-
-    /**
-     * If this description contains a {@link DataDescription} then use the data
-     * description to create {@link SatelliteRecord}s with message data set
-     * according to the description. This method will also apply any
-     * {@link AttributeValue}s in this description.
-     * 
-     * @param cdfFile
-     * @param projectionFactory
-     * @return
-     * @throws GoesrProjectionException
-     * @throws ParseException
-     * @throws IOException
-     */
-    public List getData(NetcdfFile cdfFile,
-            GoesrProjectionFactory projectionFactory)
-            throws GoesrDecoderException {
-        if (data != null) {
-            List records = data.getData(cdfFile,
-                    projectionFactory);
-            if (records != null) {
-                for (SatelliteRecord record : records) {
-                    describe(record, cdfFile, true);
-                }
-                return records;
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    /**
-     * Apply any {@link AttributeValue}s in this description to the supploed
-     * record.
-     */
-    public void describe(SatelliteRecord record, NetcdfFile cdfFile)
-            throws GoesrDecoderException {
-        describe(record, cdfFile, false);
-    }
-
-    protected void describe(SatelliteRecord record, NetcdfFile cdfFile,
-            boolean override) throws GoesrDecoderException {
-        if (physicalElement != null
-                && (override || record.getPhysicalElement() == null)) {
-            record.setPhysicalElement(physicalElement.getValue(cdfFile, record));
-        }
-        if (creatingEntity != null
-                && (override || record.getCreatingEntity() == null)) {
-            record.setCreatingEntity(creatingEntity.getValue(cdfFile, record));
-        }
-        if (source != null && (override || record.getSource() == null)) {
-            record.setSource(source.getValue(cdfFile, record));
-        }
-        if (sectorID != null && (override || record.getSectorID() == null)) {
-            record.setSectorID(sectorID.getValue(cdfFile, record));
-        }
-        if (dataTime != null && (override || record.getDataTime() == null)) {
-            record.setDataTime(new DataTime(dataTime.getDate(cdfFile)));
-        }
-        if (units != null && (override || record.getUnits() == null)) {
-            record.setUnits(units.getValue(cdfFile, record));
-        }
-    }
-
-    /**
-     * Test all {@link AttributeMatcher}s for this description to see if this
-     * description can be applied to a file.
-     * 
-     * @return true if it matches.
-     */
-    public boolean match(NetcdfFile cdfFile) throws GoesrDecoderException {
-        for (AttributeMatcher matcher : matches) {
-            if (!matcher.matches(cdfFile)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescriptions.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescriptions.java
deleted file mode 100644
index db0ccfb476..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/decoder/lookup/ProductDescriptions.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.decoder.lookup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * 
- * Represents a set of {@link ProductDescription}s
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
-public class ProductDescriptions {
-
-    @XmlElement(name = "description")
-    private List descriptions;
-
-    public List getDescriptions() {
-        return descriptions;
-    }
-
-    public void setDescriptions(List descriptions) {
-        this.descriptions = descriptions;
-    }
-
-    public void addDescription(ProductDescription description) {
-        this.descriptions.add(description);
-    }
-
-    public void addDescriptions(ProductDescriptions descriptions) {
-        if (this.descriptions == null) {
-            this.descriptions = new ArrayList<>();
-        }
-        this.descriptions.addAll(descriptions.getDescriptions());
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrDecoderException.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrDecoderException.java
deleted file mode 100644
index 10133bbd77..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrDecoderException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.exception;
-
-/**
- * Root exception indicating something ahs gone in the decoding of a GOES-R
- * netcdf file.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public class GoesrDecoderException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public GoesrDecoderException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public GoesrDecoderException(String message) {
-        super(message);
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrProjectionException.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrProjectionException.java
deleted file mode 100644
index ad7a513fae..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/exception/GoesrProjectionException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.exception;
-
-/**
- * Thrown when the given projection could not be created.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Jul 03, 2012           jkorman     Initial creation
- * Apr 17, 2015  4336     bsteffen    Extend GoesrDecoderException
- * 
- * 

- * 
- * @author jkorman
- * @version 1.0
- */
-
-public class GoesrProjectionException extends GoesrDecoderException {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Constructs a InvalidProjectionException with an error message.
-     * 
-     * @param message
-     *            The exception detail message.
-     */
-    public GoesrProjectionException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a InvalidProjectionException with an error message and a
-     * chained cause.
-     * 
-     * @param message
-     *            The exception detail message.
-     * @param cause
-     *            The exception that caused this exception to be thrown.
-     */
-    public GoesrProjectionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrProjectionFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrProjectionFactory.java
deleted file mode 100644
index 85c91adc99..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrProjectionFactory.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-import ucar.nc2.Variable;
-
-import com.raytheon.edex.plugin.satellite.dao.SatMapCoverageDao;
-import com.raytheon.uf.common.dataplugin.satellite.SatMapCoverage;
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.crs.GeostationaryCrsFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.crs.GoesrCrsFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.crs.LambertConformalCrsFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.crs.MercatorCrsFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.crs.NorthPolarStereographicCrsFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.envelope.DimensionEnvelopeFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.envelope.GoesrEnvelope;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.envelope.GoesrEnvelopeFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.envelope.ImageBoundsEnvelopeFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.envelope.ProductCenterEnvelopeFactory;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.envelope.TileCenterEnvelopeFactory;
-
-/**
- * 
- * In a GOESR NetCDF file the geolocation information is extracted as two
- * separate, yet equally important entities. The crs which defines the
- * translation onto a spheroid and the envelope which defines the coverage of
- * the product. This is their factory.
- * 
- * Create the {@link SatMapCoverage} corresponding to the projection information
- * contained in the GOES-R netCDF file.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Jun 01, 2012  796      jkorman     Initial creation
- * Jul 05, 2013  2123     mschenke    Refactored to have CRS factory for each type of CRS
- * Oct 29, 2014  3770     bsteffen    Pass more attributes to the projection.
- * Apr 17, 2015  4336     bsteffen    Split out crs and envelope creation into distinct factories.
- * 
- * 

- * 
- * @author jkorman
- * @version 1.0
- */
-public class GoesrProjectionFactory {
-
-    private static final transient Logger logger = LoggerFactory
-            .getLogger(GoesrProjectionFactory.class);
-
-    private static final boolean DEBUG_ENVELOPES = Boolean
-            .getBoolean("goesr.projection.debug.envelopes");
-
-    private final Map crsMap = new HashMap<>();
-
-    private final List envelopeList = new ArrayList<>(3);
-
-    private SatMapCoverageDao satDao;
-
-    /**
-     * Create an instance of this factory.
-     */
-    public GoesrProjectionFactory() {
-        satDao = new SatMapCoverageDao();
-
-        GoesrCrsFactory geostationary = new GeostationaryCrsFactory();
-        GoesrCrsFactory lambert = new LambertConformalCrsFactory();
-        GoesrCrsFactory mercator = new MercatorCrsFactory();
-        GoesrCrsFactory polar = new NorthPolarStereographicCrsFactory();
-        /*
-         * These are the values of the grid_mapping_name attribute within the
-         * grid mapping variable. These are consistent for all known goesr
-         * products.
-         */
-        crsMap.put("geostationary", geostationary);
-        crsMap.put("lambert_conformal_conic", lambert);
-        crsMap.put("polar_stereographic", polar);
-        crsMap.put("mercator", mercator);
-        /*
-         * These are the names of the grid mapping variable for sectorized CMI,
-         * these are not consistent for other data types. It may be safe to
-         * remove these and rely only on the names above.
-         */
-        crsMap.put("lambert_projection", lambert);
-        crsMap.put("mercator_projection", mercator);
-        crsMap.put("polar_projection", polar);
-        crsMap.put("fixedgrid_projection", geostationary);
-
-        envelopeList.add(new ProductCenterEnvelopeFactory());
-        envelopeList.add(new TileCenterEnvelopeFactory());
-        envelopeList.add(new ImageBoundsEnvelopeFactory());
-        envelopeList.add(new DimensionEnvelopeFactory());
-    }
-
-    public GoesrCrsFactory registerCrsFactory(String name,
-            GoesrCrsFactory crsFactory) {
-        crsMap.put(name, crsFactory);
-        return crsFactory;
-    }
-
-    public SatMapCoverage getCoverage(NetcdfFile cdfFile, String projName)
-            throws GoesrProjectionException {
-        Variable projection = cdfFile.findVariable(projName);
-        if (projection != null) {
-            GoesrCrsFactory crsFactory = null;
-            Attribute attr = projection.findAttribute("grid_mapping_name");
-            if (attr != null) {
-                crsFactory = crsMap.get(attr.getStringValue());
-            }
-            if (crsFactory == null) {
-                crsFactory = crsMap.get(projName);
-                if (crsFactory == null) {
-                    String message;
-                    if (attr != null) {
-                        message = String.format(
-                                "Invalid projection identifier [%s.%s].",
-                                projName, attr.getStringValue());
-                    } else {
-                        message = String
-                                .format("Invalid projection identifier [%s].",
-                                        projName);
-                    }
-                    throw new GoesrProjectionException(message);
-                }
-            }
-            CoordinateReferenceSystem crs = crsFactory
-                    .constructCoordinateReferenceSystem(projection);
-            if (DEBUG_ENVELOPES) {
-                debugEnvelopes(cdfFile, crs);
-            }
-            for (GoesrEnvelopeFactory envelopeFactory : envelopeList) {
-                GoesrEnvelope envelope = envelopeFactory.getEnvelope(cdfFile,
-                        crs);
-                if (envelope != null) {
-                    envelope.normalize();
-                    SatMapCoverage coverage = new SatMapCoverage();
-                    coverage.setCrsWKT(crs.toWKT());
-                    coverage.setDx(envelope.getDx());
-                    coverage.setDy(envelope.getDy());
-                    coverage.setMinX(envelope.getMinX());
-                    coverage.setMinY(envelope.getMinY());
-                    coverage.setNx(envelope.getNx());
-                    coverage.setNy(envelope.getNy());
-                    /* Trigger generation of a location. */
-                    coverage.getLocation();
-                    try {
-                        return satDao.getOrCreateCoverage(coverage);
-                    } catch (Exception e) {
-                        throw new GoesrProjectionException(
-                                "Could not create coverage", e);
-                    }
-                }
-            }
-            throw new GoesrProjectionException("Unable to create envelope.");
-        } else {
-            throw new GoesrProjectionException("Projection variable was null");
-        }
-    }
-
-    /**
-     * As long as there exists multiple envelope factories, it is useful to be
-     * able to compare them for different sample files and verify the results
-     * match.
-     * 
-     * @param cdfFile
-     * @param crs
-     */
-    private void debugEnvelopes(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs) {
-        StringBuilder builder = new StringBuilder();
-        builder.append("Envelope comparison for " + cdfFile.getLocation()
-                + " ********************\n");
-        for (GoesrEnvelopeFactory envelopeFactory : envelopeList) {
-            builder.append(envelopeFactory.getClass().getSimpleName());
-            builder.append(": ");
-            GoesrEnvelope envelope = null;
-            try {
-                envelope = envelopeFactory.getEnvelope(cdfFile, crs);
-            } catch (GoesrProjectionException e) {
-                builder.append(e.getLocalizedMessage()).append(": ");
-
-            }
-            if (envelope != null) {
-                envelope.normalize();
-                builder.append(envelope.toString());
-            } else {
-                builder.append("No Envelope");
-            }
-            builder.append("\n");
-        }
-        builder.append("****************************************\n");
-        logger.info(builder.toString());
-    }
-
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrSatelliteHeight.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrSatelliteHeight.java
deleted file mode 100644
index d0b185f19a..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/GoesrSatelliteHeight.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial;
-
-import javax.measure.quantity.Length;
-import javax.measure.unit.Unit;
-
-import org.geotools.referencing.CRS;
-import org.geotools.referencing.operation.projection.MapProjection;
-import org.opengis.parameter.ParameterValue;
-import org.opengis.parameter.ParameterValueGroup;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import com.raytheon.uf.common.geospatial.projection.Geostationary;
-
-/**
- * Utility class for extracting the satellite height from the
- * {@link CoordinateReferenceSystem}. Several pieces of the decoder need this
- * information and don't have a better way to get it.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public class GoesrSatelliteHeight {
-
-    public static double getOrbitalHeight(CoordinateReferenceSystem crs,
-            Unit unit) {
-        MapProjection worldProjection = CRS.getMapProjection(crs);
-        if (worldProjection instanceof Geostationary) {
-            ParameterValueGroup group = worldProjection.getParameterValues();
-            ParameterValue orbitalHeight = group
-                    .parameter(Geostationary.ORBITAL_HEIGHT);
-            return orbitalHeight.doubleValue(unit);
-        }
-        return Double.NaN;
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GeostationaryCrsFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GeostationaryCrsFactory.java
deleted file mode 100644
index d863a701cc..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GeostationaryCrsFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.crs;
-
-import org.opengis.parameter.ParameterValueGroup;
-
-import ucar.nc2.Attribute;
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.common.geospatial.projection.Geostationary;
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * A class representation of the GOES-R FixedGrid projection information
- * contained in the GOES-R netCDF file. The ICD says that this is "unprojected"
- * data, that is, the data is as it is seen from the satellite. This would be a
- * orthographic type projection.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Jun 01, 2012  796      jkorman     Initial creation
- * Jul 05, 2013  2123     mschenke    Implemented Geostationary projection
- * Apr 17, 2015  4336     bsteffen    Converted to be only a CRS factory.
- * 
- * 

- * 
- * @author jkorman
- * @version 1.0
- */
-
-public class GeostationaryCrsFactory extends GoesrCrsFactory {
-
-    private static final String DEF_SWEEP_AXIS = "x";
-
-
-    @Override
-    protected String getProjectionName() {
-        return Geostationary.PROJECTION_NAME;
-    }
-
-    @Override
-    protected void addSpecificParameters(Variable projectionVariable,
-            ParameterValueGroup parameters) throws GoesrProjectionException {
-        setDoubleParameter(projectionVariable, "latitude_of_projection_origin", parameters, "latitude_of_origin");
-        setDoubleParameter(projectionVariable, "longitude_of_projection_origin", parameters, "central_meridian");
-        setDoubleParameter(projectionVariable, "perspective_point_height", parameters,  Geostationary.ORBITAL_HEIGHT);
-        Attribute attribute = projectionVariable.findAttribute("sweep_angle_axis");
-        if (attribute != null) {
-            String sweepAxis = attribute.getStringValue();
-            parameters.parameter(Geostationary.SWEEP_AXIS).setValue(
-                    DEF_SWEEP_AXIS.equals(sweepAxis) ? 0 : 1);
-        }
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GoesrCrsFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GoesrCrsFactory.java
deleted file mode 100644
index 320264e1af..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/GoesrCrsFactory.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.crs;
-
-import org.geotools.referencing.operation.DefaultMathTransformFactory;
-import org.opengis.parameter.ParameterValueGroup;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.NoSuchIdentifierException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import ucar.ma2.DataType;
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.common.geospatial.MapUtil;
-import com.raytheon.uf.common.geospatial.projection.Geostationary;
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * 
- * A GoesrCrsFactory has the ability to parse projection information from the
- * {@link Attribute}s of a {@link Variable} for a specific type of projection.
- * The abstract class provides a means to parse the semi_major, semi_minor,
- * false_easting, and false_northing which are common among all map projections.
- * Other projection parameters should be parsed by sub classes.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public abstract class GoesrCrsFactory {
-
-    protected static final DefaultMathTransformFactory dmtFactory = new DefaultMathTransformFactory();
-    
-    public CoordinateReferenceSystem constructCoordinateReferenceSystem(
-            Variable projectionVariable) throws GoesrProjectionException {
-        try {
-            ParameterValueGroup parameters = dmtFactory
-                    .getDefaultParameters(getProjectionName());
-            setDoubleParameter(projectionVariable, "semi_major_axis",
-                    parameters, "semi_major");
-            setDoubleParameter(projectionVariable, "semi_minor_axis",
-                    parameters, "semi_minor");
-            setDoubleParameter(projectionVariable, parameters, "semi_major");
-            setDoubleParameter(projectionVariable, parameters, "semi_minor");
-            setDoubleParameter(projectionVariable, parameters, "false_easting");
-            setDoubleParameter(projectionVariable, parameters, "false_northing");
-
-            addSpecificParameters(projectionVariable, parameters);
-            return MapUtil.constructProjection(getProjectionName(),
-                    parameters);
-        } catch (NoSuchIdentifierException e) {
-            throw new GoesrProjectionException(
-                    "Unable to find projection by name: "
-                            + Geostationary.PROJECTION_NAME, e);
-        } catch (FactoryException e) {
-            throw new GoesrProjectionException(
-                    "Error constructing projected CRS", e);
-        }
-    }
-    
-    /**
-     * @return The name used to look up the parameters for the projection.
-     */
-    protected abstract String getProjectionName();
-
-    /**
-     * Method provided so that subclasses can add parameters that are needed for
-     * the specific projection type that they are implementing.
-     * 
-     * @param projectionVariable
-     *            the {@link Variable} from the {@link NetcdfFile} that ocntains
-     *            all the projection {@link Attribute}s.
-     * @param parameters
-     *            The parameters that need to be set to define a
-     *            {@link CoordinateReferenceSystem}.
-     * @throws GoesrProjectionException
-     */
-    protected abstract void addSpecificParameters(Variable projectionVariable,
-            ParameterValueGroup parameters) throws GoesrProjectionException;
-
-    /**
-     * Method to copy a value from a netcdf {@link Attribute} to a
-     * {@link ParameterValueGroup}. This should be used when the name that is
-     * expected in the netcdf file matches the name needed for the crs. If the
-     * attribute does not exist then the value is left unchanged in the group.
-     * 
-     * @param projectionVariable
-     *            {@link Variable} containing projection attributes.
-     * @param parameters
-     *            parameters needed to build a CRS.
-     * @param name
-     *            the name of the attribute, used for both lookup in the netcdf
-     *            file and setting the parameter in the group.
-     * @throws GoesrProjectionException
-     */
-    protected final void setDoubleParameter(Variable projectionVariable,
-            ParameterValueGroup parameters, String name)
-            throws GoesrProjectionException {
-        setDoubleParameter(projectionVariable, name, parameters, name);
-    }
-
-    /**
-     * Method to copy a value from a netcdf {@link Attribute} to a
-     * {@link ParameterValueGroup}. This should be used when the name that is
-     * expected in the netcdf file matches the name needed for the crs. If the
-     * attribute does not exist then the value is left unchanged in the group.
-     * 
-     * @param projectionVariable
-     *            {@link Variable} containing projection attributes.
-     * @param attributeName
-     *            name of the attribute that is expected to exist on the
-     *            projectionVariable
-     * @param parameters
-     *            parameters needed to build a CRS.
-     * @param parameterName
-     *            name of the parameter to be set in the parameters.
-     * @throws GoesrProjectionException
-     */
-    protected final void setDoubleParameter(Variable projectionVariable,
-            String attributeName, ParameterValueGroup parameters,
-            String parameterName) throws GoesrProjectionException {
-        Attribute attribute = projectionVariable.findAttribute(attributeName);
-        if (attribute == null) {
-            return;
-        }
-        if(attribute.getDataType() == DataType.STRING){
-            String strValue = attribute.getStringValue();
-            try {
-                double value = Double.parseDouble(strValue);
-                parameters.parameter(parameterName).setValue(value);
-            } catch (NumberFormatException e) {
-                throw new GoesrProjectionException("Unable to parse"
-                        + attributeName, e);
-            }
-        }else{
-            double value = attribute.getNumericValue().doubleValue();
-            parameters.parameter(parameterName).setValue(value);
-        }
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/LambertConformalCrsFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/LambertConformalCrsFactory.java
deleted file mode 100644
index 90cb4ee5d1..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/LambertConformalCrsFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.crs;
-
-import org.opengis.parameter.ParameterValueGroup;
-
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * A class representation of the GOES-R LambertConformal projection information
- * contained in the GOES-R netCDF file.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Jun 01, 2012  796      jkorman     Initial creation
- * Jul 05, 2013  2123     mschenke    Refactored to be CRS factory
- * Apr 17, 2015  4336     bsteffen    Converted to be only a CRS factory.
- * 
- * 

- * 
- * @author jkorman
- * @version 1.0
- */
-
-public class LambertConformalCrsFactory extends GoesrCrsFactory {
-
-    @Override
-    protected String getProjectionName() {
-        return "Lambert_Conformal_Conic_1SP";
-    }
-
-    @Override
-    protected void addSpecificParameters(Variable projectionVariable,
-            ParameterValueGroup parameters) throws GoesrProjectionException {
-        setDoubleParameter(projectionVariable, "standard_parallel", parameters,
-                "latitude_of_origin");
-        setDoubleParameter(projectionVariable, "longitude_of_central_meridian",
-                parameters, "longitude_of_origin");
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/MercatorCrsFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/MercatorCrsFactory.java
deleted file mode 100644
index bf54e465d0..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/MercatorCrsFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.crs;
-
-import org.opengis.parameter.ParameterValueGroup;
-
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * A class representation of the GOES-R Mercator projection information
- * contained in the GOES-R netCDF file.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Jun 01, 2012  796      jkorman     Initial creation
- * Jul 05, 2013  2123     mschenke    Refactored to be CRS factory
- * Apr 17, 2015  4336     bsteffen    Converted to be only a CRS factory.
- * 
- * 

- * 
- * @author jkorman
- * @version 1.0
- */
-
-public class MercatorCrsFactory extends GoesrCrsFactory {
-
-    @Override
-    protected String getProjectionName() {
-        return "Mercator_2SP";
-    }
-
-    @Override
-    protected void addSpecificParameters(Variable projectionVariable,
-            ParameterValueGroup parameters) throws GoesrProjectionException {
-        setDoubleParameter(projectionVariable, "standard_parallel", parameters,
-                "standard_parallel_1");
-        setDoubleParameter(projectionVariable,
-                "longitude_of_projection_origin", parameters,
-                "central_meridian");
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/NorthPolarStereographicCrsFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/NorthPolarStereographicCrsFactory.java
deleted file mode 100644
index a9f6630079..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/crs/NorthPolarStereographicCrsFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.crs;
-
-import org.opengis.parameter.ParameterValueGroup;
-
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * A class representation of the GOES-R PolarStereographic projection
- * information contained in the GOES-R netCDF file.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Jun 01, 2012  796      jkorman     Initial creation
- * Jul 05, 2013  2123     mschenke    Refactored to be CRS factory
- * Apr 17, 2015  4336     bsteffen    Converted to be only a CRS factory.
- * 
- * 

- * 
- * @author jkorman
- * @version 1.0
- */
-
-public class NorthPolarStereographicCrsFactory extends GoesrCrsFactory {
-
-    @Override
-    protected String getProjectionName() {
-        return "Stereographic_North_Pole";
-    }
-
-    @Override
-    protected void addSpecificParameters(Variable projectionVariable,
-            ParameterValueGroup parameters) throws GoesrProjectionException {
-        setDoubleParameter(projectionVariable, "latitude_of_projection_origin",
-                parameters, "standard_parallel_1");
-        setDoubleParameter(projectionVariable,
-                "straight_vertical_longitude_from_pole", parameters,
-                "central_meridian");
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractCenterEnvelopeFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractCenterEnvelopeFactory.java
deleted file mode 100644
index 77c668baac..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractCenterEnvelopeFactory.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import javax.measure.unit.SI;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.edex.plugin.goesr.geospatial.GoesrSatelliteHeight;
-
-/**
- * 
- * Base class for {@link GoesrEnvelopeFactory}s that determine the envelope by
- * looking at global attributes on the netcdf file. This class provides a common
- * method for calculating nx,ny,dx,dy within an envelope and subclasses can
- * calculate minX and minY either by using the product center or tile center
- * attributes. Since the Level2 data types do not set these attributes,
- * factories of this type are generally only applicable to the sectorized CMI
- * files.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public abstract class AbstractCenterEnvelopeFactory implements
-        GoesrEnvelopeFactory {
-
-    protected GoesrEnvelope loadDistanceNumber(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs) {
-        GoesrEnvelope envelope = new GoesrEnvelope();
-        int tileNx;
-        int tileNy;
-        int productNx;
-        int productNy;
-        int offsetx;
-        int offsety;
-        Attribute attr = cdfFile.findGlobalAttribute("pixel_x_size");
-        if (attr == null) {
-            return null;
-        } else {
-            envelope.setDx(attr.getNumericValue().doubleValue() * 1000);
-        }
-        attr = cdfFile.findGlobalAttribute("pixel_y_size");
-        if (attr == null) {
-            return null;
-        } else {
-            envelope.setDy(attr.getNumericValue().doubleValue() * 1000);
-        }
-        attr = cdfFile.findGlobalAttribute("product_tile_width");
-        if (attr == null) {
-            return null;
-        } else {
-            tileNx = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("product_tile_height");
-        if (attr == null) {
-            return null;
-        } else {
-            tileNy = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("product_columns");
-        if (attr == null) {
-            return null;
-        } else {
-            productNx = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("product_rows");
-        if (attr == null) {
-            return null;
-        } else {
-            productNy = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("tile_column_offset");
-        if (attr == null) {
-            return null;
-        } else {
-            offsetx = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("tile_row_offset");
-        if (attr == null) {
-            return null;
-        } else {
-            offsety = attr.getNumericValue().intValue();
-        }
-
-        /*
-         * When the productNx is not evenly divisible by the tileNx the tileNx
-         * is not the actual tileNx. For example if productNx is 1808 tiled to
-         * 1024 than all tiles will have a tileNx of 1024 even the the rightmost
-         * tiles have an actual nx of 784
-         */
-        tileNx = Math.min(productNx - offsetx, tileNx);
-        tileNy = Math.min(productNy - offsety, tileNy);
-
-        envelope.setNx(tileNx);
-        envelope.setNy(tileNy);
-
-        double orbitalHeight = GoesrSatelliteHeight.getOrbitalHeight(crs,
-                SI.KILOMETER);
-        if (!Double.isNaN(orbitalHeight)) {
-            // Geostationary dx/dy hack;
-            double dx = envelope.getDx();
-            double angularSeparation = (dx / 1000.0)
-                    * RADIANS_PER_KM_SPACING;
-            dx  = Math.tan(angularSeparation)
-                    * orbitalHeight;
-            envelope.setDx(dx * 1000);
-            double dy = envelope.getDy();
-            angularSeparation = (dy / 1000.0)
-                    * RADIANS_PER_KM_SPACING;
-            dy  = Math.tan(angularSeparation)
-                    * orbitalHeight;
-            envelope.setDy(dy * 1000);
-        }
-
-        return envelope;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractDimensionEnvelopeFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractDimensionEnvelopeFactory.java
deleted file mode 100644
index 56e3c187d1..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/AbstractDimensionEnvelopeFactory.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import java.text.ParseException;
-import java.text.ParsePosition;
-
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
-import javax.measure.unit.UnitFormat;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-import com.raytheon.uf.edex.plugin.goesr.geospatial.GoesrSatelliteHeight;
-
-/**
- * 
- * Base class for all envelope factories that find envelopes using the x and y
- * dimension variables.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public abstract class AbstractDimensionEnvelopeFactory implements
-        GoesrEnvelopeFactory {
-
-    @Override
-    public GoesrEnvelope getEnvelope(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs) throws GoesrProjectionException {
-        Variable x = cdfFile.findVariable("x");
-        if (x == null || !x.isCoordinateVariable()) {
-            return null;
-        }
-        Variable y = cdfFile.findVariable("y");
-        if (y == null || !y.isCoordinateVariable()) {
-            return null;
-        }
-        return getEnvelopeFromDimensions(cdfFile, crs, x, y);
-
-    }
-
-    protected abstract GoesrEnvelope getEnvelopeFromDimensions(
-            NetcdfFile cdfFile, CoordinateReferenceSystem crs, Variable x,
-            Variable y) throws GoesrProjectionException;
-
-    protected static double findDistance(CoordinateReferenceSystem crs,
-            double scale, Variable dimension) throws GoesrProjectionException {
-        Attribute attr = dimension.findAttribute("units");
-        if (attr == null) {
-            return scale;
-        }
-        String units = attr.getStringValue();
-        return findDistance(crs, scale, units);
-    }
-
-    protected static double findDistance(CoordinateReferenceSystem crs,
-            double scale, String units) throws GoesrProjectionException {
-        if ("meters".equals(units)) {
-            return scale;
-        } else if ("rad".equals(units) || "radian".equals(units)) {
-            double orbitalHeight = GoesrSatelliteHeight.getOrbitalHeight(crs,
-                    SI.METER);
-            if (Double.isNaN(orbitalHeight)) {
-                return 1000 * scale / RADIANS_PER_KM_SPACING;
-            } else {
-                return Math.tan(scale) * orbitalHeight;
-            }
-        } else if ("microradian".equals(units) || "microrad".equals(units)) {
-            return findDistance(crs, scale / 1000 / 1000, "rad");
-        } else {
-            try {
-                Unit u = UnitFormat.getUCUMInstance().parseProductUnit(
-                        units, new ParsePosition(0));
-                if (u.isCompatible(SI.METER)) {
-                    u.getConverterTo(SI.METER).convert(scale);
-                } else {
-                    throw new GoesrProjectionException("Incompatible units: "
-                            + units);
-                }
-            } catch (ParseException e) {
-                throw new GoesrProjectionException("Unrecognized units: "
-                        + units);
-            }
-        }
-
-        return scale;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/DimensionEnvelopeFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/DimensionEnvelopeFactory.java
deleted file mode 100644
index f0a1285df3..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/DimensionEnvelopeFactory.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import java.io.IOException;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import ucar.nc2.NetcdfFile;
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * 
- * Uses the scale and offset and size of the x and y variables to determine the
- * size of the product. This factory should work for all GOES-R products.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public class DimensionEnvelopeFactory extends AbstractDimensionEnvelopeFactory {
-
-    @Override
-    public GoesrEnvelope getEnvelopeFromDimensions(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs, Variable x, Variable y)
-            throws GoesrProjectionException {
-        int nx = x.getDimension(0).getLength();
-        int ny = y.getDimension(0).getLength();
-
-        double scalex = x.findAttribute("scale_factor").getNumericValue()
-                .doubleValue();
-        double offsetx = x.findAttribute("add_offset").getNumericValue()
-                .doubleValue();
-        double scaley = y.findAttribute("scale_factor").getNumericValue()
-                .doubleValue();
-        double offsety = y.findAttribute("add_offset").getNumericValue()
-                .doubleValue();
-        double dx = findDistance(crs, scalex, x);
-        double dy = findDistance(crs, scaley, y);
-
-        double minx;
-        double miny;
-        try {
-
-            minx = x.read().getInt(0);
-            miny = y.read().getInt(0);
-        } catch (IOException e) {
-            throw new GoesrProjectionException(
-                    "Unable to read min values of x or y dimesnions.", e);
-        }
-
-        minx = (minx + offsetx / scalex) * dx;
-        miny = (miny + offsety / scaley) * dy;
-
-        GoesrEnvelope envelope = new GoesrEnvelope();
-        envelope.setNx(nx);
-        envelope.setNy(ny);
-        envelope.setDx(dx);
-        envelope.setDy(dy);
-        envelope.setMinX(minx);
-        envelope.setMinY(miny);
-        return envelope;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelope.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelope.java
deleted file mode 100644
index defcf59eea..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelope.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import com.raytheon.uf.common.dataplugin.satellite.SatMapCoverage;
-
-/**
- * 
- * Defines the non-crs attributes needed to construct a {@link SatMapCoverage}.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public class GoesrEnvelope {
-
-    private double minX;
-
-    private double minY;
-
-    private Integer nx;
-
-    private Integer ny;
-
-    private double dx;
-
-    private double dy;
-
-    public double getMinX() {
-        return minX;
-    }
-
-    public void setMinX(double minX) {
-        this.minX = minX;
-    }
-
-    public double getMinY() {
-        return minY;
-    }
-
-    public void setMinY(double minY) {
-        this.minY = minY;
-    }
-
-    public Integer getNx() {
-        return nx;
-    }
-
-    public void setNx(Integer nx) {
-        this.nx = nx;
-    }
-
-    public Integer getNy() {
-        return ny;
-    }
-
-    public void setNy(Integer ny) {
-        this.ny = ny;
-    }
-
-    public double getDx() {
-        return dx;
-    }
-
-    public void setDx(double dx) {
-        this.dx = dx;
-    }
-
-    public double getDy() {
-        return dy;
-    }
-
-    public void setDy(double dy) {
-        this.dy = dy;
-    }
-
-    public double getWidth() {
-        return nx * dx;
-    }
-
-    public double getHeight() {
-        return ny * dy;
-    }
-
-    public void normalize() {
-        if (dx < 0) {
-            minX = minX + dx * nx;
-            dx = -1 * dx;
-        }
-        if (dy < 0) {
-            minY = minY + dy * ny;
-            dy = -1 * dy;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "GoesrEnvelope [minX=" + minX + ", minY=" + minY + ", nx=" + nx
-                + ", ny=" + ny + ", dx=" + dx + ", dy=" + dy + "]";
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelopeFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelopeFactory.java
deleted file mode 100644
index df330792ca..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/GoesrEnvelopeFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * Because there are multiple ways to define an envelope within a GOES-R
- * {@link NetcdfFile} a common interface is needed for extracting this
- * inofrmation using different methodoligies.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public interface GoesrEnvelopeFactory {
-
-    /**
-     * Default conversion value that is used to convert from an angle between
-     * the satellite and a point of earth into a meter spacing. This value is an
-     * approximation and a better value can usually be determined by using the
-     * actual orbital height.
-     */
-    public static final double RADIANS_PER_KM_SPACING = 28 * 1e-6;
-
-    public GoesrEnvelope getEnvelope(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs) throws GoesrProjectionException;
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ImageBoundsEnvelopeFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ImageBoundsEnvelopeFactory.java
deleted file mode 100644
index 8267675b35..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ImageBoundsEnvelopeFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import java.io.IOException;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import ucar.ma2.Array;
-import ucar.nc2.NetcdfFile;
-import ucar.nc2.Variable;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * 
- * Uses the x and y variables to determine nx and ny, then use the
- * x_image_bounds and y_image_bounds to find the min/max extents of the data and
- * divide by nx or ny to find dx or dy. Sectorized CMI data does not include the
- * image_bounds and will not work with this image factory.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public class ImageBoundsEnvelopeFactory extends
-        AbstractDimensionEnvelopeFactory {
-
-    @Override
-    public GoesrEnvelope getEnvelopeFromDimensions(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs, Variable x, Variable y)
-            throws GoesrProjectionException {
-        int nx = x.getDimension(0).getLength();
-        int ny = y.getDimension(0).getLength();
-
-        double minx;
-        double maxx;
-        double miny;
-        double maxy;
-
-        Variable xBounds = cdfFile.findVariable("x_image_bounds");
-        if (xBounds != null && xBounds.getSize() == 2) {
-            try {
-                Array xData = xBounds.read();
-                minx = xData.getFloat(0);
-                maxx = xData.getFloat(1);
-            } catch (IOException e) {
-                throw new GoesrProjectionException(
-                        "Error reading x_image_bounds");
-            }
-        } else {
-            return null;
-        }
-
-        Variable yBounds = cdfFile.findVariable("y_image_bounds");
-        if (yBounds != null && yBounds.getSize() == 2) {
-            try {
-                Array yData = yBounds.read();
-                miny = yData.getFloat(0);
-                maxy = yData.getFloat(1);
-            } catch (IOException e) {
-                throw new GoesrProjectionException(
-                        "Error reading y_image_bounds");
-            }
-        } else {
-            return null;
-        }
-
-        double dx_native = (maxx - minx) / nx;
-        double dy_native = (maxy - miny) / ny;
-
-        double dx = findDistance(crs, dx_native, x);
-        double dy = findDistance(crs, dy_native, y);
-
-        minx = minx * dx / dx_native;
-        maxx = maxx * dx / dx_native;
-        miny = miny * dy / dy_native;
-        maxy = maxy * dy / dy_native;
-
-        GoesrEnvelope envelope = new GoesrEnvelope();
-        envelope.setNx(nx);
-        envelope.setNy(ny);
-        envelope.setDx(dx);
-        envelope.setDy(dy);
-        envelope.setMinX(minx);
-        envelope.setMinY(miny);
-        return envelope;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ProductCenterEnvelopeFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ProductCenterEnvelopeFactory.java
deleted file mode 100644
index 36c8494ec9..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/ProductCenterEnvelopeFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import org.geotools.geometry.DirectPosition2D;
-import org.geotools.referencing.CRS;
-import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.TransformException;
-
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * 
- * Calculate an envelope by offseting a tile withn a product using the tile
- * offsets and the product center. This method should work for any sectorized
- * CMI data.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public class ProductCenterEnvelopeFactory extends AbstractCenterEnvelopeFactory {
-
-    @Override
-    public GoesrEnvelope getEnvelope(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs) throws GoesrProjectionException {
-        GoesrEnvelope envelope = loadDistanceNumber(cdfFile, crs);
-        if (envelope == null) {
-            return null;
-        }
-        DirectPosition2D center = new DirectPosition2D();
-        int productNx;
-        int productNy;
-        int offsetx;
-        int offsety;
-        Attribute attr = cdfFile.findGlobalAttribute("product_center_longitude");
-        if(attr == null){
-            return null;
-        }else{
-            center.x = attr.getNumericValue().doubleValue();
-        }
-        attr = cdfFile.findGlobalAttribute("product_center_latitude");
-        if (attr == null) {
-            return null;
-        } else {
-            center.y = attr.getNumericValue().doubleValue();
-        }
-        attr = cdfFile.findGlobalAttribute("product_columns");
-        if (attr == null) {
-            return null;
-        } else {
-            productNx = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("product_rows");
-        if (attr == null) {
-            return null;
-        } else {
-            productNy = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("tile_column_offset");
-        if (attr == null) {
-            return null;
-        } else {
-            offsetx = attr.getNumericValue().intValue();
-        }
-        attr = cdfFile.findGlobalAttribute("tile_row_offset");
-        if (attr == null) {
-            return null;
-        } else {
-            offsety = attr.getNumericValue().intValue();
-        }
-        
-        try {
-            CRS.findMathTransform(DefaultGeographicCRS.WGS84, crs, true)
-                    .transform(center, center);
-        } catch (TransformException | FactoryException e) {
-            throw new GoesrProjectionException(
-                    "Error transforming product center point to CRS space", e);
-        }
-
-        double left = center.x + (offsetx - productNx / 2.0) * envelope.getDx();
-
-        double top = center.y - (offsety - productNy / 2.0) * envelope.getDy();
-        double bottom = top - envelope.getHeight();
-
-        envelope.setMinX(left);
-        envelope.setMinY(bottom);
-        return envelope;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/TileCenterEnvelopeFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/TileCenterEnvelopeFactory.java
deleted file mode 100644
index e04229ca39..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/src/com/raytheon/uf/edex/plugin/goesr/geospatial/envelope/TileCenterEnvelopeFactory.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * 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.
- **/
-package com.raytheon.uf.edex.plugin.goesr.geospatial.envelope;
-
-import org.geotools.geometry.DirectPosition2D;
-import org.geotools.referencing.CRS;
-import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.TransformException;
-
-import ucar.ma2.DataType;
-import ucar.nc2.Attribute;
-import ucar.nc2.NetcdfFile;
-
-import com.raytheon.uf.edex.plugin.goesr.exception.GoesrProjectionException;
-
-/**
- * 
- * Calculates envelope based off the tile center defined in the global
- * attributes of a {@link NetcdfFile}. This is known to fail for Himawari data
- * where the center of the tiles is not on the disk.
- * 
- * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Apr 17, 2015  4336     bsteffen    Initial creation
- * 
- * 

- * 
- * @author bsteffen
- * @version 1.0
- */
-public class TileCenterEnvelopeFactory extends AbstractCenterEnvelopeFactory {
-
-    @Override
-    public GoesrEnvelope getEnvelope(NetcdfFile cdfFile,
-            CoordinateReferenceSystem crs) throws GoesrProjectionException {
-        GoesrEnvelope envelope = loadDistanceNumber(cdfFile, crs);
-        if (envelope == null) {
-            return null;
-        }
-        DirectPosition2D center = new DirectPosition2D();
-        Attribute attr = cdfFile.findGlobalAttribute("tile_center_longitude");
-        /*
-         * The empty string is used by himawari when the center of a tile is off
-         * the world, since all valid data is numeric assume any string is
-         * invalid.
-         */
-        if (attr == null || attr.getDataType() == DataType.STRING) {
-            return null;
-        }else{
-            center.x = attr.getNumericValue().doubleValue();
-        }
-        attr = cdfFile.findGlobalAttribute("tile_center_latitude");
-        if (attr == null || attr.getDataType() == DataType.STRING) {
-            return null;
-        } else {
-            center.y = attr.getNumericValue().doubleValue();
-        }
-
-        try {
-            CRS.findMathTransform(DefaultGeographicCRS.WGS84, crs, true)
-                    .transform(center, center);
-        } catch (TransformException | FactoryException e) {
-            throw new GoesrProjectionException(
-                    "Error transforming product center point to CRS space", e);
-        }
-
-        double minX = center.x - envelope.getWidth() / 2.0;
-        double minY = center.y - envelope.getHeight() / 2.0;
-
-        envelope.setMinX(minX);
-        envelope.setMinY(minY);
-        return envelope;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResConus.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResConus.xml
deleted file mode 100644
index 9a797ffdb0..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResConus.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-
-    
-
-	
-		
-			
-				
-				
-					
-						
-							
-							
-								
-							
-						
-					
-					
-						
-							
-								
-							
-							
-								
-							
-							
-								
-							
-							
-								
-							
-						
-						
-							
-								
-							
-							
-								
-									
-                              			
-										
-											
-												
-											
-											
-												
-											
-											
-												
-											
-											
-												
-											
-										
-									
-								
-								
-									
-                              			
-										
-											
-												
-											
-											
-												
-											
-											
-												
-											
-											
-												
-											
-										
-									
-								
-							
-						
-						
-							
-								
-							
-							
-								
-									
-                              			
-										
-											
-												
-											
-											
-												
-											
-											
-												
-											
-											
-												
-											
-										
-									
-								
-								
-									
-                              			
-										
-											
-												
-											
-											
-												
-											
-											
-												
-											
-											
-												
-											
-										
-									
-								
-							
-						
-						
-							
-								
-							
-							
-                            			
-								
-									
-										
-									
-									
-										
-									
-									
-										
-									
-									
-										
-									
-								
-							
-						
-					
-				
-			
-		
-	
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResRegion.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResRegion.xml
deleted file mode 100644
index 603bdb0953..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrBestResRegion.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-
-    
-
-	
-		
-			
-				
-				
-					
-						
-							
-							
-								
-							
-						
-					
-					
-						
-							
-								
-							
-							
-								
-							
-							
-								
-							
-							
-								
-							
-						
-						
-							
-								
-							
-							
-								
-									
-                              			
-										
-											
-												
-											
-											
-												
-											
-											
-												
-											
-											
-												
-											
-										
-									
-								
-								
-									
-                              			
-										
-											
-												
-											
-											
-												
-											
-											
-												
-											
-											
-												
-											
-										
-									
-								
-							
-						
-						
-							
-								
-							
-							
-                            			
-								
-									
-										
-									
-									
-										
-									
-									
-										
-									
-									
-										
-									
-								
-							
-						
-						
-							
-								
-							
-							
-                            			
-								
-									
-										
-									
-									
-										
-									
-									
-										
-									
-									
-										
-									
-								
-							
-						
-					
-				
-			
-		
-	
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrConusLegacyBlend.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrConusLegacyBlend.xml
deleted file mode 100644
index aea9c50916..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrConusLegacyBlend.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-    
-
-    
-        
-            
-				
-	                
-                        
-                            
-                                
-                            
-                            
-                        
-	                    
-	                
-					
-						
-	               			
-    	               			
-        	               			
-	            	       		
-    	           			
-		                    
-		                        
-		                        
-		                            
-		                                
-		                            
-		                            
-		                                
-		                            
-		                            
-		                                
-		                            
-		                            
-										
-									
-		                        
-		                    
-		                
-		                
-	               			
-    	               			
-        	               			
-	            	       		
-    	           			
-		                    
-		                        
-		                        
-		                            
-		                                
-		                            
-		                            
-		                                
-		                            
-		                            
-		                                
-		                            
-   		                            
-										
-									
-		                        
-		                    
-		                
-					
-				
-            
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrRGBComposite.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrRGBComposite.xml
deleted file mode 100644
index 71d81d24fb..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/bundles/satellite/goesr/goesrRGBComposite.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-    
-
-	
-		
-			
-				
-					
-						
-							
-						
-					
-					
-						${productName}
-						
-							RED
-							
-								
-									
-										
-									
-									
-										
-									
-									
-										
-									
-									
-										
-									
-								
-							
-						
-						
-							GREEN
-							
-								
-									
-										
-									
-									
-										
-									
-									
-										
-									
-									
-										
-									
-								
-							
-						
-						
-							BLUE
-							
-								
-									
-										
-									
-									
-										
-									
-									
-										
-									
-									
-										
-									
-								
-							
-						
-					
-				
-			
-		
-	
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ACTP.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ACTP.cmap
deleted file mode 100644
index ed1795769e..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ACTP.cmap
+++ /dev/null
@@ -1,29 +0,0 @@
-
-    
-
-    
-    
-    
-    
-    
-    
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ADP.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ADP.cmap
deleted file mode 100644
index b1d815a85e..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/ADP.cmap
+++ /dev/null
@@ -1,31 +0,0 @@
-
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/CSM.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/CSM.cmap
deleted file mode 100644
index ebc4fbd5c4..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/CSM.cmap
+++ /dev/null
@@ -1,25 +0,0 @@
-
-    
-
-    
-    
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/FSC.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/FSC.cmap
deleted file mode 100644
index 8060bf6ccd..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/FSC.cmap
+++ /dev/null
@@ -1,473 +0,0 @@
-
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/RRQPE.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/RRQPE.cmap
deleted file mode 100644
index 82ae56ee08..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/RRQPE.cmap
+++ /dev/null
@@ -1,622 +0,0 @@
-
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/VTRSB.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/VTRSB.cmap
deleted file mode 100644
index a4e640e4eb..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/GOESR-L2/VTRSB.cmap
+++ /dev/null
@@ -1,1273 +0,0 @@
-
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/IR/CIMSS_IR.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/IR/CIMSS_IR.cmap
deleted file mode 100644
index 8c1f329d16..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/IR/CIMSS_IR.cmap
+++ /dev/null
@@ -1,264 +0,0 @@
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV.cmap
deleted file mode 100644
index 38d440c00a..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV.cmap
+++ /dev/null
@@ -1,264 +0,0 @@
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV2.cmap b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV2.cmap
deleted file mode 100644
index a8f571fecb..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/colormaps/Sat/WV/CIMSS_WV2.cmap
+++ /dev/null
@@ -1,261 +0,0 @@
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml
deleted file mode 100644
index f915afed1c..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satCloudPhase.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-    
-
-    
-        
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satFog.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satFog.xml
deleted file mode 100644
index 423d6a2e18..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satFog.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-    
-
-    
-        
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satMoisture.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satMoisture.xml
deleted file mode 100644
index 43c1083b1d..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satMoisture.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-    
-
-    
-        
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satSnow.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satSnow.xml
deleted file mode 100644
index 40a43b9bb2..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satSnow.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-    
-
-    
-        
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml
deleted file mode 100644
index b744b3b91c..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satUpperLevelInfo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-    
-
-    
-        
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satVegetation.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satVegetation.xml
deleted file mode 100644
index 06c9b39e38..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/derivedParameters/definitions/satVegetation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-    
-
-    
-        
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesr-index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesr-index.xml
deleted file mode 100644
index 2f2a6a92b2..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesr-index.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-    
-
-  
-  
-  
-  
-  
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResConusByChannel.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResConusByChannel.xml
deleted file mode 100644
index c40d40bb0d..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResConusByChannel.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResRegionByChannel.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResRegionByChannel.xml
deleted file mode 100644
index 01dedf70aa..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBestResRegionByChannel.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrByChannel.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrByChannel.xml
deleted file mode 100644
index 1c58114a2c..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrByChannel.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-    
-
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorByChannel.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorByChannel.xml
deleted file mode 100644
index 10253173d1..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorByChannel.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-    
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorLocallyDerived.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorLocallyDerived.xml
deleted file mode 100644
index 82312cc88f..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorLocallyDerived.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-    
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorRGBComposites.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorRGBComposites.xml
deleted file mode 100644
index b9578ce7e4..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrBySectorRGBComposites.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-    
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrConusWithLegacy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrConusWithLegacy.xml
deleted file mode 100644
index d0176d1d73..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrConusWithLegacy.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2.xml
deleted file mode 100644
index 7c461b7288..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-    
-
-    
-      
-    
-    
-      
-    
-    
-      
-    
-    
-      
-    
-    
-      
-    
-    
-      
-    
-    
-      
-    
-    
-      
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Conus.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Conus.xml
deleted file mode 100644
index 777e48d0d5..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Conus.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Fire.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Fire.xml
deleted file mode 100644
index 7b121c6535..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Fire.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2FullDisk.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2FullDisk.xml
deleted file mode 100644
index 363ed24880..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2FullDisk.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Meso.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Meso.xml
deleted file mode 100644
index f53509132d..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Meso.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Stability.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Stability.xml
deleted file mode 100644
index f13b0062ef..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Stability.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Volcano.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Volcano.xml
deleted file mode 100644
index 9ef03ae8cb..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLevel2Volcano.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-    
-
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLocallyDerived.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLocallyDerived.xml
deleted file mode 100644
index c9b90af6d3..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrLocallyDerived.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-    
-
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrMenu.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrMenu.xml
deleted file mode 100644
index 8350f22e62..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrMenu.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-    
-
-    
-        
-        
-            
-            
-        
-        
-            
-                
-                
-            
-            
-                
-                
-                
-            
-            
-                
-                
-                
-            
-            
-                
-                
-                
-            
-        
-        
-        
-        
-        
-        
-        
-        
-            
-            
-        
-        
-            
-            
-        
-        
-            
-            
-        
-    
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrRGBComposites.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrRGBComposites.xml
deleted file mode 100644
index bcc73492f8..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/goesr/goesrRGBComposites.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-    
-
-    
-        
-		
-		
-		
-    
-    
-		
-		
-		
-		
-    
-    
-        
-		
-		
-		
-    
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawari-index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawari-index.xml
deleted file mode 100644
index cd78eaad4e..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawari-index.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-    
-
-  
-  
-  
-  
-  
-  
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariByChannel.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariByChannel.xml
deleted file mode 100644
index 9073ce27cd..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariByChannel.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-    
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariMenu.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariMenu.xml
deleted file mode 100644
index f016cd33b3..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/menus/satellite/himawari/himawariMenu.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-    
-
-  
-    
-    
-  
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesGOESR.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesGOESR.xml
deleted file mode 100644
index 5085f0d0aa..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesGOESR.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-    
-
-  sectorID
-  physicalElement
-  
-    AKREGI
-    01-00:00:00
-  
-  
-    ECONUS
-    01-00:00:00
-  
-  
-    EFD
-    01-00:00:00
-  
-  
-    EMESO-1
-    01-00:00:00
-  
-  
-    EMESO-2
-    01-00:00:00
-  
-  
-    HIREGI
-    01-00:00:00
-  
-  
-    PRREGI
-    01-00:00:00
-  
-  
-    WCONUS
-    01-00:00:00
-  
-  
-    WFD
-    01-00:00:00
-  
-  
-    WMESO-1
-    01-00:00:00
-  
-  
-    WMESO-2
-    01-00:00:00
-  
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesHimawari.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesHimawari.xml
deleted file mode 100644
index 3a1b50e5f8..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/purge/satellitePurgeRulesHimawari.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-    
-
-  sectorID
-  physicalElement
-  
-    HFD
-    01-00:00:00
-  
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ACTP.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ACTP.xml
deleted file mode 100644
index 0f27e5c07e..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ACTP.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ADP.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ADP.xml
deleted file mode 100644
index 7737a338f3..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/ADP.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-    
-
-  
-    
-    
-    
-  
-  
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/AOD.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/AOD.xml
deleted file mode 100644
index 0c63bcf260..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/AOD.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/COD.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/COD.xml
deleted file mode 100644
index 62f8944ace..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/COD.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CPSD.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CPSD.xml
deleted file mode 100644
index a8cc01ffea..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CPSD.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CSM.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CSM.xml
deleted file mode 100644
index d616e028e4..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CSM.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTH.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTH.xml
deleted file mode 100644
index fae130fffa..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTH.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-    
-
-  
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTP.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTP.xml
deleted file mode 100644
index 881c6da393..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTP.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTT.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTT.xml
deleted file mode 100644
index 86276f7c9b..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/CTT.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/DSI.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/DSI.xml
deleted file mode 100644
index cf3a10091a..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/DSI.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-  
-  
-    
-    
-      
-    
-    
-    
-    
-  
-  
-    
-    
-      
-    
-    
-    
-    
-  
-  
-    
-    
-      
-    
-    
-    
-    
-  
-  
-    
-    
-      
-    
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FDC.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FDC.xml
deleted file mode 100644
index ebbdc37204..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FDC.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-  
-  
-    
-    
-      
-    
-    
-  
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FSC.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FSC.xml
deleted file mode 100644
index be30681479..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/FSC.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-East-Sectors.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-East-Sectors.xml
deleted file mode 100644
index 457aa47e5f..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-East-Sectors.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-    
-
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-West-Sectors.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-West-Sectors.xml
deleted file mode 100644
index 17fd2f6cac..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/GOES-West-Sectors.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-    
-
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/Level2CommonDescription.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/Level2CommonDescription.xml
deleted file mode 100644
index 5f8dfee471..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/Level2CommonDescription.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-    
-
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/RRQPE.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/RRQPE.xml
deleted file mode 100644
index d93023cb17..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/RRQPE.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/SST.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/SST.xml
deleted file mode 100644
index 6a701e9c00..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/SST.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/TPW.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/TPW.xml
deleted file mode 100644
index 7279afe950..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/TPW.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VAA.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VAA.xml
deleted file mode 100644
index 921dc3b7f4..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VAA.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-  
-    
-    
-      
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VMP.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VMP.xml
deleted file mode 100644
index 2518036851..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VMP.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VTP.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VTP.xml
deleted file mode 100644
index 8ec4b75b1d..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Level2/VTP.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    
-
-  
-    
-    
-      
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/README.txt b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/README.txt
deleted file mode 100644
index a980b9f78b..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/README.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-This directory and it's subdirectories contain configuration files for the
-GOES-R netcdf imagery decoder. Each configuration is an xml file that contains
-one or more description elements that can be applied to a product. A
-description consists of three parts, the match elements, the data elements,
-and the descriptive elements.
-
-The match elements of a description are used to determine if the description
-applies to a particular product. It consists of an attribute_name that matches
-a global attribute on the netcdf file and a pattern that is a regular
-expression matched to the value of that attribute. If all match elements on a
-description match attributes in a file then that description will be used to
-describe the satellite data in the file.
-
-A data element is optional in a description, if present there can be only one.
-If a data element is specified then it should contain the name of the variable
-containing the numeric, gridded data for the satellite image. An
-alternative to specifying a variable name within the data element is to specify
-a bitset containing multiple variables that will be joined together, one bit per
-product. Products containing data in more than 2 directions can include a
-verticalDimension attribute which should be the name of the variable describing
-the 3rd dimension.
-
-The descriptive elements are used to specify the physicalElement,
-creatingEntity, source, sectorID, satHeight, units, and dataTime of a
-SatelliteRecord. Each description can include a constant value, an attribute
-name whose value will be stored in the correct attribute, or a format and a
-list of attributes whose values will be used within the format. The dataTime
-description also requires a date format that will be used to parse a date
-from an the specified attribute.
-
-For netcdf files that contain multiple products a description contaiing a data
-element should be created for each product. The descriptive for a description
-with a data element will only be applied to products created with the data. Any
-description without a data element will be applied to all the satellite records
-that are generated from the file.
-
-The directory structure of this directory is purely for organization, the
-decoder does not do anything special with specific files/subdirectories. A
-single product can match descriptions in multiple files as easily as multiple
-descriptions in a single file.
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/CMIDataDescription.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/CMIDataDescription.xml
deleted file mode 100644
index b123ada107..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/CMIDataDescription.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-    
-
-  
-    
-    
-    
-    
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-East-Sectors.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-East-Sectors.xml
deleted file mode 100644
index 3c93a2e1f4..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-East-Sectors.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-    
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-  
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-West-Sectors.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-West-Sectors.xml
deleted file mode 100644
index cf5da491df..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/GOES-West-Sectors.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-    
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-  
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/Himawari-Sectors.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/Himawari-Sectors.xml
deleted file mode 100644
index a44c227ebd..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/satellite/goesr/descriptions/Sectorized_CMI/Himawari-Sectors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-    
-
-  
-    
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrCMI-ImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrCMI-ImageryStyleRules.xml
deleted file mode 100644
index caa7b7c84d..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrCMI-ImageryStyleRules.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-    
-
-  
-  
-    
-      CH-07-3.90um
-      CH-11-8.50um
-      CH-12-9.61um
-      CH-13-10.35um
-      CH-14-11.20um
-      CH-15-12.30um
-      CH-16-13.30um
-    
-    
-      C
-      IRPixel
-      
-        55
-        -109
-      
-      Sat/IR/CIMSS_IR
-      
-        40 20 0 -20 -40 -60 -80
-      
-    
-  
-  
-    
-      CH-08-6.19um
-      CH-09-6.95um
-      CH-10-7.34um
-    
-    
-      C
-      IRPixel
-      
-        55
-        -109
-      
-      Sat/WV/CIMSS_WV
-      
-        40 20 0 -20 -40 -60 -80
-      
-    
-  
-  
-    
-      CH-01-0.47um
-      CH-02-0.64um
-      CH-03-0.87um
-      CH-04-1.38um
-      CH-05-1.61um
-      CH-06-2.25um
-    
-    
-      
-        0
-        4096
-      
-      Sat/VIS/ZA (Vis Default)
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrDerivedImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrDerivedImageryStyleRules.xml
deleted file mode 100644
index 0a93d3cc39..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrDerivedImageryStyleRules.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-    
-
-	
-	
-		
-			satMoisture
-		
-		
-			K
-			
-				-1.0
-				16.0
-			
-			Grid/gridded data
-			
-				0 3 6 9 12 15
-			
-		
-	
-	
-		
-			satCloudPhase
-		
-		
-			K
-			
-				-8.0
-				24.0
-			
-			Grid/gridded data
-			
-				-5 0 5 10 15 20
-			
-		
-	
-	
-		
-			satFog
-		
-		
-			K
-			
-				-10.0
-				100.0
-			
-			Grid/gridded data
-			
-				0 20 40 60 80 100
-			
-		
-	
-	
-		
-			satUpperLevelInfo
-		
-		
-			K
-			
-				-30.0
-				90.0
-			
-			Grid/gridded data
-			
-				-20 0 20 40 60 80
-			
-		
-	
-	
-		
-			satSnow
-			satVegetation
-		
-		
-			
-				-1300.0
-				300.0
-			
-			Grid/gridded data
-		
-	
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrL2-ImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrL2-ImageryStyleRules.xml
deleted file mode 100644
index 56967f4fe1..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/goesrL2-ImageryStyleRules.xml
+++ /dev/null
@@ -1,446 +0,0 @@
-
-    
-
-  
-  
-    
-      ADP
-    
-    
-      Aerosol Detection
-      Sat/GOESR-L2/ADP
-      
-        -0.5
-        8.5
-      
-      
-        
-        
-        
-        
-        
-        
-        
-        
-        
-     
-    
-  
-  
-    
-      AOD
-    
-    
-      Aerosol Optical Depth
-      
-        -1
-        5
-      
-      Sat/GOESR-L2/VTRSB
-      
-        -1 0 1 2 3 4 5
-      
-    
-  
-  
-    
-      CSM
-    
-    
-      Clear Sky Mask
-      Sat/GOESR-L2/CSM
-      
-        -0.5
-        2.5
-      
-      
-        
-        
-        
-     
-    
-  
-  
-    
-      COD
-    
-    
-      Cloud Optical Depth
-      
-        0
-        160
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 40 80 120 160
-      
-    
-  
-  
-    
-      CPSD
-    
-    
-      Cloud Particle Size
-      microm
-      
-        0
-        100
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 20 40 60 80 100
-      
-    
-  
-  
-    
-      CTH
-    
-    
-      Cloud Top Height
-      m
-      
-        0
-        15000
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 3000 6000 9000 12000 15000
-      
-    
-  
-  
-    
-      ACTP
-    
-    
-      Cloud Top Phase
-      Sat/GOESR-L2/ACTP
-      
-        -0.5
-        6.5
-      
-      
-        
-        
-        
-        
-        
-        
-        
-     
-    
-  
-  
-    
-      CTP
-    
-    
-      Cloud Top Pressure
-      mb
-      
-        0
-        1100
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 200 400 600 800 1000
-      
-    
-  
-  
-    
-      CTT
-    
-    
-      Cloud Top Temperature
-      C
-      
-        55
-        -109
-      
-      Sat/GOESR-L2/VTRSB
-      
-        40 20 0 -20 -40 -60 -80
-      
-    
-  
-  
-    
-      CAPE
-    
-    
-      J/kg
-      
-        0
-        5000
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 1000 2000 3000 4000 5000
-      
-    
-  
-  
-    
-      KI
-      
-      GOES-16
-      GOES-17
-      GOES-18
-    
-    
-      K-Index
-      C
-      
-        -70
-        70
-      
-      Sat/GOESR-L2/VTRSB
-      
-        -60 -40 -20 0 20 40 60
-      
-    
-  
-  
-    
-      LI
-    
-    
-      Lifted Index
-      C
-      
-        -40
-        40
-      
-      Sat/GOESR-L2/VTRSB
-      
-        -40 -20 0 20 40
-      
-    
-  
-  
-    
-      SI
-    
-    
-      Showalter Index
-      C
-      
-        -30
-        30
-      
-      Sat/GOESR-L2/VTRSB
-      
-        -30 -20 -10 0 10 20 30
-      
-    
-  
-  
-    
-      TT
-    
-    
-      Total Totals
-      C
-      
-        -60
-        60
-      
-      Sat/GOESR-L2/VTRSB
-      
-        -60 -40 -20 0 20 40 60
-      
-    
-  
-  
-    
-      FDC Area
-    
-    
-      Fire Area
-      km*km
-      
-        0
-        4
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 1 2 3 4
-      
-    
-  
-  
-    
-      FDC Power
-    
-    
-      Fire Power
-      MW
-      
-        0
-        1000
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 200 400 600 800 1000
-      
-    
-  
-  
-    
-      FDC Temp
-    
-    
-      Fire Temperature
-      K
-      
-        400
-        1200
-      
-      Sat/GOESR-L2/VTRSB
-      
-        400 600 800 1000 1200
-      
-    
-  
-  
-    
-      FDC Area
-    
-    
-      Fire Area
-      km*km
-      
-        0
-        4
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 1 2 3 4
-      
-    
-  
-  
-  
-    
-      RRQPE
-    
-    
-      Rain Rate/Quantitative Precip Estimate
-      mm/h
-      
-        0
-        30
-      
-      Sat/GOESR-L2/RRQPE
-      
-        0 5 10 15 20 25 30
-      
-    
-  
-  
-    
-      SST
-    
-    
-      Sea Surface Temperature
-      C
-      
-        0
-        30
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 5 10 15 20 25 30
-      
-    
-  
-  
-    
-      FSC
-    
-    
-      Snow Cover
-      %
-      
-        0
-        100
-      
-      Sat/GOESR-L2/FSC
-      
-        0 25 50 75 100
-      
-    
-  
-  
-    
-      TPW
-    
-    
-      Total Precip Water
-      mm
-      
-        0
-        84
-      
-      Sat/Precip Water/Precip Water - New CIMSS Table
-      
-        0 17 34 50 67 84
-      
-    
-  
-  
-    
-      VAH
-    
-    
-      Volcanic Ash Cloud Height
-      m
-      
-        0
-        30000
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 10000 20000 30000
-      
-    
-  
-  
-    
-      VAML
-    
-    
-      Volcanic Ash Mass Loading
-      ton_us/(km*km)
-      
-        0
-        300
-      
-      Sat/GOESR-L2/VTRSB
-      
-        0 50 100 150 200 250 300
-      
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/himawariImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/himawariImageryStyleRules.xml
deleted file mode 100644
index 4cce70fbf6..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/styleRules/himawariImageryStyleRules.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-    
-
-  
-  
-  
-    
-      CH-07-3.89um
-      CH-11-8.59um
-      CH-12-9.64um
-      CH-13-10.41um
-      CH-14-11.24um
-      CH-15-12.38um
-      CH-16-13.28um
-    
-    
-      C
-      IRPixel
-      
-        55
-        -109
-      
-      Sat/IR/CIMSS_IR
-      
-        40 20 0 -20 -40 -60 -80
-      
-    
-  
-  
-    
-      CH-08-6.24um
-      CH-09-6.94um
-      CH-10-7.35um
-    
-    
-      C
-      IRPixel
-      
-        55
-        -109
-      
-      Sat/WV/CIMSS_WV
-      
-        40 20 0 -20 -40 -60 -80
-      
-    
-  
-  
-    
-      
-      CH-02-0.51um
-      CH-03-0.64um
-      CH-04-0.86um
-      CH-05-1.61um
-      CH-06-2.26um
-    
-    
-      
-        0
-        4096
-      
-      Sat/VIS/ZA (Vis Default)
-    
-  
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/edex_static/base/distribution/goesr.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/edex_static/base/distribution/goesr.xml
deleted file mode 100644
index a3fbcdea56..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/edex_static/base/distribution/goesr.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	^TI[SR]
-    
-    
-    ^IT_ABI-L2.*
-    ^OR_ABI-L2-\w{3,5}(C|F|M1|M2)-M[34]_G\d\d_s\d{14}_e\d{14}_c\d{14}.nc$
-