xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids

Browse source 
Change-Id: I326a25c3608d934d1b0183f2ad34109ab68e59f8

Former-commit-id: 01331e8d69 [formerly fe864302d2] [formerly b1dddd37a6] [formerly 01331e8d69 [formerly fe864302d2] [formerly b1dddd37a6] [formerly 04a955ff53 [formerly b1dddd37a6 [formerly d29ebdf1323d836b2f1e254cdcb1da06fdb5da61]]]]
Former-commit-id: 04a955ff53
Former-commit-id: 16286868df [formerly 308ed4c69b] [formerly f8115fb5a00858c1eefeb6e8372086fe5bc84c2c [formerly 2e396e04f7]]
Former-commit-id: 30545e13c02f0ddad6f5a58efb91592bea1d44f7 [formerly e968417c2a]
Former-commit-id: 9879d31626
This commit is contained in:
Dave Hladky 2013-01-25 10:58:22 -06:00
parent 4e75151272
commit f6c9b5f489
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/DataLevelType.java
View file

@ -31,6 +31,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Code clean up.
* Set 06, 2012 1121 mpduff Added a unique key.
* Nov 19, 2012 1166 djohnson Clean up JAXB representation of registry objects.
* Jan 24, 2013 1527 dhladky Changed 0DEG to FRZ
*
* </pre>
*
@ -110,7 +111,7 @@ public class DataLevelType implements ISerializableObject, Serializable {
"Cloud Level", 110), SIGL("sigma", "Sigma Level", 111), PVL(
"pv", "PV Level", 111), CTL("top", "Top Level", 112), MSL(
"mean", "Mean Sea Level", 113), EA("entire",
"Entire Atmosphere (As Single Layer)", 114), ODEG("0c",
"Entire Atmosphere (As Single Layer)", 114), FRZ("0c",
"0c isotherm", 115), LCY("low", "Low Cloud Bottom Level", 116), MCY(
"middle", "Middle Cloud Level", 117), HCY("high",
"High Cloud Level", 118), PBL("planetary",
@ -175,11 +176,8 @@ public class DataLevelType implements ISerializableObject, Serializable {
break;
}
}
// special case since enums can't start with integers
if (rval == LevelType.ODEG) {
return "0DEG";
} else if (rval == LevelType.U || rval == LevelType.V) {
if (rval == LevelType.U || rval == LevelType.V) {
return LevelType.MAXW.toString();
}

11
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
View file

@ -90,6 +90,7 @@ import dods.dap.DAS;
* Dec 10, 2012 1259 bsteffen Switch Data Delivery from LatLon to referenced envelopes.
* Jan 08, 2013 dhladky Performance enhancements, specific model fixes.
* Jan 18, 2013 1513 dhladky Level look up improvements.
* Jan 24, 2013 1527 dhladky Changed 0DEG to FRZ
*
* </pre>
*
@ -419,7 +420,6 @@ class OpenDAPMetaDataParser extends MetaDataParser {
parm.setLevels(getLevels(type, collectionName, gdsmd, dz,
levMin, levMax));
parm.addLevelType(type);
parameters.put(name, parm);
} catch (Exception le) {
@ -494,6 +494,11 @@ class OpenDAPMetaDataParser extends MetaDataParser {
type.addLayer(new Double(10).doubleValue());
type.setUnit(serviceConfig.getConstantValue("METER"));
}
// FRZ freezing level, catches one's with on the end of the param name
// hgt0c etc
else if (param.getProviderName().endsWith(LevelType.FRZ.getLevelType())) {
type = new DataLevelType(LevelType.FRZ);
}
// Really special cases presented by NOMADS data sets
if (type == null) {
@ -573,8 +578,8 @@ class OpenDAPMetaDataParser extends MetaDataParser {
type = new DataLevelType(LevelType.MSL);
} else if (w1.equals(LevelType.EA.getLevelType())) {
type = new DataLevelType(LevelType.EA);
} else if (w1.equals(LevelType.ODEG.getLevelType())) {
type = new DataLevelType(LevelType.ODEG);
} else if (w1.equals(LevelType.FRZ.getLevelType())) {
type = new DataLevelType(LevelType.FRZ);
} else if (w1.equals(LevelType.LCY.getLevelType())) {
type = new DataLevelType(LevelType.LCY);
} else if (w1.equals(LevelType.MCY.getLevelType())) {