Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development

Former-commit-id: 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 098b1e1579 [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]]
Former-commit-id: 098b1e1579
Former-commit-id: 41e1594be7 [formerly 57440abebb]
Former-commit-id: 3df38c0fc6

cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java

@@ -60,6 +60,8 @@ import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 30, 2012            mschenke     Initial creation
+ * Feb 25, 2013 1659       bsteffen    Stop derived parameters from sending
+ *                                     empty requests for cached times
  * 
  * </pre>
  * 
@@ -120,11 +122,14 @@ public abstract class AbstractDataCubeAdapter implements IDataCubeAdapter {
         }
 
         // bulk up all the requests.
-        DbQueryRequestSet requestSet = new DbQueryRequestSet();
-        requestSet.setQueries(fullList.toArray(new DbQueryRequest[0]));
-        DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
-                .sendRequest(requestSet);
-        DbQueryResponse[] responses = responseSet.getResults();
+        DbQueryResponse[] responses = new DbQueryResponse[0];
+        if (!fullList.isEmpty()) {
+            DbQueryRequestSet requestSet = new DbQueryRequestSet();
+            requestSet.setQueries(fullList.toArray(new DbQueryRequest[0]));
+            DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
+                    .sendRequest(requestSet);
+            responses = responseSet.getResults();
+        }
         int responseIndex = 0;
         List<List<DataTime>> finalResponse = new ArrayList<List<DataTime>>(
                 requests.size());

cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/inv/AvailabilityContainer.java

@@ -54,6 +54,8 @@ import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode.Dependency;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Apr 11, 2012            bsteffen     Initial creation
+ * Feb 25, 2013 1659       bsteffen    Stop derived parameters from sending
+ *                                     empty requests for cached times
  * 
  * </pre>
  * 
@@ -171,15 +173,18 @@ public class AvailabilityContainer {
      */
     protected void processRequests() throws VizException {
         List<DbQueryRequest> requests = getAvailabilityRequests();
-        DbQueryRequestSet requestSet = new DbQueryRequestSet();
-        requestSet.setQueries(requests.toArray(new DbQueryRequest[0]));
-        DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
-                .sendRequest(requestSet);
-        DbQueryResponse[] responses = responseSet.getResults();
         Map<DbQueryRequest, DbQueryResponse> responseMap = new HashMap<DbQueryRequest, DbQueryResponse>(
-                (int) (responses.length / 0.75) + 1, 0.75f);
-        for (int i = 0; i < responses.length; i++) {
-            responseMap.put(requests.get(i), responses[i]);
+                (int) (requests.size() / 0.75) + 1, 0.75f);
+        if (!requests.isEmpty()) {
+            DbQueryRequestSet requestSet = new DbQueryRequestSet();
+            requestSet.setQueries(requests.toArray(new DbQueryRequest[0]));
+            DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
+                    .sendRequest(requestSet);
+            DbQueryResponse[] responses = responseSet.getResults();
+
+            for (int i = 0; i < responses.length; i++) {
+                responseMap.put(requests.get(i), responses[i]);
+            }
         }
         setAvailabilityResponses(responseMap);
     }

cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java

@@ -46,6 +46,7 @@ import com.raytheon.uf.common.gridcoverage.GridCoverage;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
+import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
 import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
 import com.raytheon.uf.viz.core.exception.VizException;
@@ -73,6 +74,9 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 9, 2011            bsteffen     Initial creation
+ * Feb 25, 2013 1659       bsteffen    Add PDOs to D2DGridResource in
+ *                                     constructor to avoid duplicate data
+ *                                     requests.
  * 
  * </pre>
  * 
@@ -92,27 +96,34 @@ public class D2DGridResource extends GridResource<GridResourceData> implements
         if (resourceData.getNameGenerator() == null) {
             resourceData.setNameGenerator(new GridNameGenerator());
         }
+        for (GridRecord record : resourceData.getRecords()) {
+            addDataObject(record);
+        }
 
     }
 
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
-        String paramAbbrev = "";
-        for (GridRecord record : resourceData.getRecords()) {
-            paramAbbrev = record.getParameter().getAbbreviation();
-            addDataObject(record);
+        for (DataTime time : getDataTimes()) {
+            requestData(time);
+        }
+        GridRecord randomRec = getAnyGridRecord();
+        if (randomRec != null) {
+            String paramAbbrev = randomRec.getParameter().getAbbreviation();
+            this.getCapability(DisplayTypeCapability.class)
+                    .setAlternativeDisplayTypes(
+                            FieldDisplayTypesFactory.getInstance()
+                                    .getDisplayTypes(paramAbbrev));
         }
-        this.getCapability(DisplayTypeCapability.class)
-                .setAlternativeDisplayTypes(
-                        FieldDisplayTypesFactory.getInstance().getDisplayTypes(
-                                paramAbbrev));
         super.initInternal(target);
     }
 
     @Override
     public void addDataObject(PluginDataObject pdo) {
         super.addDataObject(pdo);
-        requestData(pdo.getDataTime());
+        if (descriptor != null) {
+            requestData(pdo.getDataTime());
+        }
     }
 
     @Override

cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/StationUtils.java

@@ -38,6 +38,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 19, 2010 #4473      rjpeter     Initial creation
+ * Feb 25, 2013 1659       bsteffen    Cache station in StationUtils
  * 
  * </pre>
  * 
@@ -67,7 +68,7 @@ public class StationUtils implements IPointChangedListener {
     public synchronized RadarStation getHomeRadarStation() {
         if (station == null) {
             Coordinate home = PointsDataManager.getInstance().getHome();
-            return getClosestRadarStation(home.x, home.y);
+            station = getClosestRadarStation(home.x, home.y);
         }
 
         return station;

cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

@@ -2278,21 +2278,21 @@ public class WarngenLayer extends AbstractStormTrackResource {
                             if (fipsIds.contains(featureFips) == false) {
                                 break;
                             } else if (oldWarningPolygon.contains(point) == true) {
-                                boolean first = true;
+                                // Get intersecting parts for each geom with
+                                // matching fips
+                                List<Geometry> fipsParts = new ArrayList<Geometry>(
+                                        dataWithFips.size());
                                 for (GeospatialData g : dataWithFips) {
-                                    if (first) {
-                                        geom = GeometryUtil.intersection(
-                                                g.geometry, oldWarningArea);
-                                        first = false;
-                                    } else {
-                                        geom = GeometryUtil.intersection(
-                                                g.geometry, geom);
-                                    }
+                                    fipsParts.add(GeometryUtil.intersection(
+                                            oldWarningArea, g.geometry));
                                 }
-
+                                // Create a collection of each part
+                                geom = GeometryUtil.union(fipsParts
+                                        .toArray(new Geometry[0]));
                                 if (warningPolygon.contains(point)) {
-                                    geom = GeometryUtil.intersection(geom,
-                                            warningPolygon);
+                                    // If inside warning polygon, intersect
+                                    geom = GeometryUtil.intersection(
+                                            warningPolygon, geom);
                                 }
                                 state.setWarningArea(GeometryUtil.union(
                                         state.getWarningArea(), geom));