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
+ GFS20GWW
+ MOSGuide
+ HRRRHPCGuide
- LAMP
- MSAS
+ LAMP2p5NAM12NAM40
- NAM80
- NAMWX
- NICIE
- TPC-HurWind
+ NAVGEM
+ NationalBlend
+ PROB3HR
+ NOHRSC-SNOW
+ HPCqpf
+ HPCqpfNDFD
+ fnmocWave
+ SeaIce
+ SPCGuide
+ RTMATPCWindProb
- TPCWindProb_Prelim
- WNAwave
- RTG_SST-Analysis
- DMD
+ URMA25GFSBufrGoesBufrMDCRS
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
-