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

Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1

Browse source 
Former-commit-id: 74b2cdfe34 [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 9663a83d1f
This commit is contained in:
Richard Peter 2014-04-29 16:14:52 -05:00 • committed by Gerrit Code Review
commit f381290ed1
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
View file

@ -61,6 +61,9 @@ import com.raytheon.uf.common.time.DataTime;
* ------------- -------- ----------- --------------------------
* Dec 14, 2009 rjpeter Initial creation
* Apr 11, 2014 2947 bsteffen Don't check units until data is requested.
* Apr 29, 2014 3081 bsteffen Undo change for 2947 because it prevents
* multiple level derivation from happening
* simultaneously in the function adapter.
*
* </pre>
*
@ -401,11 +404,15 @@ public class DerivedLevelNode extends AbstractDerivedDataNode {
Set<AbstractRequestableData> newRecs = new HashSet<AbstractRequestableData>(
records.size());
for (AbstractRequestableData record : records) {
/* Wrap in an alias to perform unit conversion when necessary. */
AbstractRequestableData alias = new AliasRequestableData(record);
alias.setUnit(field.getUnit());
newRecs.add(alias);
if (record.getUnit() != null
&& !record.getUnit().equals(field.getUnit())
&& record.getUnit().isCompatible(field.getUnit())) {
AbstractRequestableData alias = new AliasRequestableData(record);
alias.setUnit(field.getUnit());
newRecs.add(alias);
} else {
newRecs.add(record);
}
}
return newRecs;
}