From e5388d1ab575f389c8e8d7bf13dfe14f756631c1 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Fri, 26 Oct 2018 16:05:33 -0600 Subject: [PATCH] remove datasetinfo grid aliasing --- .../uf/viz/damagepath/ExportToLdadAction.java | 128 --- .../raytheon/uf/viz/hpe/util/HpeUtils.java | 19 +- .../raytheon/viz/grid/GridDataListing.java | 10 +- .../grid/GridProductBrowserDataFormatter.java | 13 +- .../viz/grid/inv/VizGridInventory.java | 71 -- .../viz/grid/rsc/general/D2DGridResource.java | 11 +- .../DataSelectionMenuItems.xml | 35 +- .../GridAlterBundleContributor.java | 11 +- .../base/grid/dataset/alias/gfeParamInfo.xml | 20 - .../gribDatasets_NCEP-7_NationalBlend.xml | 54 - .../NCEP/gribDatasets_NCEP-7_URMA.xml | 34 - .../datasetInfo/gribDatasets_ECMWF-98.xml | 104 -- .../grid/datasetInfo/gribDatasets_FNMO-58.xml | 44 - .../grid/datasetInfo/gribDatasets_FSL-59.xml | 34 - .../grid/datasetInfo/gribDatasets_NCEP-7.xml | 1005 ----------------- .../datasetInfo/gribDatasets_NOAA-161.xml | 34 - .../grid/datasetInfo/gribDatasets_NWSTG-8.xml | 34 - .../grid/datasetInfo/gribDatasets_RFC-9.xml | 689 ----------- .../grid/datasetInfo/gribDatasets_RSMC-54.xml | 39 - .../datasetInfo/gribDatasets_UKMET-74.xml | 79 -- .../data/StaticGridRequestableData.java | 13 - .../META-INF/MANIFEST.MF | 1 - .../dataplugin/grid/dataset/DatasetInfo.java | 95 -- .../grid/dataset/DatasetInfoLookup.java | 124 -- .../grid/dataset/DatasetInfoSet.java | 62 - .../uf/common/menus/vb/VbSourceList.java | 8 +- .../plugin/grid/handler/GridTreeHandler.java | 18 +- .../base/purge/gridPurgeRules.xml | 224 +--- 28 files changed, 34 insertions(+), 2979 deletions(-) delete mode 100644 cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/ExportToLdadAction.java delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/NCEP/gribDatasets_NCEP-7_NationalBlend.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/NCEP/gribDatasets_NCEP-7_URMA.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_ECMWF-98.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FNMO-58.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FSL-59.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NOAA-161.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NWSTG-8.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RSMC-54.xml delete mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_UKMET-74.xml delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfo.java delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java delete mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoSet.java diff --git a/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/ExportToLdadAction.java b/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/ExportToLdadAction.java deleted file mode 100644 index 497f4cd646..0000000000 --- a/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/ExportToLdadAction.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.viz.damagepath; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import org.apache.commons.lang3.StringUtils; -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.data.simple.SimpleFeatureCollection; - -import com.raytheon.uf.common.damagepath.request.ExportToLdadRequest; -import com.raytheon.uf.common.json.JsonException; -import com.raytheon.uf.common.json.geo.SimpleGeoJsonService; -import com.raytheon.uf.common.serialization.comm.IServerRequest; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.viz.core.exception.VizException; -import com.raytheon.uf.viz.core.localization.LocalizationManager; -import com.raytheon.uf.viz.core.requests.ThriftClient; -import com.raytheon.viz.ui.cmenu.AbstractRightClickAction; - -/** - * Legend right-click action to take the current {@code DamagePathLayer} data - * and export it to LDAD in GeoJSON format. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- -------------------------- 
- * Jun 08, 2015  #4355     dgilling    Initial creation
- * Jun 18, 2015  #4354     dgilling    Support FeatureCollections so each 
- *                                     polygon can have its own properties.
- * Mar 11, 2016  #5288     dgilling    Rewrite to spawn async Job.
- * 
- *
- * - * @author dgilling - * @version 1.0 - */ - -public class ExportToLdadAction extends AbstractRightClickAction { - - private static class ExportDamagePathToLdadJob extends Job { - - private static final String PLUGIN_ID = "com.raytheon.uf.viz.damagepath"; - - private final DamagePathLayer layer; - - protected ExportDamagePathToLdadJob(DamagePathLayer layer) { - super("Exporting Damage Path to LDAD"); - this.layer = layer; - } - - @Override - protected IStatus run(IProgressMonitor monitor) { - try (ByteArrayOutputStream outStream = new ByteArrayOutputStream()) { - SimpleFeatureCollection featureCollection = layer - .buildFeatureCollection(); - - new SimpleGeoJsonService().serialize(featureCollection, - outStream); - byte[] jsonData = outStream.toByteArray(); - - try { - String siteID = LocalizationManager.getInstance() - .getCurrentSite(); - IServerRequest request = new ExportToLdadRequest(siteID, - jsonData); - String errorMsg = (String) ThriftClient - .sendRequest(request); - if (StringUtils.isNotEmpty(errorMsg)) { - String msg = "Could not export damage path data to LDAD: " - + errorMsg; - statusHandler.error(msg); - return new Status(IStatus.ERROR, PLUGIN_ID, msg); - } - } catch (VizException e) { - String msg = "Error processing ExportToLdadRequest."; - statusHandler.error(msg, e); - return new Status(IStatus.ERROR, PLUGIN_ID, msg, e); - } - } catch (JsonException | IOException e) { - String msg = "Error serializing Damage Path data to GeoJSON."; - statusHandler.error(msg, e); - return new Status(IStatus.ERROR, PLUGIN_ID, msg, e); - } - - statusHandler.info("Damage Path successfully exported."); - return Status.OK_STATUS; - } - } - - protected static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(ExportToLdadAction.class); - - public ExportToLdadAction() { - super("Export to LDAD"); - } - - @Override - public void run() { - new ExportDamagePathToLdadJob((DamagePathLayer) getSelectedRsc()) - .schedule(); - } -} diff --git a/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/util/HpeUtils.java b/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/util/HpeUtils.java index 17f528b367..b3da6eb863 100644 --- a/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/util/HpeUtils.java +++ b/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/util/HpeUtils.java @@ -20,8 +20,6 @@ package com.raytheon.uf.viz.hpe.util; import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; /** * HPE Utilities @@ -42,9 +40,6 @@ import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; */ public class HpeUtils { - private static final String HPE = "HPE"; - - private static final String BIAS_HPE = "BiasHPE"; /** * Determine if this title represents an HPE model. @@ -55,19 +50,9 @@ public class HpeUtils { * */ public static boolean isHpe(GridRecord gridRecord) { - String title = null; if (gridRecord != null) { - DatasetInfo info = DatasetInfoLookup.getInstance().getInfo( - gridRecord.getDatasetId()); - if (info != null) { - title = info.getTitle(); - } + return gridRecord.getDatasetId().contains("HPE"); } - - if (title == null) { - return false; - } - - return HPE.equals(title) || BIAS_HPE.equals(title); + return false; } } diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridDataListing.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridDataListing.java index 583ffb4898..3226007bdd 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridDataListing.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridDataListing.java @@ -33,8 +33,6 @@ import com.raytheon.uf.common.datalisting.DataListing; import com.raytheon.uf.common.datalisting.impl.DefaultDataListing; import com.raytheon.uf.common.dataplugin.grid.GridConstants; import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.dataplugin.level.Level; import com.raytheon.uf.common.dataplugin.level.LevelFactory; import com.raytheon.uf.common.dataplugin.level.MasterLevel; @@ -96,14 +94,8 @@ public class GridDataListing extends DefaultDataListing { protected Map getFormattedValues(String key, Collection values) { if (GridConstants.DATASET_ID.equals(key)) { Map formatted = new LinkedHashMap<>(); - DatasetInfoLookup lookup = DatasetInfoLookup.getInstance(); for (String value : values) { - DatasetInfo info = lookup.getInfo(value); - if (info == null) { - formatted.put(value, value); - } else { - formatted.put(value, info.getTitle() + " (" + value + ")"); - } + formatted.put(value, value); } return sortByValue(formatted); } else if (GridInventory.PARAMETER_QUERY.equals(key)) { diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java index eb1424e172..8eeb6161c6 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java @@ -26,8 +26,6 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.dataplugin.level.Level; import com.raytheon.uf.common.dataplugin.level.LevelFactory; import com.raytheon.uf.common.dataplugin.level.MasterLevel; @@ -69,16 +67,9 @@ public class GridProductBrowserDataFormatter { String[] parameters) { List labels = new ArrayList(); if (GridInventory.MODEL_NAME_QUERY.equals(param)) { - DatasetInfoLookup lookup = DatasetInfoLookup.getInstance(); for (int i = 0; i < parameters.length; i++) { - DatasetInfo info = lookup.getInfo(parameters[i]); - if (info == null) { - labels.add(new ProductBrowserLabel(parameters[i], - parameters[i])); - } else { - labels.add(new ProductBrowserLabel(info.getTitle() + " (" - + parameters[i] + ")", parameters[i])); - } + labels.add(new ProductBrowserLabel(parameters[i], + parameters[i])); } Collections.sort(labels); return labels; diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/VizGridInventory.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/VizGridInventory.java index 9bbc3d8685..d061370748 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/VizGridInventory.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/VizGridInventory.java @@ -33,8 +33,6 @@ import java.util.Set; import com.raytheon.uf.common.dataplugin.grid.GridConstants; import com.raytheon.uf.common.dataplugin.grid.GridInfoConstants; import com.raytheon.uf.common.dataplugin.grid.GridInfoRecord; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.dataplugin.grid.derivparam.CommonGridInventory; import com.raytheon.uf.common.dataplugin.grid.derivparam.GridInventoryUpdater; import com.raytheon.uf.common.dataplugin.grid.derivparam.cache.CoverageUtils; @@ -212,7 +210,6 @@ public class VizGridInventory extends CommonGridInventory protected DataTree createBaseTree() throws DataCubeException { DataTree newTree = super.createBaseTree(); initGatherModels(newTree); - initAliasModels(newTree); GridExtensionManager.addToBaseTree(newTree, derParLibrary); return newTree; } @@ -239,74 +236,6 @@ public class VizGridInventory extends CommonGridInventory return rval; } - /** - * Prepare an alias map, from a modelName to all modelNames that it - * includes, from highest res to lowest res - * - * @param newGridTree - */ - private void initAliasModels(DataTree newGridTree) { - sourceAliases.clear(); - DatasetInfoLookup lookup = DatasetInfoLookup.getInstance(); - for (String modelName : newGridTree.getSources()) { - DatasetInfo info = lookup.getInfo(modelName); - if (info != null && info.getAlias() != null) { - SourceNode source = newGridTree.getSourceNode(modelName); - SourceNode dest = newGridTree.getSourceNode(info.getAlias()); - if (source != null && dest != null) { - List aliases = sourceAliases.get(dest.getValue()); - if (aliases == null) { - aliases = new ArrayList<>(); - aliases.add(dest.getValue()); - sourceAliases.put(dest.getValue(), aliases); - } - aliases.add(source.getValue()); - } - } - } - for (Entry> aliases : sourceAliases.entrySet()) { - Collections.sort(aliases.getValue(), new Comparator() { - - @Override - public int compare(String model1, String model2) { - try { - // attempt to figure out which model is the highest - // resolution. - Collection coverages1 = CoverageUtils - .getInstance().getCoverages(model1); - Collection coverages2 = CoverageUtils - .getInstance().getCoverages(model2); - if (coverages1.isEmpty()) { - return 1; - } else if (coverages2.isEmpty()) { - return -1; - } - double total1 = 0; - double total2 = 0; - for (GridCoverage coverage : coverages1) { - total1 += coverage.getDx(); - total1 += coverage.getDy(); - } - for (GridCoverage coverage : coverages2) { - total2 += coverage.getDx(); - total2 += coverage.getDy(); - } - Double res1 = total1 / coverages1.size(); - Double res2 = total2 / coverages2.size(); - return res1.compareTo(res2); - } catch (DataCubeException e) { - statusHandler.handle(Priority.PROBLEM, - "Unable to create model aliases, problems with " - + model1 + " and " + model2, - e); - return 0; - } - } - - }); - } - } - public Set getAvailableLevels(Map query) { Set levels = new HashSet<>(); List nodes = evaluateRequestConstraints(query); diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java index f4e92f6b5f..6f07997d53 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java @@ -35,8 +35,6 @@ import org.opengis.referencing.operation.TransformException; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.datastorage.Request; import com.raytheon.uf.common.datastorage.records.IDataRecord; import com.raytheon.uf.common.geospatial.MapUtil; @@ -314,13 +312,8 @@ public class D2DGridResource extends GridResource } } LegendParameters legendParams = new LegendParameters(); - DatasetInfo info = DatasetInfoLookup.getInstance() - .getInfo(record.getDatasetId()); - if (info == null) { - legendParams.model = record.getDatasetId(); - } else { - legendParams.model = info.getTitle(); - } + + legendParams.model = record.getDatasetId(); legendParams.level = record.getLevel(); legendParams.parameter = record.getParameter().getName(); legendParams.ensembleId = record.getEnsembleId(); diff --git a/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml b/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml index aacad417b5..739838945e 100644 --- a/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml +++ b/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml @@ -19,27 +19,30 @@ further_licensing_information. --> - ENPwave - GFS40 - GFS90 - GFSensemble - GFSGuide - GriddedMOS + CMC + ESTOFS + ETSS + GFS + GFS20 GWW + MOSGuide + HRRR HPCGuide - LAMP - MSAS + LAMP2p5 NAM12 NAM40 - NAM80 - NAMWX - NICIE - TPC-HurWind + NAVGEM + NationalBlend + PROB3HR + NOHRSC-SNOW + HPCqpf + HPCqpfNDFD + fnmocWave + SeaIce + SPCGuide + RTMA TPCWindProb - TPCWindProb_Prelim - WNAwave - RTG_SST-Analysis - DMD + URMA25 GFSBufr GoesBufr MDCRS diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/GridAlterBundleContributor.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/GridAlterBundleContributor.java index f776432ba1..b3824b21b9 100644 --- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/GridAlterBundleContributor.java +++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/GridAlterBundleContributor.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import com.raytheon.uf.common.dataplugin.grid.GridConstants; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; import com.raytheon.uf.common.menus.vb.VbSource; import com.raytheon.uf.common.menus.vb.VbSourceList; @@ -103,18 +102,14 @@ public class GridAlterBundleContributor extends AlterBundleContributorAdapter { if (selectedString != null) { reqMap.put(GridConstants.DATASET_ID, new RequestConstraint( selectedString)); - DatasetInfoLookup lookup = DatasetInfoLookup.getInstance(); // next, need to modify for other displays (not plan view) if (data instanceof VarHeightResourceData) { - ((VarHeightResourceData) data).setSource(lookup.getInfo( - selectedString).getTitle()); + ((VarHeightResourceData) data).setSource(selectedString); } else if (data instanceof TimeSeriesResourceData) { - ((TimeSeriesResourceData) data).setSource(lookup.getInfo( - selectedString).getTitle()); + ((TimeSeriesResourceData) data).setSource(selectedString); } else if (data instanceof CrossSectionResourceData) { - ((CrossSectionResourceData) data).setSource(lookup.getInfo( - selectedString).getTitle()); + ((CrossSectionResourceData) data).setSource(selectedString); } } } diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml index 7088edbf87..90c3adee3b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml @@ -1,24 +1,4 @@ - - - - - - - NationalBlend - NationalBlend -
1
- - - NationalBlendAK - NationalBlendAK -
1
- - - NationalBlendHI - NationalBlendHI -
1
- - - NationalBlendPR - NationalBlendPR -
1
- - - NationalBlendOC - NationalBlendOC -
1
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/NCEP/gribDatasets_NCEP-7_URMA.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/NCEP/gribDatasets_NCEP-7_URMA.xml deleted file mode 100644 index 8b1fa705ad..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/NCEP/gribDatasets_NCEP-7_URMA.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - URMA25 - URMA25 -
1
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_ECMWF-98.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_ECMWF-98.xml deleted file mode 100644 index c5e6d76f98..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_ECMWF-98.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - ECMWF-HiRes - ECMWF-HiRes -
12
- - - ECMWF-LowRes - ECMF-NorthernHemisphere -
24
- - - ECMWF-LowRes - ECMF1 -
24
- - - ECMWF-LowRes - ECMF2 -
24
- - - ECMWF-LowRes - ECMF3 -
24
- - - ECMWF-LowRes - ECMF4 -
24
- - - ECMWF-LowRes - ECMF5 -
24
- - - ECMWF-LowRes - ECMF6 -
24
- - - ECMWF-LowRes - ECMF7 -
24
- - - ECMWF-LowRes - ECMF8 -
24
- - - ECMWF-LowRes - ECMF9 -
24
- - - ECMWF-LowRes - ECMF10 -
24
- - - ECMWF-LowRes - ECMF11 -
24
- - - ECMWF-LowRes - ECMF12 -
24
- - - ECMWF-MODEL0 - ECMF-MODEL0 -
24
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FNMO-58.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FNMO-58.xml deleted file mode 100644 index dec05b9229..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FNMO-58.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - NOGAPS - NOGAPS -
1
- - - AK-NOGAPS - AK-NOGAPS -
1
- - - NAVGEM - nogaps -
6
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FSL-59.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FSL-59.xml deleted file mode 100644 index 5ca3159c22..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_FSL-59.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - LAPS - LAPS -
1
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml deleted file mode 100644 index 87b03f6cf3..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml +++ /dev/null @@ -1,1005 +0,0 @@ - - - - - - - GFSLAMP-Stn - GFSLAMP -
1
- - - NAM80 - ETA -
6
- - - GFS180 - AVN -
6
- - - gfsLR - MRF -
12
- - - gfsLR21 - MRF21 -
12
- - - gfsLR22 - MRF22 -
12
- - - gfsLR23 - MRF23 -
12
- - - gfsLR24 - MRF24 -
12
- - - gfsLR25 - MRF25 -
12
- - - gfsLR26 - MRF26 -
12
- - - GFS360 - GFS201 -
6
- - - GFS1degGbl - GFS229 -
3
- - - GFS20-CONUS - GFS20 -
3
- - - GFS20-AK - AK-GFS22 -
3
- - - GFS20-PAC - GFS-PAC-20KM -
3
- - - PR-GFS - GFS-PRICO-20KM -
3
- - - gfsLR - mrfNH -
12
- - - GFS90 - GFS95 -
6
- - - GFS80 - AVN211 -
6
- - - NAM40 - NAM40 -
3
- - - NAM20 - NAM20 - NAM40 -
3
- - - WAFS - WAFS -
6
- - - NAMWX - NAM40 -
3
- - - GFS190 - AVN203 -
12
- - - gfs190 - MRF203 -
12
- - - GFS150 - MRF204 -
12
- - - GFS150 - MRF205 -
12
- - - NAM95 - AK-NAM95 -
6
- - - GFSGbl - AVN-NorthernHemisphere -
6
- - - GFSGbl - AVN37 -
6
- - - GFSGbl - AVN38 -
6
- - - GFSGbl - AVN39 -
6
- - - GFSGbl - AVN40 -
6
- - - GFSGbl - AVN41 -
6
- - - GFSGbl - AVN42 -
6
- - - GFSGbl - AVN43 -
6
- - - GFSGbl - AVN44 -
6
- - - GWW - WaveWatch -
6
- - - GWW21 - GWW21 -
6
- - - GWW22 - GWW22 -
6
- - - GWW23 - GWW23 -
6
- - - GWW24 - GWW24 -
6
- - - SeaIce - SeaIce -
1
- - - SeaIce220 - SeaIce220 -
1
- - - SeaIce173 - SeaIce173 -
1
- - - SeaIce235 - SeaIce235 -
1
- - - RAP40 - RAP40 -
1
- - - GFS75 - AVN225 -
6
- - - AKWAVE - AKWAVE239 -
6
- - - WNAwave - WNAWAVE238 -
6
- - - AK-NAM40 - AK-NAM45 -
6
- - - AK-NAM20 - AK-NAM22 -
6
- - - NAM12 - NAM12 -
3
- - - AK-NAM12 - AK-NAM11 -
3
- - - NAM over the contiguous US 16X Resolution(5Km) Lambert Conformal - NAM5 -
3
- - - ENPwave - ENPWAVE253 -
6
- - - HurWave238 - HurWave238 -
6
- - - HurWave253 - HurWave253 -
6
- - - TPC-HurWind - HurWind226 -
6
- - - GuamHurWind - HurWind175 -
6
- - - HawHurWind - HurWind250 -
6
- - - NICICE - NICICE -
1
- - - AK-NICICE - AK-NICICE -
1
- - - DGEX - DGEX -
6
- - - DGEX - AK-DGEX -
6
- - - GFS40 - GFS40 -
6
- - - AK-GFS - GFS160 -
6
- - - PR-GFS - GFS254 -
6
- - - SJU-GFS - GFS161 -
6
- - - Guam-GFSDNG - GFS199 -
3
- - - RAP13 - RAP13 -
1
- - - RAP16 - RAP200 -
1
- - - RTMA - RTMA -
1
- - - RTMA - RTMA25 -
1
- - - AK-RTMA - AK-RTMA -
1
- - - AK-RTMA3 - AK-RTMA3 -
1
- - - NamDNG5 - NamDNG5 -
3
- - - namdng25 - namdng25 -
3
- - - RaobOA - RaobOA -
12
- - - MetarOA - MetarOA -
1
- - - GlobalWave - GlobalWave -
3
- - - AKwave10 - AKwave10 -
3
- - - AKwave4 - AKwave4 -
3
- - - EPwave10 - EPwave10 -
3
- - - WCwave10 - WCwave10 -
3
- - - WCwave4 - WCwave4 -
3
- - - WNAwave10 - WNAwave10 -
3
- - - WNAwave4 - WNAwave4 -
3
- - - Aviation - Aviation -
1
- - - Aviation - Aviation -
1
- - - Aviation - Aviation -
1
- - - AK-NamDNG5 - AK-NamDNG5 -
3
- - - AK-NamDNG3 - AK-NamDNG3 -
3
- - - HI-NamDNG5 - HI-NamDNG5 -
3
- - - PR-NamDNG5 - PR-NamDNG5 -
3
- - - HiResW-ARW-East - HiResW-ARW-East -
3
- - - HiResW-ARW-West - HiResW-ARW-West -
3
- - - HiResW-ARW-AK - HiResW-ARW-AK -
3
- - - HiResW-ARW-SJU - HiResW-ARW-SJU -
3
- - - HiResW-ARW-HI - HiResW-ARW-HI -
3
- - - HiResW-ARW-GU - HiResW-ARW-GU -
3
- - - HiResW-NMM-East - HiResW-NMM-East -
3
- - - HiResW-NMM-West - HiResW-NMM-West -
3
- - - HiResW-NMM-AK - HiResW-NMM-AK -
3
- - - HiResW-NMM-SJU - HiResW-NMM-SJU -
3
- - - HiResW-NMM-HI - HiResW-NMM-HI -
3
- - - HiResW-NMM-GU - HiResW-NMM-GU -
3
- - - GRLKwave - GRLKwave -
1
- - - MSAS - MSAS -
1
- - - GFSBufr - GfsBufr -
1
- - - GFSSouthernHemisphere - GFSSouthernHemisphere -
1
- - - GoesBufr - GoesBufr -
1
- - - Metar - Metar -
1
- - - Ldad - Ldad -
1
- - - DMD - DMD -
-10
- - - MDCRS - MDCRS -
1
- - - NAM Bufr - EtaBufr -
1
- - - PoesBufr - PoesBufr -
1
- - - Profiler - Profiler -
1
- - - Raob - Raob -
12
- - - VWP - VWP -
-6
- - - PR-NAM12 - PR-NAM -
3
- - - GFSensemble - ENSEMBLE -
6
- - - GFSensemble - ENSEMBLE37 -
6
- - - GFSensemble - ENSEMBLE38 -
6
- - - GFSensemble - ENSEMBLE39 -
6
- - - GFSensemble - ENSEMBLE40 -
6
- - - GFSensemble - ENSEMBLE41 -
6
- - - GFSensemble - ENSEMBLE42 -
6
- - - GFSensemble - ENSEMBLE43 -
6
- - - GFSensemble - ENSEMBLE44 -
6
- - - SREF - SREF40 -
3
- - - AK-SREF - SREF216 -
3
- - - PR-SREF - SREF243 -
3
- - - RTG-SST-Analysis - RTGSST -
1
- - - GFSGuide - GFSGuide -
6
- - - RTMA - RTMA -
1
- - - RTMA - RTMA25 -
1
- - - AK-RTMA - AK-RTMA -
1
- - - HI-RTMA - HI-RTMA -
1
- - - PR-RTMA - PR-RTMA -
1
- - - Guam-RTMA - Guam-RTMA -
3
- - - RTG-SST-HR-Analysis - RTGSSTHR -
1
- - - QPE - QPE -
1
- - - SeaSfcAnalysis21 - SeaSfcAnalysis21 -
1
- - - SeaSfcAnalysis22 - SeaSfcAnalysis22 -
1
- - - SeaSfcAnalysis23 - SeaSfcAnalysis23 -
1
- - - SeaSfcAnalysis24 - SeaSfcAnalysis24 -
1
- - - SeaSfcAnalysis37 - SeaSfcAnalysis37 -
1
- - - SeaSfcAnalysis38 - SeaSfcAnalysis38 -
1
- - - SeaSfcAnalysis39 - SeaSfcAnalysis39 -
1
- - - SeaSfcAnalysis40 - SeaSfcAnalysis40 -
1
- - - SeaSfcAnalysis41 - SeaSfcAnalysis41 -
1
- - - SeaSfcAnalysis42 - SeaSfcAnalysis42 -
1
- - - SeaSfcAnalysis43 - SeaSfcAnalysis43 -
1
- - - SeaSfcAnalysis44 - SeaSfcAnalysis44 -
1
- - - SeaSfcAnalysis61 - SeaSfcAnalysis61 -
1
- - - SeaSfcAnalysis62 - SeaSfcAnalysis62 -
1
- - - SeaSfcAnalysis63 - SeaSfcAnalysis63 -
1
- - - SeaSfcAnalysis64 - SeaSfcAnalysis64 -
1
- - - RFCqpf - RFCqpf -
6
- - - HPCqpf - HPCqpf -
6
- - - HPCGuide - HPCGuide -
6
- - - AK-HPCGuide - HPCGuide-AK -
6
- - - HPC - HPCqpfNDFD -
6
- - - HPC-MODEL0 - HPC-MODEL0 -
6
- - - OPCWave-W-ATL - OPCWave180 -
24
- - - OPCWave-NE-PAC - OPCWave181 -
24
- - - CPCoutlook-Short - CPCoutlook-Short -
24
- - - CPCoutlook-Medium - CPCoutlook-Medium -
24
- - - CPCoutlook-Short-AK - CPCoutlook-Short-AK -
3
- - - CPCoutlook-Medium-AK - CPCoutlook-Medium-AK -
3
- - - CPCoutlook-Long - CPCoutlook211 -
720
- - - Aviation - Aviation -
1
- - - NCWF - NCWF -
1
- - - SPCGuide - SPCGuide -
1
- - - TPCWindProb - TPCWindProb -
6
- - - TPCWindProb_Prelim - TPCWindProb_Prelim -
6
- - - OPCWave-TE-PAC - OPCWave182 -
24
- - - GriddedMOS - MOSGuide -
6
- - - AK-GriddedMOS - MOSGuide-AK -
3
- - - HI-GriddedMOS - MOSGuide-HI -
3
- - - GFSLAMPGrid - GFSLAMPGrid -
1
- - - TPCSurgeProb - TPCSurgeProb -
6
- - - TPCSurgeProb197 - TPCSurgeProb197 -
6
- - - TPCSurgeProb-AK - TPCSurgeProb-AK -
6
- - - P-ETSS - P-ETSS -
1
- - - P-ETSS-LoRes - P-ETSS-LoRes -
1
- - - P-ETSS-AK - P-ETSS-AK -
1
- - - PROB3HR - PROB3HR -
3
- - - HRRR - HRRR -
1
- - - HREF - HREF-US -
1
- - - HREF-AK - HREF-AK -
1
- - - HREF-PRICO - HREF-SJU -
1
- - - HREF-PAC - HREF-HI -
1
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NOAA-161.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NOAA-161.xml deleted file mode 100644 index 821435cd07..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NOAA-161.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - GLERL - GLERL -
12
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NWSTG-8.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NWSTG-8.xml deleted file mode 100644 index b5d4d417b9..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NWSTG-8.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - RCM - RCM -
1
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml deleted file mode 100644 index 65f58ab832..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml +++ /dev/null @@ -1,689 +0,0 @@ - - - - - - - MPE - MPE-Local -
1
- - - MPE - MPE-Mosaic -
1
- - - HPE - HPE -
300
- - - BiasHPE - BHPE -
300
- - - QPE-SJU - QPE-SJU -
1
- - - QPE-Manual-SJU - QPE-Manual-SJU -
1
- - - QPE-Auto-SJU - QPE-Auto-SJU -
1
- - - MPE-Local-SJU - MPE-Local-SJU -
1
- - - MPE-Mosaic-SJU - MPE-Mosaic-SJU -
1
- - - QPE-XNAV-SJU - QPE-XNAV-SJU -
1
- - - QPE-RFC-SJU - QPE-RFC-SJU -
1
- - - QPF-TUA - RFCqpf -
6
- - - FFG-TUA - FFG-TUA -
1
- - - QPE-TUA - QPE-TUA -
1
- - - QPE-Manual-TUA - QPE-Manual-TUA -
1
- - - QPE-Auto-TUA - QPE-Auto-TUA -
1
- - - MPE-Local-TUA - MPE-Local-TUA -
1
- - - MPE-Mosaic-TUA - MPE-Mosaic-TUA -
1
- - - QPE-XNAV-TUA - QPE-XNAV-TUA -
1
- - - QPE-RFC-TUA - QPE-RFC-TUA -
1
- - - QPF-ACR - RFCqpf -
6
- - - FFG-ACR - FFG-ACR -
1
- - - QPE-ACR - QPE-ACR -
1
- - - QPE-Manual-ACR - QPE-Manual-ACR -
1
- - - QPE-Auto-ACR - QPE-Auto-ACR -
1
- - - MPE-Local-ACR - MPE-Local-ACR -
1
- - - MPE-Mosaic-ACR - MPE-Mosaic-ACR -
1
- - - QPE-XNAV-ACR - QPE-XNAV-ACR -
1
- - - QPE-RFC-ACR - QPE-RFC-ACR -
1
- - - QPF-STR - RFCqpf -
6
- - - FFG-STR - FFG-STR -
1
- - - QPE-STR - QPE-STR -
1
- - - QPE-Manual-STR - QPE-Manual-STR -
1
- - - QPE-Auto-STR - QPE-Auto-STR -
1
- - - MPE-Local-STR - MPE-Local-STR -
1
- - - MPE-Mosaic-STR - MPE-Mosaic-STR -
1
- - - QPE-XNAV-STR - QPE-XNAV-STR -
1
- - - QPE-RFC-STR - QPE-RFC-STR -
1
- - - QPF-RSA - RFCqpf -
6
- - - FFG-RSA - FFG-RSA -
1
- - - QPE-RSA - QPE-RSA -
1
- - - QPE-Manual-RSA - QPE-Manual-RSA -
1
- - - QPE-Auto-RSA - QPE-Auto-RSA -
1
- - - MPE-Local-RSA - MPE-Local-RSA -
1
- - - MPE-Mosaic-RSA - MPE-Mosaic-RSA -
1
- - - QPE-XNAV-RSA - QPE-XNAV-RSA -
1
- - - QPE-RFC-RSA - QPE-RFC-RSA -
1
- - - QPF-ORN - RFCqpf -
6
- - - FFG-ORN - FFG-ORN -
1
- - - QPE-ORN - QPE-ORN -
1
- - - QPE-Manual-ORN - QPE-Manual-ORN -
1
- - - QPE-Auto-ORN - QPE-Auto-ORN -
1
- - - MPE-Local-ORN - MPE-Local-ORN -
1
- - - MPE-Mosaic-ORN - MPE-Mosaic-ORN -
1
- - - QPE-XNAV-ORN - QPE-XNAV-ORN -
1
- - - QPE-RFC-ORN - QPE-RFC-ORN -
1
- - - QPF-RHA - RFCqpf -
6
- - - FFG-RHA - FFG-RHA -
1
- - - QPE-RHA - QPE-RHA -
1
- - - QPE-Manual-RHA - QPE-Manual-RHA -
1
- - - QPE-Auto-RHA - QPE-Auto-RHA -
1
- - - MPE-Local-RHA - MPE-Local-RHA -
1
- - - MPE-Mosaic-RHA - MPE-Mosaic-RHA -
1
- - - QPE-XNAV-RHA - QPE-XNAV-RHA -
1
- - - QPE-RFC-RHA - QPE-RFC-RHA -
1
- - - QPF-KRF - RFCqpf -
6
- - - FFG-KRF - FFG-KRF -
1
- - - QPE-KRF - QPE-KRF -
1
- - - QPE-Manual-KRF - QPE-Manual-KRF -
1
- - - QPE-Auto-KRF - QPE-Auto-KRF -
1
- - - MPE-Local-KRF - MPE-Local-KRF -
1
- - - MPE-Mosaic-KRF - MPE-Mosaic-KRF -
1
- - - QPE-XNAV-KRF - QPE-XNAV-KRF -
1
- - - QPE-RFC-KRF - QPE-RFC-KRF -
1
- - - QPF-MSR - RFCqpf -
6
- - - FFG-MSR - FFG-MSR -
1
- - - QPE-MSR - QPE-MSR -
1
- - - QPE-Manual-MSR - QPE-Manual-MSR -
1
- - - QPE-Auto-MSR - QPE-Auto-MSR -
1
- - - MPE-Local-MSR - MPE-Local-MSR -
1
- - - MPE-Mosaic-MSR - MPE-Mosaic-MSR -
1
- - - QPE-XNAV-MSR - QPE-XNAV-MSR -
1
- - - QPE-RFC-MSR - QPE-RFC-MSR -
1
- - - QPF-TAR - RFCqpf -
6
- - - FFG-TAR - FFG-TAR -
1
- - - QPE-TAR - QPE-TAR -
1
- - - QPE-Manual-TAR - QPE-Manual-TAR -
1
- - - QPE-Auto-TAR - QPE-Auto-TAR -
1
- - - MPE-Local-TAR - MPE-Local-TAR -
1
- - - MPE-Mosaic-TAR - MPE-Mosaic-TAR -
1
- - - QPE-XNAV-TAR - QPE-XNAV-TAR -
1
- - - QPE-RFC-TAR - QPE-RFC-TAR -
1
- - - QPF-PTR - RFCqpf -
6
- - - FFG-PTR - FFG-PTR -
1
- - - QPE-PTR - QPE-PTR -
1
- - - QPE-Manual-PTR - QPE-Manual-PTR -
1
- - - QPE-Auto-PTR - QPE-Auto-PTR -
1
- - - MPE-Local-PTR - MPE-Local-PTR -
1
- - - MPE-Mosaic-PTR - MPE-Mosaic-PTR -
1
- - - QPE-XNAV-PTR - QPE-XNAV-PTR -
1
- - - QPE-RFC-PTR - QPE-RFC-PTR -
1
- - - QPF-TIR - RFCqpf -
6
- - - FFG-TIR - FFG-TIR -
1
- - - QPE-TIR - QPE-TIR -
1
- - - QPE-Manual-TIR - QPE-Manual-TIR -
1
- - - QPE-Auto-TIR - QPE-Auto-TIR -
1
- - - MPE-Local-TIR - MPE-Local-TIR -
1
- - - MPE-Mosaic-TIR - MPE-Mosaic-TIR -
1
- - - QPE-XNAV-TIR - QPE-XNAV-TIR -
1
- - - QPE-RFC-TIR - QPE-RFC-TIR -
1
- - - QPF-ALR - RFCqpf -
6
- - - FFG-ALR - FFG-ALR -
1
- - - QPE-ALR - QPE-ALR -
1
- - - QPE-Manual-ALR - QPE-Manual-ALR -
1
- - - QPE-Auto-ALR - QPE-Auto-ALR -
1
- - - MPE-Local-ALR - MPE-Local-ALR -
1
- - - MPE-Mosaic-ALR - MPE-Mosaic-ALR -
1
- - - QPE-XNAV-ALR - QPE-XNAV-ALR -
1
- - - QPE-RFC-ALR - QPE-RFC-ALR -
1
- - - QPF-FWR - RFCqpf -
6
- - - FFG-FWR - FFG-FWR -
1
- - - QPE-FWR - QPE-FWR -
1
- - - QPE-Manual-FWR - QPE-Manual-FWR -
1
- - - QPE-Auto-FWR - QPE-Auto-FWR -
1
- - - MPE-Local-FWR - MPE-Local-FWR -
1
- - - MPE-Mosaic-FWR - MPE-Mosaic-FWR -
1
- - - QPE-XNAV-FWR - QPE-XNAV-FWR -
1
- - - QPE-RFC-FWR - QPE-RFC-FWR -
1
- - - NOHRSC-SNOW - NOHRSC-SNOW -
1
- - - NOHRSC-SNOW - NOHRSC-SNOW -
24
- - - SPE - AUTOSPE -
1
- - - SPE - MANSPE -
1
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RSMC-54.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RSMC-54.xml deleted file mode 100644 index a4408b3e53..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RSMC-54.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - CanadianModel - CanadianModel -
1
- - - CanadianModel - CanadianModel -
1
- - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_UKMET-74.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_UKMET-74.xml deleted file mode 100644 index 627915dc86..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_UKMET-74.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - UKMET-MODEL1 - UKMET-MODEL1 -
6
- - - UKMET - UKMET-NorthernHemisphere -
6
- - - UKMET - UKMET37 -
6
- - - UKMET - UKMET38 -
6
- - - UKMET - UKMET39 -
6
- - - UKMET - UKMET40 -
6
- - - UKMET - UKMET41 -
6
- - - UKMET - UKMET42 -
6
- - - UKMET - UKMET43 -
6
- - - UKMET - UKMET44 -
6
- - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid.derivparam/src/com/raytheon/uf/common/dataplugin/grid/derivparam/data/StaticGridRequestableData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grid.derivparam/src/com/raytheon/uf/common/dataplugin/grid/derivparam/data/StaticGridRequestableData.java index af47704e1b..10b05f73d6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid.derivparam/src/com/raytheon/uf/common/dataplugin/grid/derivparam/data/StaticGridRequestableData.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid.derivparam/src/com/raytheon/uf/common/dataplugin/grid/derivparam/data/StaticGridRequestableData.java @@ -21,8 +21,6 @@ package com.raytheon.uf.common.dataplugin.grid.derivparam.data; import javax.measure.unit.SI; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.dataplugin.grid.util.StaticGridData; import com.raytheon.uf.common.dataplugin.grid.util.StaticGridDataType; import com.raytheon.uf.common.dataplugin.level.LevelFactory; @@ -77,17 +75,6 @@ public class StaticGridRequestableData extends AbstractRequestableData { if (StaticGridDataType._dt.equals(dataType)) { int dTinSeconds = 0; - DatasetInfo info = DatasetInfoLookup.getInstance().getInfo(source); - - if (info != null) { - dTinSeconds = info.getDt(); - - // dT <= 24 is in hours, need to convert to seconds - if (Math.abs(dTinSeconds) <= 24) { - dTinSeconds *= 3600; - } - } - return new Float(dTinSeconds); } else { if (this.space instanceof GridCoverage) { diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF index c39c72b702..b51228279d 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.common.dataplugin.grid, com.raytheon.uf.common.dataplugin.grid.dataaccess, com.raytheon.uf.common.dataplugin.grid.dataquery, - com.raytheon.uf.common.dataplugin.grid.dataset, com.raytheon.uf.common.dataplugin.grid.datastorage, com.raytheon.uf.common.dataplugin.grid.mapping, com.raytheon.uf.common.dataplugin.grid.request, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfo.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfo.java deleted file mode 100644 index 669c916f84..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfo.java +++ /dev/null @@ -1,95 +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.grid.dataset; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; - -/** - * - * Contains static information about a grid dataset. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Feb 27, 2012            bsteffen     Initial creation
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ -@XmlAccessorType(XmlAccessType.NONE) -public class DatasetInfo { - - /** The title of the model */ - @XmlElement - private String title; - - /** The model name */ - @XmlElement - private String datasetId; - - @XmlElement - private String alias; - - /** - * The intrinsic temporal resolution of the data. - */ - @XmlElement - private Integer dt; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDatasetId() { - return datasetId; - } - - public void setDatasetId(String datasetId) { - this.datasetId = datasetId; - } - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - - public Integer getDt() { - return dt; - } - - public void setDt(Integer dt) { - this.dt = dt; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java deleted file mode 100644 index 28067af773..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java +++ /dev/null @@ -1,124 +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.grid.dataset; - -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.JAXBException; - -import com.raytheon.uf.common.localization.IPathManager; -import com.raytheon.uf.common.localization.LocalizationContext; -import com.raytheon.uf.common.localization.LocalizationFile; -import com.raytheon.uf.common.localization.PathManagerFactory; -import com.raytheon.uf.common.localization.exception.LocalizationException; -import com.raytheon.uf.common.serialization.SerializationException; -import com.raytheon.uf.common.serialization.SingleTypeJAXBManager; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; - -/** - * - * Provides logic to read datasetInfo files from localization and provide lookup - * by datasetId. - * - * 
- *
- * SOFTWARE HISTORY
- *
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Feb 27, 2012           bsteffen     Initial creation
- * Dec 16, 2013  2574     bsteffen     Update deprecated method call.
- * Jul 21, 2014  3373     bclement     changed to use single type JAXB manager
- * Feb 15, 2016  5244     nabowle      Replace deprecated LocalizationFile methods.
- *
- *
- * - * @author bsteffen - * @version 1.0 - */ -public class DatasetInfoLookup { - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(DatasetInfoLookup.class); - - private static DatasetInfoLookup instance; - - public static DatasetInfoLookup getInstance() { - if (instance == null) { - instance = new DatasetInfoLookup(); - } - return instance; - } - - private Map infoMap = new HashMap(); - - private DatasetInfoLookup() { - init(); - } - - private void init() { - SingleTypeJAXBManager manager = null; - try { - manager = new SingleTypeJAXBManager(true, - DatasetInfoSet.class); - } catch (JAXBException e) { - statusHandler - .error("Error loading context for DatasetInfo, no datasetInfo will be loaded.", - e); - } - IPathManager pathMgr = PathManagerFactory.getPathManager(); - LocalizationContext commonStaticBase = pathMgr.getContext( - LocalizationContext.LocalizationType.COMMON_STATIC, - LocalizationContext.LocalizationLevel.BASE); - - LocalizationContext commonStaticSite = pathMgr.getContext( - LocalizationContext.LocalizationType.COMMON_STATIC, - LocalizationContext.LocalizationLevel.SITE); - - LocalizationFile[] files = pathMgr.listFiles(new LocalizationContext[] { - commonStaticSite, commonStaticBase }, "grid" - + IPathManager.SEPARATOR + "datasetInfo", - new String[] { ".xml" }, true, true); - for (LocalizationFile file : files) { - if (file == null || !file.exists()) { - return; - } - try (InputStream is = file.openInputStream()) { - DatasetInfoSet set = manager.unmarshalFromInputStream(is); - for (DatasetInfo info : set.getInfos()) { - infoMap.put(info.getDatasetId(), info); - } - } catch (SerializationException | IOException - | LocalizationException e) { - statusHandler.error( - "Error reading dataset info: " + file.getPath() - + " has been ignored.", e); - } - } - - } - - public DatasetInfo getInfo(String datasetId) { - return infoMap.get(datasetId); - } -} diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoSet.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoSet.java deleted file mode 100644 index f7559b7bb3..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoSet.java +++ /dev/null @@ -1,62 +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.grid.dataset; - -import java.util.ArrayList; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * - * JAXB compatible root element for a list of datasetInfo objects - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Feb 27, 2012            bsteffen     Initial creation
- * 
- *
- * - * @author bsteffen - * @version 1.0 - */ -@XmlRootElement -@XmlAccessorType(XmlAccessType.NONE) -public class DatasetInfoSet { - - @XmlElements({ @XmlElement(name = "info", type = DatasetInfo.class) }) - private ArrayList infos; - - public ArrayList getInfos() { - return infos; - } - - public void setInfos(ArrayList infos) { - this.infos = infos; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.menus.vb/src/com/raytheon/uf/common/menus/vb/VbSourceList.java b/edexOsgi/com.raytheon.uf.common.menus.vb/src/com/raytheon/uf/common/menus/vb/VbSourceList.java index 94910d85e7..ddd2e3da48 100644 --- a/edexOsgi/com.raytheon.uf.common.menus.vb/src/com/raytheon/uf/common/menus/vb/VbSourceList.java +++ b/edexOsgi/com.raytheon.uf.common.menus.vb/src/com/raytheon/uf/common/menus/vb/VbSourceList.java @@ -40,8 +40,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.localization.ILocalizationFile; import com.raytheon.uf.common.localization.ILocalizationPathObserver; import com.raytheon.uf.common.localization.IPathManager; @@ -404,8 +402,6 @@ public class VbSourceList { } } - DatasetInfoLookup lookup = DatasetInfoLookup.getInstance(); - DatasetInfo info; // Set containing sources to not be added to lists Set removes = new HashSet<>(); Iterator itr = allSources.iterator(); @@ -415,9 +411,7 @@ public class VbSourceList { VbSource source = itr.next(); // Set display names for sources if (source.getName() == null) { - info = lookup.getInfo(source.getKey()); - source.setName( - info != null ? info.getTitle() : source.getKey()); + source.setName(source.getKey()); } if (source.getRemove()) { // Add sources with remove tags to removal set and remove them. diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/handler/GridTreeHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/handler/GridTreeHandler.java index fcc71c1be9..1197d3c702 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/handler/GridTreeHandler.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/handler/GridTreeHandler.java @@ -26,8 +26,6 @@ import java.util.List; import com.raytheon.uf.common.inventory.tree.DataTree; import com.raytheon.uf.common.dataplugin.grid.GridInfoConstants; import com.raytheon.uf.common.dataplugin.grid.GridInfoRecord; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo; -import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup; import com.raytheon.uf.common.dataplugin.grid.request.GetGridTreeRequest; import com.raytheon.uf.common.serialization.comm.IRequestHandler; import com.raytheon.uf.edex.database.dao.CoreDao; @@ -80,7 +78,7 @@ public class GridTreeHandler implements IRequestHandler { ArrayList gridFields = new ArrayList( Arrays.asList((Object[]) gridField)); String model = gridFields.get(0).toString(); - gridTree.addBranch(model, getDt(model), gridFields.get(1) + gridTree.addBranch(model, gridFields.get(1) .toString(), gridFields.get(2).toString(), gridFields.get(3).toString(), gridFields.get(4) .toString()); @@ -90,18 +88,4 @@ public class GridTreeHandler implements IRequestHandler { return gridTree; } - private int getDt(String modelName) { - DatasetInfo info = DatasetInfoLookup.getInstance().getInfo(modelName); - if (info != null && info.getDt() != null) { - int dTinSeconds = info.getDt(); - - // dT <= 24 is in hours, need to convert to seconds - if (Math.abs(dTinSeconds) <= 24) { - dTinSeconds *= 3600; - } - return dTinSeconds; - } - return -1; - } - } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml index 6a42abe7b4..ab0e9ac9ff 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml @@ -1,24 +1,4 @@ - - LAPS 30 - - - MSAS - 24 - - - - mesoEta21[25] + NAM(?:12|20|40) 2 00-00:15:00 - - - NAM40 - 1 - 00-00:15:00 - - - - WaveWatch - 1 - 00-00:15:00 - - - - RFCqpf + + (RFCqpf|HPCqpf) 5 - - - RAP40 - 8 - - - - AVN225 - 3 - - - - WNAWAVE238 - 1 - 00-00:15:00 - - - - - mesoEta21[67] - 1 - 00-00:15:00 - - - - - ETA2(?:18|42) - 1 - 00-00:15:00 - - - - HPCqpf - 5 - - - - ENPWAVE253 - 1 - 00-00:15:00 - - - - HPCGuide - 2 - 00-00:15:00 - - GFSGuide 8 00-00:15:00 - - - - - - GFS(?:212|160|254|161) - 1 - 00-00:15:00 - - MPE-Local 72 - TPCWindProb.* 8 00-00:15:00 - - - MOSGuide - 2 - 00-00:15:00 - - QPE-(?:ACR|STR|RSA|PTR|TUA|ORN|RHA|KRF|MSR|TAR|TIR|ALR|FWR) 72 - - - OPCWave.* 8 00-00:15:00 - - - - - - - - - - - - .*[Ww]ave.* - 1 - 00-00:15:00 - - RTMA 24 @@ -204,7 +78,6 @@ 24 00-00:15:00 - AK-RTMA3 24 @@ -225,131 +98,40 @@ 8 00-00:15:00 - SREF40 2 00-00:15:00 - - - GFSLAMPGrid - 24 - 00-00:15:00 - - ECMWF-HiRes 2 00-00:15:00 - HPCqpfNDFD 42 00-00:15:00 - - - NamDNG5 - 2 - 00-00:15:00 - - - - TPCSurgeProb - 1 - 00-00:15:00 - - - - P-ETSS - 1 - 00-00:15:00 - - HPE 00-12:00:00 00-00:15:00 - BHPE 00-12:00:00 00-00:15:00 - - - - MOSGuide-(?:AK|HI) - 2 - 00-00:15:00 - - - - HiRes-ARW-East - 2 - 00-00:15:00 - - - - - - HiRes-ARW-(?:West|AK|SJU) - 1 - 00-00:15:00 - - - - HiRes-ARW-HI - 2 - 00-00:15:00 - - - - HiRes-NMM-East - 2 - 00-00:15:00 - - - - - - HiRes-NMM-(?:West|AK|SJU) - 1 - 00-00:15:00 - - - - HiRes-NMM-HI - 2 - 00-00:15:00 - - SPCGuide 5 00-00:15:00 - - - HRRR - 4 - - - - GFS199 - 4 - 00-01:00:00 - - MRMS_(?:05|10|50)00 00-08:00:00 - - NARR 40-00:00:00