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

Merge "Issue #2961 Fixed issue where ISC grids are selected based on the start time of the Fcst and not the grid that overlaps the spatial editor time." into development

Browse source 
Former-commit-id: 63b3654e0e [formerly 946a3857f9] [formerly 39bcb64c7f] [formerly 39bcb64c7f [formerly 90429229f7]] [formerly 52c2092e1c [formerly 39bcb64c7f [formerly 90429229f7] [formerly 52c2092e1c [formerly 4e57b93f72b9e73a4ac2e1205393b3cae8e21958]]]]
Former-commit-id: 52c2092e1c
Former-commit-id: bc9a757d143d7695b0c51af61fcd80664d64ceb6 [formerly 6fa5ea130dedea2082686ac70b1f9913fc8f6110] [formerly 3e144c80a6 [formerly 2bee12cb02]]
Former-commit-id: 3e144c80a6
Former-commit-id: 11df67c9f4
This commit is contained in:
Ron Anderson 2014-04-03 14:27:41 -05:00 • committed by Gerrit Code Review
commit b2037b2d85
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);