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

Issue #2961 Fixed issue where ISC grids are selected based on the start time of the

Browse source 
Fcst and not the grid that overlaps the spatial editor time.

Change-Id: Ifb89fc1305db8a654067185064c3d570dfecd3b2

Former-commit-id: 5d6e0a3cb3 [formerly 660bc974e9] [formerly a9be0658e4] [formerly a9be0658e4 [formerly eb90c1f216]] [formerly 5d6e0a3cb3 [formerly 660bc974e9] [formerly a9be0658e4] [formerly a9be0658e4 [formerly eb90c1f216]] [formerly db080f3eba [formerly a9be0658e4 [formerly eb90c1f216] [formerly db080f3eba [formerly 131f9c0933280d25f61458e270b5bb9715c2d67b]]]]]
Former-commit-id: db080f3eba
Former-commit-id: 98551edcb0 [formerly 5d84747472] [formerly c880002b1e] [formerly 99669c3e3a766f0184484dbef6b1b42ffdb496c8 [formerly f40c2938a553a6bd3809588d95bac2b3641d2765] [formerly c880002b1e [formerly c7b392e36b]]]
Former-commit-id: 009df2512bea6729c242b2d12a26e443dc3d8768 [formerly 02d585704570326f08c96d5fae3b65c595dad235] [formerly fdb60c48d0 [formerly 1e546a1fed]]
Former-commit-id: dab8917afd3511a9de2491672e7276b34f72c13d [formerly fdb60c48d0]
Former-commit-id: 29024b161e
This commit is contained in:
Ron Anderson 2014-04-03 12:59:13 -05:00
parent 0dbef32597
commit c589d9f3a2
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/GFETimeMatcher.java
View file

@ -64,7 +64,9 @@ import com.raytheon.viz.gfe.rsc.GFEResource;
* Nov 14, 2012 mschenke Initial creation
* Feb 26, 2013 1708 randerso Fixed double notification for time change
* Jan 23, 2014 2703 bsteffen Add JAXB Annotations, fix iscMode.
* Apr 02, 2014 2961 randerso Code cleanup (Ben already fixed issue under #2703)
* Apr 02, 2014 2961 randerso Fixed issue where the ISC grid is selected based on the
* start time of the Fcst grid not the one that overlaps the
*
*
* </pre>
*
@ -113,20 +115,25 @@ public class GFETimeMatcher extends AbstractTimeMatcher {
for (int i = 0; i < descriptorTimes.length; ++i) {
IGridData overlapping = parm.overlappingGrid(descriptorTimes[i]
.getRefTime());
if (overlapping != null) {
TimeRange tr = overlapping.getGridTime();
rscTimes[i] = new DataTime(tr.getStart().getTime(),
new TimeRange(tr.getStart(), tr.getEnd()));
} else if (iscParm != null) {
overlapping = iscParm.overlappingGrid(descriptorTimes[i]
IGridData iscOverlapping = null;
if (iscParm != null) {
iscOverlapping = iscParm.overlappingGrid(descriptorTimes[i]
.getRefTime());
if (overlapping != null) {
TimeRange tr = overlapping.getGridTime();
rscTimes[i] = new DataTime(tr.getStart().getTime(),
new TimeRange(tr.getStart(), tr.getEnd()));
}
TimeRange tr = null;
if (overlapping != null) {
tr = overlapping.getGridTime();
if (iscOverlapping != null) {
tr = tr.intersection(iscOverlapping.getGridTime());
}
} else if (iscOverlapping != null) {
tr = iscOverlapping.getGridTime();
}
if (tr != null) {
rscTimes[i] = new DataTime(tr.getStart().getTime(),
new TimeRange(tr.getStart(), tr.getEnd()));
}
}
if (timeMap != null) {
timeMap.put(rsc, rscTimes);