Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1

Former-commit-id: 73fec5c36a [formerly 2cfb44f69025ba06e85a44e481bac1f88b851834]
Former-commit-id: 753b715493

cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java

@@ -21,11 +21,15 @@ package com.raytheon.uf.viz.gisdatastore.rsc;
 
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.Set;
 
 import org.eclipse.core.runtime.ListenerList;
@@ -33,9 +37,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.geotools.coverage.grid.GeneralGridEnvelope;
-import org.geotools.coverage.grid.GridGeometry2D;
 import org.geotools.data.DataStore;
 import org.geotools.data.Query;
 import org.geotools.data.simple.SimpleFeatureCollection;
@@ -45,7 +46,6 @@ import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.factory.GeoTools;
 import org.geotools.geometry.GeneralEnvelope;
 import org.geotools.geometry.jts.JTS;
-import org.geotools.referencing.operation.DefaultMathTransformFactory;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.feature.type.AttributeDescriptor;
@@ -59,7 +59,6 @@ import org.opengis.referencing.operation.TransformException;
 
 import com.raytheon.uf.common.geospatial.MapUtil;
 import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
-import com.raytheon.uf.common.geospatial.util.WorldWrapCorrector;
 import com.raytheon.uf.common.status.IPerformanceStatusHandler;
 import com.raytheon.uf.common.status.PerformanceStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -82,8 +81,10 @@ import com.raytheon.uf.viz.core.drawables.IWireframeShape;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
-import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
+import com.raytheon.uf.viz.core.maps.jobs.AbstractMapQueryJob;
-import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
+import com.raytheon.uf.viz.core.maps.jobs.AbstractMapRequest;
+import com.raytheon.uf.viz.core.maps.jobs.AbstractMapResult;
+import com.raytheon.uf.viz.core.maps.rsc.AbstractMapResource;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.RenderingOrderFactory;
 import com.raytheon.uf.viz.core.rsc.RenderingOrderFactory.ResourceOrder;
@@ -95,13 +96,15 @@ import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
 import com.raytheon.uf.viz.core.rsc.capabilities.ShadeableCapability;
 import com.raytheon.uf.viz.gisdatastore.Activator;
 import com.raytheon.uf.viz.gisdatastore.ui.PreferenceConverter;
+import com.raytheon.viz.core.rsc.jts.JTSCompiler;
+import com.raytheon.viz.core.rsc.jts.JTSCompiler.JTSGeometryData;
+import com.raytheon.viz.core.rsc.jts.JTSCompiler.PointStyle;
 import com.raytheon.viz.ui.input.InputAdapter;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.GeometryCollection;
 import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LinearRing;
 import com.vividsolutions.jts.geom.Point;
 
 /**
@@ -113,17 +116,18 @@ import com.vividsolutions.jts.geom.Point;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 31, 2012      #1326 randerso     Initial creation
+ * Oct 31, 2012      #1326 randerso    Initial creation
- * Feb 22, 2013      #1641 randerso     Moved ID_ATTRIBUTE_NAME to package scope
+ * Feb 22, 2013      #1641 randerso    Moved ID_ATTRIBUTE_NAME to package scope
- * Jul 24, 2013      #1907 randerso     Fixed sampling when cropped
+ * Jul 24, 2013      #1907 randerso    Fixed sampling when cropped
- * Jul 24, 2013      #1908 randerso     Update attributes when cropped
+ * Jul 24, 2013      #1908 randerso    Update attributes when cropped
- * Feb 18, 2014      #2819 randerso     Removed unnecessary clones of geometries
+ * Feb 18, 2014      #2819 randerso    Removed unnecessary clones of geometries
- * Mar 11, 2014      #2718 randerso     Changes for GeoTools 10.5
+ * Mar 11, 2014      #2718 randerso    Changes for GeoTools 10.5
- * Mar 25, 2014      #2664 randerso     Added support for non-WGS84 shape files
+ * Mar 25, 2014      #2664 randerso    Added support for non-WGS84 shape files
- * Apr 14, 2014      #2664 randerso     Fix NullPointerException when no .prj file present
+ * Apr 14, 2014      #2664 randerso    Fix NullPointerException when no .prj file present
- * Apr 21, 2014      #2998 randerso     Stored types of attributes to be used in the AttributeViewer
+ * Apr 21, 2014      #2998 randerso    Stored types of attributes to be used in the AttributeViewer
- * Aug 14, 2014      #3523 mapeters     Updated deprecated {@link DrawableString#textStyle} 
+ * Aug 14, 2014      #3523 mapeters    Updated deprecated {@link DrawableString#textStyle} 
- *                                      assignments.
+ *                                     assignments.
+ * Aug 21, 2014      #3459 randerso    Restructured Map resource class hierarchy
  * 
  * </pre>
  * 
@@ -132,8 +136,8 @@ import com.vividsolutions.jts.geom.Point;
  */
 
 public class DataStoreResource extends
-        AbstractVizResource<DataStoreResourceData, MapDescriptor> implements
+        AbstractMapResource<DataStoreResourceData, MapDescriptor> implements
-        IPropertyChangeListener, IResourceDataChanged {
+        IPropertyChangeListener {
     private static final IPerformanceStatusHandler perfLog = PerformanceStatus
             .getHandler("GIS:");
 
@@ -224,6 +228,375 @@ public class DataStoreResource extends
         }
     }
 
+    private class MapQueryJob extends AbstractMapQueryJob<Request, Result> {
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * com.raytheon.uf.viz.core.maps.jobs.AbstractMapQueryJob#getNewResult
+         * (com.raytheon.uf.viz.core.maps.jobs.AbstractMapRequest)
+         */
+        @Override
+        protected Result getNewResult(Request req) {
+            return new Result(req);
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * com.raytheon.uf.viz.core.maps.jobs.AbstractMapQueryJob#processRequest
+         * (com.raytheon.uf.viz.core.maps.jobs.AbstractMapRequest,
+         * com.raytheon.uf.viz.core.maps.jobs.AbstractMapResult)
+         */
+        @Override
+        protected void processRequest(Request req, Result result)
+                throws Exception {
+            if (checkCanceled(result)) {
+                return;
+            }
+
+            List<String> fields = new ArrayList<String>();
+            fields.add(req.geomField);
+            if ((req.labelField != null)
+                    && !fields.contains(req.labelField)
+                    && !req.labelField
+                            .equals(DataStoreResource.ID_ATTRIBUTE_NAME)) {
+                fields.add(req.labelField);
+            }
+            if ((req.shadingField != null)
+                    && !fields.contains(req.shadingField)
+                    && !req.shadingField
+                            .equals(DataStoreResource.ID_ATTRIBUTE_NAME)) {
+                fields.add(req.shadingField);
+            }
+
+            IWireframeShape newOutlineShape = req.getTarget()
+                    .createWireframeShape(false,
+                            req.getResource().getDescriptor());
+
+            IWireframeShape newHighlightShape = req.getTarget()
+                    .createWireframeShape(false,
+                            req.getResource().getDescriptor());
+
+            List<LabelNode> newLabels = new ArrayList<LabelNode>();
+
+            IShadedShape newShadedShape = null;
+            if (req.isProduct || (req.shadingField != null)) {
+                newShadedShape = req.getTarget().createShadedShape(false,
+                        req.getResource().getDescriptor().getGridGeometry(),
+                        true);
+            }
+
+            SimpleFeatureType schema = req.getResource().getSchema();
+
+            JTSCompiler jtsCompiler = new JTSCompiler(newShadedShape,
+                    newOutlineShape, req.getResource().getDescriptor());
+            JTSGeometryData geomData = jtsCompiler.createGeometryData();
+            geomData.setWorldWrapCorrect(true);
+            geomData.setPointStyle(PointStyle.CROSS);
+
+            JTSCompiler highlightCompiler = new JTSCompiler(null,
+                    newHighlightShape, req.getResource().getDescriptor());
+
+            String shapeField = schema.getGeometryDescriptor().getLocalName();
+
+            Query query = new Query();
+
+            String typeName = req.getResource().getTypeName();
+            query.setTypeName(typeName);
+            query.setPropertyNames(fields);
+
+            if (req.getBoundingGeom() != null) {
+                FilterFactory2 ff = CommonFactoryFinder
+                        .getFilterFactory2(GeoTools.getDefaultHints());
+
+                List<Geometry> geomList = new ArrayList<Geometry>();
+                flattenGeometry(req.getBoundingGeom(), geomList);
+
+                List<Filter> filterList = new ArrayList<Filter>(geomList.size());
+                for (Geometry g : geomList) {
+                    Filter filter = ff.intersects(ff.property(shapeField),
+                            ff.literal(g));
+                    filterList.add(filter);
+                }
+                query.setFilter(ff.or(filterList));
+            }
+
+            SimpleFeatureSource featureSource = req.getResource()
+                    .getDataStore().getFeatureSource(typeName);
+
+            SimpleFeatureCollection featureCollection = featureSource
+                    .getFeatures(query);
+            SimpleFeatureIterator featureIterator = featureCollection
+                    .features();
+
+            if (req.getResource().displayAttributes == null) {
+                req.getResource().displayAttributes = new HashMap<String, DataStoreResource.DisplayAttributes>(
+                        (int) Math.ceil(featureCollection.size() / 0.75f),
+                        0.75f);
+            }
+
+            // TODO: do we need to implement the GeometryCache/gidMap
+            // stuff like in DbMapResource?
+
+            List<Geometry> resultingGeoms = new ArrayList<Geometry>();
+            List<Geometry> highlightGeoms = new ArrayList<Geometry>();
+            int numPoints = 0;
+            while (featureIterator.hasNext()) {
+                if (checkCanceled(result)) {
+                    return;
+                }
+
+                SimpleFeature f = featureIterator.next();
+                String id = f.getID();
+                DisplayAttributes da = req.getResource().getDisplayAttributes(
+                        id);
+                if (!da.isVisible()) {
+                    continue;
+                }
+
+                Geometry g = JTS.transform((Geometry) f
+                        .getAttribute(req.geomField), req.getResource()
+                        .getIncomingToLatLon());
+                if (da.isHighlighted()) {
+                    highlightGeoms.add(g);
+                }
+
+                if (req.highlightsOnly) {
+                    continue;
+                }
+
+                Object labelAttr = null;
+                Object shadingAttr = null;
+                for (String name : fields) {
+                    if (name.equals(req.labelField)) {
+                        labelAttr = f.getAttribute(name);
+                    }
+                    if (name.equals(req.shadingField)) {
+                        shadingAttr = f.getAttribute(name);
+                    }
+                }
+
+                if (DataStoreResource.ID_ATTRIBUTE_NAME.equals(req.labelField)) {
+                    labelAttr = id;
+                }
+
+                if (DataStoreResource.ID_ATTRIBUTE_NAME
+                        .equals(req.shadingField)) {
+                    shadingAttr = id;
+                }
+
+                if ((labelAttr != null) && (g != null)) {
+                    String label;
+                    if (labelAttr instanceof BigDecimal) {
+                        label = Double.toString(((Number) labelAttr)
+                                .doubleValue());
+                    } else {
+                        label = labelAttr.toString();
+                    }
+                    int numGeometries = g.getNumGeometries();
+                    List<Geometry> gList = new ArrayList<Geometry>(
+                            numGeometries);
+                    for (int polyNum = 0; polyNum < numGeometries; polyNum++) {
+                        Geometry poly = g.getGeometryN(polyNum);
+                        gList.add(poly);
+                    }
+                    // Sort polygons in g so biggest comes first.
+                    Collections.sort(gList, new Comparator<Geometry>() {
+                        @Override
+                        public int compare(Geometry g1, Geometry g2) {
+                            return (int) Math.signum(g2.getEnvelope().getArea()
+                                    - g1.getEnvelope().getArea());
+                        }
+                    });
+
+                    for (Geometry poly : gList) {
+                        Point point = poly.getInteriorPoint();
+                        if (point.getCoordinate() != null) {
+                            double[] location = req
+                                    .getResource()
+                                    .getDescriptor()
+                                    .worldToPixel(
+                                            new double[] {
+                                                    point.getCoordinate().x,
+                                                    point.getCoordinate().y });
+
+                            DrawableString ds = new DrawableString(label, null);
+                            ds.font = req.getResource().font;
+                            Rectangle2D rect = req.getTarget()
+                                    .getStringsBounds(ds);
+
+                            LabelNode node = new LabelNode(label, location,
+                                    rect);
+                            newLabels.add(node);
+                        }
+                    }
+                }
+
+                if (g != null) {
+                    numPoints += g.getNumPoints();
+                    resultingGeoms.add(g);
+                    if (req.shadingField != null) {
+                        g.setUserData(shadingAttr);
+                    }
+                }
+            }
+
+            newOutlineShape.allocate(numPoints);
+            RGB outlineColor = req.getResource()
+                    .getCapability(ColorableCapability.class).getColor();
+            for (Geometry g : resultingGeoms) {
+                if (checkCanceled(result)) {
+                    return;
+                }
+
+                RGB color = null;
+                Object shadedField = g.getUserData();
+                if (shadedField != null) {
+                    color = req.getColor(shadedField);
+                } else {
+                    color = outlineColor;
+                }
+                geomData.setGeometryColor(color);
+
+                try {
+                    jtsCompiler.handle(g, geomData);
+                } catch (VizException e) {
+                    Activator.statusHandler.handle(Priority.PROBLEM,
+                            "Error reprojecting map outline", e);
+                }
+            }
+
+            newOutlineShape.compile();
+
+            if (req.isProduct || (req.shadingField != null)) {
+                newShadedShape.compile();
+            }
+
+            for (Geometry g : highlightGeoms) {
+                if (checkCanceled(result)) {
+                    return;
+                }
+
+                try {
+                    highlightCompiler.handle(g, geomData);
+                } catch (VizException e) {
+                    Activator.statusHandler.handle(Priority.PROBLEM,
+                            "Error reprojecting map outline", e);
+                }
+            }
+
+            // uncomment to see boungingGeom as highlight for debug purposes
+            // highlightCompiler.handle(req.boundingGeom, true);
+
+            newHighlightShape.compile();
+
+            result.outlineShape = newOutlineShape;
+            result.labels = newLabels;
+            result.shadedShape = newShadedShape;
+            result.colorMap = req.colorMap;
+            result.highlightShape = newHighlightShape;
+            result.highlightsOnly = req.highlightsOnly;
+        }
+
+    }
+
+    public class Request extends AbstractMapRequest<DataStoreResource> {
+
+        Random rand = new Random(System.currentTimeMillis());
+
+        String geomField;
+
+        String labelField;
+
+        String shadingField;
+
+        Map<Object, RGB> colorMap;
+
+        boolean isProduct;
+
+        boolean highlightsOnly;
+
+        Request(IGraphicsTarget target, DataStoreResource rsc,
+                Geometry boundingGeom, String geomField, String labelField,
+                String shadingField, Map<Object, RGB> colorMap,
+                boolean isProduct, boolean highlightsOnly) {
+            super(target, rsc, boundingGeom);
+            this.geomField = geomField;
+            this.labelField = labelField;
+            this.shadingField = shadingField;
+            this.colorMap = colorMap;
+            this.isProduct = isProduct;
+            this.highlightsOnly = highlightsOnly;
+        }
+
+        RGB getColor(Object key) {
+            if (colorMap == null) {
+                colorMap = new HashMap<Object, RGB>();
+            }
+            RGB color = colorMap.get(key);
+            if (color == null) {
+                color = new RGB(rand.nextInt(206) + 50, rand.nextInt(206) + 50,
+                        rand.nextInt(206) + 50);
+                colorMap.put(key, color);
+            }
+
+            return color;
+        }
+    }
+
+    public class Result extends AbstractMapResult {
+        public IWireframeShape outlineShape;
+
+        public List<LabelNode> labels;
+
+        public IShadedShape shadedShape;
+
+        public Map<Object, RGB> colorMap;
+
+        public IWireframeShape highlightShape;
+
+        public boolean highlightsOnly;
+
+        /**
+         * @param request
+         */
+        public Result(Request request) {
+            super(request);
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see com.raytheon.uf.viz.core.maps.jobs.AbstractMapResult#dispose()
+         */
+        @Override
+        public void dispose() {
+            if (outlineShape != null) {
+                outlineShape.dispose();
+                outlineShape = null;
+            }
+
+            if (shadedShape != null) {
+                shadedShape.dispose();
+                shadedShape = null;
+            }
+
+            if (highlightShape != null) {
+                highlightShape.dispose();
+                highlightShape = null;
+            }
+
+            if (labels != null) {
+                labels.clear();
+                labels = null;
+            }
+        }
+
+    }
+
     static class DisplayAttributes {
         private boolean visible;
 
@@ -484,7 +857,7 @@ public class DataStoreResource extends
 
     protected String lastShadingField;
 
-    private ReloadJob reloadJob;
+    private MapQueryJob queryJob;
 
     protected String geometryType;
 
@@ -512,8 +885,6 @@ public class DataStoreResource extends
 
     private Coordinate dragPromptCoord;
 
-    private WorldWrapCorrector worldWrapCorrector;
-
     private String sampleAttribute;
 
     private Geometry boundingGeom;
@@ -528,7 +899,7 @@ public class DataStoreResource extends
     public DataStoreResource(DataStoreResourceData data,
             LoadProperties loadProperties) throws IOException {
         super(data, loadProperties);
-        reloadJob = new ReloadJob();
+        queryJob = new MapQueryJob();
 
         this.dataStore = data.getDataStore();
         this.typeName = data.getTypeName();
@@ -540,21 +911,13 @@ public class DataStoreResource extends
         GeneralEnvelope env = new GeneralEnvelope(MapUtil.LATLON_PROJECTION);
         env.setEnvelope(-180.0, -90.0, 180.0, 90.0);
 
-        GridGeometry2D latLonGridGeometry = new GridGeometry2D(
-                new GeneralGridEnvelope(new int[] { 0, 0 }, new int[] { 360,
-                        180 }, false), env);
-        this.worldWrapCorrector = new WorldWrapCorrector(latLonGridGeometry);
         resourceData.addChangeListener(this);
         mouseHandler = new MouseHandler();
     }
 
     @Override
     protected void disposeInternal() {
-
+        queryJob.stop();
-        if (font != null) {
-            font.dispose();
-            font = null;
-        }
 
         if (outlineShape != null) {
             outlineShape.dispose();
@@ -573,10 +936,8 @@ public class DataStoreResource extends
             getResourceContainer().unregisterMouseHandler(mouseHandler);
         }
 
-        lastExtent = null;
-
         this.resourceData.disposeDataStore();
-        this.reloadJob.cancel();
+        super.disposeInternal();
     }
 
     @Override
@@ -668,14 +1029,16 @@ public class DataStoreResource extends
 
         IExtent worldExtent = getDescriptor().getRenderableDisplay().getView()
                 .getExtent();
-        Rectangle screenBounds = getResourceContainer().getActiveDisplayPane()
+        int screenWidth = getResourceContainer().getActiveDisplayPane()
-                .getBounds();
+                .getBounds().width;
-        double worldToScreenRatio = worldExtent.getWidth() / screenBounds.width;
+        double worldToScreenRatio = worldExtent.getWidth() / screenWidth;
+        int displayWidth = (descriptor.getMapWidth());
+        double kmPerPixel = (displayWidth / screenWidth) / 1000.0;
 
         List<Geometry> geomList = new ArrayList<Geometry>();
         PixelExtent extent = clipToProjExtent(projExtent);
         Geometry boundingGeom = JTS.transform(
-                buildBoundingGeometry(extent, worldToScreenRatio),
+                buildBoundingGeometry(extent, worldToScreenRatio, kmPerPixel),
                 latLonToIncoming);
         flattenGeometry(boundingGeom, geomList);
 
@@ -744,106 +1107,6 @@ public class DataStoreResource extends
         }
     }
 
-    private Geometry buildBoundingGeometry(PixelExtent extent,
-            double worldToScreenRatio) {
-
-        double[] northPole = getDescriptor().worldToPixel(
-                new double[] { 0, 90 });
-        double[] southPole = getDescriptor().worldToPixel(
-                new double[] { 0, -90 });
-
-        double[] p = null;
-        if ((northPole != null) && extent.contains(northPole)) {
-            p = northPole;
-        } else if ((southPole != null) && extent.contains(southPole)) {
-            p = southPole;
-        }
-
-        double delta = 1 / worldToScreenRatio;
-
-        Geometry g;
-        if (p == null) {
-            g = geometryFromExtent(extent, worldToScreenRatio);
-        } else {
-            // if pole in the extent split the extent into four quadrants with
-            // corners at the pole
-            PixelExtent[] quadrant = new PixelExtent[4];
-            quadrant[0] = new PixelExtent(extent.getMinX(), p[0] - delta,
-                    extent.getMinY(), p[1] - delta);
-            quadrant[1] = new PixelExtent(p[0] + delta, extent.getMaxX(),
-                    extent.getMinY(), p[1] - delta);
-            quadrant[2] = new PixelExtent(p[0] + delta, extent.getMaxX(), p[1]
-                    + delta, extent.getMaxY());
-            quadrant[3] = new PixelExtent(extent.getMinX(), p[0] - delta, p[1]
-                    + delta, extent.getMaxY());
-
-            List<Geometry> geometries = new ArrayList<Geometry>(4);
-            for (PixelExtent ext : quadrant) {
-                if ((ext.getWidth() > 0) && (ext.getHeight() > 0)) {
-                    geometries.add(geometryFromExtent(ext, worldToScreenRatio));
-                }
-            }
-
-            GeometryFactory gf = new GeometryFactory();
-            g = gf.createGeometryCollection(geometries
-                    .toArray(new Geometry[geometries.size()]));
-        }
-
-        MathTransform gridToCrs = getDescriptor().getGridGeometry()
-                .getGridToCRS();
-        DefaultMathTransformFactory dmtf = new DefaultMathTransformFactory();
-        try {
-            MathTransform crsToLatLon = MapUtil
-                    .getTransformToLatLon(getDescriptor().getCRS());
-            MathTransform gridToLatLon = dmtf.createConcatenatedTransform(
-                    gridToCrs, crsToLatLon);
-            g = JTS.transform(g, gridToLatLon);
-
-            // correct for world wrap
-            g = this.worldWrapCorrector.correct(g);
-
-            return g;
-        } catch (Exception e) {
-            Activator.statusHandler.handle(Priority.PROBLEM,
-                    "Error computing bounding geometry", e);
-        }
-        return null;
-    }
-
-    private Geometry geometryFromExtent(PixelExtent extent,
-            double worldToScreenRatio) {
-        int nx = (int) Math.ceil(extent.getWidth() / worldToScreenRatio);
-        int ny = (int) Math.ceil(extent.getHeight() / worldToScreenRatio);
-
-        double dx = extent.getWidth() / nx;
-        double dy = extent.getHeight() / ny;
-
-        Coordinate[] coordinates = new Coordinate[(2 * (nx + ny)) + 1];
-        int i = 0;
-        for (int x = 0; x < nx; x++) {
-            coordinates[i++] = new Coordinate((x * dx) + extent.getMinX(),
-                    extent.getMinY());
-        }
-        for (int y = 0; y < ny; y++) {
-            coordinates[i++] = new Coordinate(extent.getMaxX(), (y * dy)
-                    + extent.getMinY());
-        }
-        for (int x = nx; x > 0; x--) {
-            coordinates[i++] = new Coordinate((x * dx) + extent.getMinX(),
-                    extent.getMaxY());
-        }
-        for (int y = ny; y > 0; y--) {
-            coordinates[i++] = new Coordinate(extent.getMinX(), (y * dy)
-                    + extent.getMinY());
-        }
-        coordinates[i++] = coordinates[0];
-
-        GeometryFactory gf = new GeometryFactory();
-        LinearRing shell = gf.createLinearRing(coordinates);
-        Geometry g = gf.createPolygon(shell, null);
-        return g;
-    }
-
     @Override
     protected void paintInternal(IGraphicsTarget aTarget,
             PaintProperties paintProps) throws VizException {
@@ -865,8 +1128,13 @@ public class DataStoreResource extends
             }
         }
 
+        int screenWidth = paintProps.getCanvasBounds().width;
         double worldToScreenRatio = paintProps.getView().getExtent().getWidth()
-                / paintProps.getCanvasBounds().width;
+                / screenWidth;
+
+        int displayWidth = (int) (descriptor.getMapWidth() * paintProps
+                .getZoomLevel());
+        double kmPerPixel = (displayWidth / screenWidth) / 1000.0;
 
         String labelField = getCapability(LabelableCapability.class)
                 .getLabelField();
@@ -896,7 +1164,8 @@ public class DataStoreResource extends
                 try {
                     boundingGeom = JTS.transform(
                             buildBoundingGeometry(expandedExtent,
-                                    worldToScreenRatio), latLonToIncoming);
+                                    worldToScreenRatio, kmPerPixel),
+                            latLonToIncoming);
                 } catch (Exception e) {
                     throw new VizException(e.getLocalizedMessage(), e);
                 }
@@ -906,9 +1175,9 @@ public class DataStoreResource extends
 
                 boolean highlightsOnly = updateHighlights && !updateLabels
                         && !updateShading && !updateExtent;
-                reloadJob.request(aTarget, this, boundingGeom, geomField,
+                queryJob.queueRequest(new Request(aTarget, this, boundingGeom,
-                        labelField, shadingField, colorMap, isProduct,
+                        geomField, labelField, shadingField, colorMap,
-                        highlightsOnly);
+                        isProduct, highlightsOnly));
                 lastExtent = expandedExtent;
                 lastLabelField = labelField;
                 lastShadingField = shadingField;
@@ -916,7 +1185,7 @@ public class DataStoreResource extends
             }
         }
 
-        ReloadJob.Result result = reloadJob.getLatestResult();
+        Result result = queryJob.getLatestResult();
         if (result != null) {
             handleResult(result);
         }
@@ -966,7 +1235,7 @@ public class DataStoreResource extends
             DrawableString ds = new DrawableString("Drag to select", new RGB(0,
                     0, 0));
             ds.setCoordinates(dragPromptCoord.x, dragPromptCoord.y);
-            ds.addTextStyle(TextStyle.BLANKED);
+            ds.addTextStyle(TextStyle.BLANKED, new RGB(255, 255, 255));
             ds.addTextStyle(TextStyle.BOXED, new RGB(255, 255, 255));
             ds.horizontalAlignment = HorizontalAlignment.LEFT;
             ds.verticallAlignment = VerticalAlignment.BOTTOM;
@@ -974,11 +1243,11 @@ public class DataStoreResource extends
         }
     }
 
-    private void handleResult(ReloadJob.Result result) throws VizException {
+    private void handleResult(Result result) throws VizException {
-        if (result.failed) {
+        if (result.isFailed()) {
             lastExtent = null; // force to re-query when re-enabled
             throw new VizException("Error processing map query request: ",
-                    result.cause);
+                    result.getCause());
         }
         if (!result.highlightsOnly) {
             if (outlineShape != null) {
@@ -1168,6 +1437,7 @@ public class DataStoreResource extends
      * @param screenExtent
      * @return
      */
+    @Override
     protected PixelExtent getExpandedExtent(PixelExtent screenExtent) {
         PixelExtent expandedExtent = screenExtent.clone();
         expandedExtent.getEnvelope().expandBy(
@@ -1177,6 +1447,7 @@ public class DataStoreResource extends
         return clipToProjExtent(expandedExtent);
     }
 
+    @Override
     protected PixelExtent clipToProjExtent(PixelExtent extent) {
         Envelope e = extent.getEnvelope()
                 .intersection(projExtent.getEnvelope());
@@ -1362,17 +1633,19 @@ public class DataStoreResource extends
 
                 IExtent worldExtent = getDescriptor().getRenderableDisplay()
                         .getView().getExtent();
-                Rectangle screenBounds = getResourceContainer()
+                int screenWidth = getResourceContainer().getActiveDisplayPane()
-                        .getActiveDisplayPane().getBounds();
+                        .getBounds().width;
                 double worldToScreenRatio = worldExtent.getWidth()
-                        / screenBounds.width;
+                        / screenWidth;
+                int displayWidth = (descriptor.getMapWidth());
+                double kmPerPixel = (displayWidth / screenWidth) / 1000.0;
 
                 double delta = CLICK_TOLERANCE * worldToScreenRatio;
                 PixelExtent bboxExtent = new PixelExtent(pix.x - delta, pix.x
                         + delta, pix.y + delta, pix.y - delta);
                 Geometry clickBox = JTS.transform(
-                        buildBoundingGeometry(bboxExtent, worldToScreenRatio),
+                        buildBoundingGeometry(bboxExtent, worldToScreenRatio,
-                        latLonToIncoming);
+                                kmPerPixel), latLonToIncoming);
                 List<Geometry> clickGeomList = new ArrayList<Geometry>();
                 flattenGeometry(clickBox, clickGeomList);
                 List<Filter> clickFilterList = new ArrayList<Filter>(

cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/ReloadJob.java

@@ -1,517 +0,0 @@
-package com.raytheon.uf.viz.gisdatastore.rsc;
-
-import java.awt.geom.Rectangle2D;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.ArrayBlockingQueue;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.graphics.RGB;
-import org.geotools.data.Query;
-import org.geotools.data.simple.SimpleFeatureCollection;
-import org.geotools.data.simple.SimpleFeatureIterator;
-import org.geotools.data.simple.SimpleFeatureSource;
-import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.factory.GeoTools;
-import org.geotools.geometry.jts.JTS;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory2;
-
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.DrawableString;
-import com.raytheon.uf.viz.core.IGraphicsTarget;
-import com.raytheon.uf.viz.core.drawables.IShadedShape;
-import com.raytheon.uf.viz.core.drawables.IWireframeShape;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
-import com.raytheon.uf.viz.gisdatastore.Activator;
-import com.raytheon.uf.viz.gisdatastore.rsc.DataStoreResource.DisplayAttributes;
-import com.raytheon.uf.viz.gisdatastore.rsc.DataStoreResource.LabelNode;
-import com.raytheon.viz.core.rsc.jts.JTSCompiler;
-import com.raytheon.viz.core.rsc.jts.JTSCompiler.PointStyle;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.Point;
-
-/**
- * Job to reload data from GIS data stores
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 31, 2012      #1326 randerso     Initial creation
- * Feb 22, 2013      #1641 randerso     Added checks for using ID as label or shading attribute
- * Jul 24, 2014      #1908 randerso     Removed debug sysouts
- * Feb 18, 2014      #2819 randerso     Removed unnecessary clones of geometries
- * Mar 11, 2014      #2718 randerso     Changes for GeoTools 10.5
- * Mar 25, 2014      #2664 randerso     Added support for non-WGS84 shape files
- * Apr 21, 2014      #2998 randerso     Make a better stab at sizing displayAttributes correctly
- * 
- * </pre>
- * 
- * @author randerso
- * @version 1.0
- */
-class ReloadJob extends Job {
-
-    private static final int QUEUE_LIMIT = 1;
-
-    private static Random rand = new Random(System.currentTimeMillis());
-
-    private static int requestCounter = 0;
-
-    public class Request {
-        int number;
-
-        IGraphicsTarget target;
-
-        DataStoreResource rsc;
-
-        String geomField;
-
-        String labelField;
-
-        String shadingField;
-
-        Geometry boundingGeom;
-
-        Map<Object, RGB> colorMap;
-
-        boolean isProduct;
-
-        boolean highlightsOnly;
-
-        Request(IGraphicsTarget target, DataStoreResource rsc,
-                Geometry boundingGeom, String geomField, String labelField,
-                String shadingField, Map<Object, RGB> colorMap,
-                boolean isProduct, boolean highlightsOnly) {
-            this.number = requestCounter++;
-            this.target = target;
-            this.rsc = rsc;
-            this.boundingGeom = boundingGeom;
-            this.geomField = geomField;
-            this.labelField = labelField;
-            this.shadingField = shadingField;
-            this.colorMap = colorMap;
-            this.isProduct = isProduct;
-            this.highlightsOnly = highlightsOnly;
-        }
-
-        RGB getColor(Object key) {
-            if (colorMap == null) {
-                colorMap = new HashMap<Object, RGB>();
-            }
-            RGB color = colorMap.get(key);
-            if (color == null) {
-                color = new RGB(rand.nextInt(206) + 50, rand.nextInt(206) + 50,
-                        rand.nextInt(206) + 50);
-                colorMap.put(key, color);
-            }
-
-            return color;
-        }
-    }
-
-    public class Result {
-        public IWireframeShape outlineShape;
-
-        public List<LabelNode> labels;
-
-        public IShadedShape shadedShape;
-
-        public Map<Object, RGB> colorMap;
-
-        public boolean failed;
-
-        public Throwable cause;
-
-        public IWireframeShape highlightShape;
-
-        public boolean highlightsOnly;
-
-        private Result() {
-            failed = true;
-        }
-
-        public void dispose() {
-            if (outlineShape != null) {
-                outlineShape.dispose();
-                outlineShape = null;
-            }
-
-            if (shadedShape != null) {
-                shadedShape.dispose();
-                shadedShape = null;
-            }
-
-            if (highlightShape != null) {
-                highlightShape.dispose();
-                highlightShape = null;
-            }
-        }
-    }
-
-    private Request pendingRequest = null;
-
-    private ArrayBlockingQueue<Result> resultQueue = new ArrayBlockingQueue<Result>(
-            QUEUE_LIMIT);
-
-    public ReloadJob() {
-        super("Loading ...");
-    }
-
-    public void request(IGraphicsTarget target, DataStoreResource rsc,
-            Geometry boundingGeom, String geomField, String labelField,
-            String shadingField, Map<Object, RGB> colorMap, boolean isProduct,
-            boolean highlightsOnly) {
-
-        synchronized (this) {
-            pendingRequest = new Request(target, rsc, boundingGeom, geomField,
-                    labelField, shadingField, colorMap, isProduct,
-                    highlightsOnly);
-        }
-
-        this.schedule();
-    }
-
-    public Result getLatestResult() {
-        return resultQueue.poll();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.
-     * IProgressMonitor)
-     */
-    @Override
-    protected IStatus run(IProgressMonitor monitor) {
-        Request req = null;
-        synchronized (this) {
-            req = pendingRequest;
-            pendingRequest = null;
-        }
-        while (req != null) {
-            // System.out.println("Processing request: " + req.number);
-
-            Result result = new Result();
-            SimpleFeatureCollection featureCollection = null;
-            SimpleFeatureIterator featureIterator = null;
-            try {
-                if (pendingRequest != null) {
-                    // System.out.println("Canceling request: " + req.number);
-                    result.dispose();
-                    result = null;
-                    return Status.CANCEL_STATUS;
-                }
-
-                List<String> fields = new ArrayList<String>();
-                fields.add(req.geomField);
-                if ((req.labelField != null)
-                        && !fields.contains(req.labelField)
-                        && !req.labelField
-                                .equals(DataStoreResource.ID_ATTRIBUTE_NAME)) {
-                    fields.add(req.labelField);
-                }
-                if ((req.shadingField != null)
-                        && !fields.contains(req.shadingField)
-                        && !req.shadingField
-                                .equals(DataStoreResource.ID_ATTRIBUTE_NAME)) {
-                    fields.add(req.shadingField);
-                }
-
-                IWireframeShape newOutlineShape = req.target
-                        .createWireframeShape(false, req.rsc.getDescriptor());
-
-                IWireframeShape newHighlightShape = req.target
-                        .createWireframeShape(false, req.rsc.getDescriptor());
-
-                List<LabelNode> newLabels = new ArrayList<LabelNode>();
-
-                IShadedShape newShadedShape = null;
-                if (req.isProduct || (req.shadingField != null)) {
-                    newShadedShape = req.target.createShadedShape(false,
-                            req.rsc.getDescriptor().getGridGeometry(), true);
-                }
-
-                SimpleFeatureType schema = req.rsc.getSchema();
-
-                JTSCompiler jtsCompiler = new JTSCompiler(newShadedShape,
-                        newOutlineShape, req.rsc.getDescriptor(),
-                        PointStyle.CROSS);
-
-                JTSCompiler highlightCompiler = new JTSCompiler(null,
-                        newHighlightShape, req.rsc.getDescriptor(),
-                        PointStyle.CROSS);
-
-                String shapeField = schema.getGeometryDescriptor()
-                        .getLocalName();
-
-                Query query = new Query();
-
-                String typeName = req.rsc.getTypeName();
-                query.setTypeName(typeName);
-                query.setPropertyNames(fields);
-
-                if (req.boundingGeom != null) {
-                    FilterFactory2 ff = CommonFactoryFinder
-                            .getFilterFactory2(GeoTools.getDefaultHints());
-
-                    List<Geometry> geomList = new ArrayList<Geometry>();
-                    flattenGeometry(req.boundingGeom, geomList);
-
-                    List<Filter> filterList = new ArrayList<Filter>(
-                            geomList.size());
-                    for (Geometry g : geomList) {
-                        Filter filter = ff.intersects(ff.property(shapeField),
-                                ff.literal(g));
-                        filterList.add(filter);
-                    }
-                    query.setFilter(ff.or(filterList));
-                }
-
-                SimpleFeatureSource featureSource = req.rsc.getDataStore()
-                        .getFeatureSource(typeName);
-
-                featureCollection = featureSource.getFeatures(query);
-                featureIterator = featureCollection.features();
-
-                if (req.rsc.displayAttributes == null) {
-                    req.rsc.displayAttributes = new HashMap<String, DataStoreResource.DisplayAttributes>(
-                            (int) Math.ceil(featureCollection.size() / 0.75f),
-                            0.75f);
-                }
-
-                // TODO: do we need to implement the GeometryCache/gidMap
-                // stuff like in DbMapResource?
-
-                List<Geometry> resultingGeoms = new ArrayList<Geometry>();
-                List<Geometry> highlightGeoms = new ArrayList<Geometry>();
-                int numPoints = 0;
-                while (featureIterator.hasNext()) {
-                    if (pendingRequest != null) {
-                        // System.out.println("Canceling request: " +
-                        // req.number);
-                        result.dispose();
-                        result = null;
-                        return Status.CANCEL_STATUS;
-                    }
-
-                    SimpleFeature f = featureIterator.next();
-                    String id = f.getID();
-                    DisplayAttributes da = req.rsc.getDisplayAttributes(id);
-                    if (!da.isVisible()) {
-                        continue;
-                    }
-
-                    Geometry g = JTS.transform(
-                            (Geometry) f.getAttribute(req.geomField),
-                            req.rsc.getIncomingToLatLon());
-                    if (da.isHighlighted()) {
-                        highlightGeoms.add(g);
-                    }
-
-                    if (req.highlightsOnly) {
-                        continue;
-                    }
-
-                    Object labelAttr = null;
-                    Object shadingAttr = null;
-                    for (String name : fields) {
-                        if (name.equals(req.labelField)) {
-                            labelAttr = f.getAttribute(name);
-                        }
-                        if (name.equals(req.shadingField)) {
-                            shadingAttr = f.getAttribute(name);
-                        }
-                    }
-
-                    if (DataStoreResource.ID_ATTRIBUTE_NAME
-                            .equals(req.labelField)) {
-                        labelAttr = id;
-                    }
-
-                    if (DataStoreResource.ID_ATTRIBUTE_NAME
-                            .equals(req.shadingField)) {
-                        shadingAttr = id;
-                    }
-
-                    if ((labelAttr != null) && (g != null)) {
-                        String label;
-                        if (labelAttr instanceof BigDecimal) {
-                            label = Double.toString(((Number) labelAttr)
-                                    .doubleValue());
-                        } else {
-                            label = labelAttr.toString();
-                        }
-                        int numGeometries = g.getNumGeometries();
-                        List<Geometry> gList = new ArrayList<Geometry>(
-                                numGeometries);
-                        for (int polyNum = 0; polyNum < numGeometries; polyNum++) {
-                            Geometry poly = g.getGeometryN(polyNum);
-                            gList.add(poly);
-                        }
-                        // Sort polygons in g so biggest comes first.
-                        Collections.sort(gList, new Comparator<Geometry>() {
-                            @Override
-                            public int compare(Geometry g1, Geometry g2) {
-                                return (int) Math
-                                        .signum(g2.getEnvelope().getArea()
-                                                - g1.getEnvelope().getArea());
-                            }
-                        });
-
-                        for (Geometry poly : gList) {
-                            Point point = poly.getInteriorPoint();
-                            if (point.getCoordinate() != null) {
-                                double[] location = req.rsc
-                                        .getDescriptor()
-                                        .worldToPixel(
-                                                new double[] {
-                                                        point.getCoordinate().x,
-                                                        point.getCoordinate().y });
-
-                                DrawableString ds = new DrawableString(label,
-                                        null);
-                                ds.font = req.rsc.font;
-                                Rectangle2D rect = req.target
-                                        .getStringsBounds(ds);
-
-                                LabelNode node = new LabelNode(label, location,
-                                        rect);
-                                newLabels.add(node);
-                            }
-                        }
-                    }
-
-                    if (g != null) {
-                        numPoints += g.getNumPoints();
-                        resultingGeoms.add(g);
-                        if (req.shadingField != null) {
-                            g.setUserData(shadingAttr);
-                        }
-                    }
-                }
-
-                newOutlineShape.allocate(numPoints);
-                RGB outlineColor = req.rsc.getCapability(
-                        ColorableCapability.class).getColor();
-                for (Geometry g : resultingGeoms) {
-                    if (pendingRequest != null) {
-                        // System.out.println("Canceling request: " +
-                        // req.number);
-                        result.dispose();
-                        result = null;
-                        return Status.CANCEL_STATUS;
-                    }
-
-                    RGB color = null;
-                    Object shadedField = g.getUserData();
-                    if (shadedField != null) {
-                        color = req.getColor(shadedField);
-                    } else {
-                        color = outlineColor;
-                    }
-
-                    try {
-                        jtsCompiler.handle(g, color, true);
-                    } catch (VizException e) {
-                        Activator.statusHandler.handle(Priority.PROBLEM,
-                                "Error reprojecting map outline", e);
-                    }
-                }
-
-                newOutlineShape.compile();
-
-                if (req.isProduct || (req.shadingField != null)) {
-                    newShadedShape.compile();
-                }
-
-                for (Geometry g : highlightGeoms) {
-                    if (pendingRequest != null) {
-                        // System.out.println("Canceling request: " +
-                        // req.number);
-                        result.dispose();
-                        result = null;
-                        return Status.CANCEL_STATUS;
-                    }
-
-                    try {
-                        highlightCompiler.handle(g, true);
-                    } catch (VizException e) {
-                        Activator.statusHandler.handle(Priority.PROBLEM,
-                                "Error reprojecting map outline", e);
-                    }
-                }
-
-                // uncomment to see boungingGeom as highlight for debug purposes
-                // highlightCompiler.handle(req.boundingGeom, true);
-
-                newHighlightShape.compile();
-
-                result.outlineShape = newOutlineShape;
-                result.labels = newLabels;
-                result.shadedShape = newShadedShape;
-                result.colorMap = req.colorMap;
-                result.highlightShape = newHighlightShape;
-                result.highlightsOnly = req.highlightsOnly;
-                result.failed = false;
-            } catch (Throwable e) {
-                result.cause = e;
-            } finally {
-                if (featureIterator != null) {
-                    featureIterator.close();
-                }
-                if (result != null) {
-                    // System.out.println("Completed request: " + req.number);
-                    if (resultQueue.size() == QUEUE_LIMIT) {
-                        resultQueue.poll();
-                    }
-                    resultQueue.add(result);
-                    req.rsc.issueRefresh();
-                }
-            }
-
-            synchronized (this) {
-                req = pendingRequest;
-                pendingRequest = null;
-            }
-        }
-
-        return Status.OK_STATUS;
-    }
-
-    /**
-     * Recursively traverse a Geometry and expand all geometry collections into
-     * a list of geometries
-     * 
-     * @param geometry
-     *            the geometry to flatten
-     * @param geomList
-     *            the list of geometries
-     */
-    private void flattenGeometry(Geometry geometry, List<Geometry> geomList) {
-        if (geometry instanceof GeometryCollection) {
-            GeometryCollection collection = (GeometryCollection) geometry;
-            for (int i = 0; i < collection.getNumGeometries(); i++) {
-                flattenGeometry(collection.getGeometryN(i), geomList);
-            }
-        } else {
-            geomList.add(geometry);
-        }
-    }
-}

cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java

@@ -51,7 +51,7 @@ import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.IMapDescriptor;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
-import com.raytheon.uf.viz.core.maps.rsc.AbstractMapResource;
+import com.raytheon.uf.viz.core.maps.rsc.StyledMapResource;
 import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
@@ -78,6 +78,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  *    Jul 29, 2014  3465        mapeters    Updated deprecated drawString() calls.
  *    Aug 04, 2014  3489        mapeters    Updated deprecated getStringBounds() calls.
  *    Aug 13, 2014  3492        mapeters    Updated deprecated createWireframeShape() calls.
+ *    Aug 21, 2014 #3459        randerso    Restructured Map resource class hierarchy
  * 
  * </pre>
  * 
@@ -85,7 +86,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  */
 public class BCDResource extends
-        AbstractMapResource<BCDResourceData, MapDescriptor> implements
+        StyledMapResource<BCDResourceData, MapDescriptor> implements
         IResourceDataChanged {
 
     /** The wireframe object */
@@ -182,7 +183,7 @@ public class BCDResource extends
                             FileUtil.join(VizApp.getMapsDir(),
                                     resourceData.getFilename()));
                 }
-                if (file == null || file.exists() == false) {
+                if ((file == null) || (file.exists() == false)) {
                     throw new VizException("Could not find bcd file",
                             new FileNotFoundException(String.valueOf(file)));
                 }
@@ -195,8 +196,9 @@ public class BCDResource extends
                 if (buffer.remaining() >= 4) {
                     // Whether BCX or not, first value is an int.
                     // Note: Different from A1 which tests >31 or >500
-                    if (buffer.getInt(0) > Short.MAX_VALUE)
+                    if (buffer.getInt(0) > Short.MAX_VALUE) {
                         buffer.order(ByteOrder.LITTLE_ENDIAN);
+                    }
                 }
 
                 double minLat = Double.MAX_VALUE;
@@ -321,13 +323,13 @@ public class BCDResource extends
                 font = target.initializeFont(target.getDefaultFont()
                         .getFontName(), (float) (10 * magnification), null);
             }
-            
+
             DrawableString stringN = new DrawableString("N");
             stringN.font = font;
             Rectangle2D charSize = target.getStringsBounds(stringN);
             double charWidth = charSize.getWidth();
 
-            double minSepDist = metersPerPixel / 1000.0 / density * charWidth;
+            double minSepDist = (metersPerPixel / 1000.0 / density) * charWidth;
 
             if (maxLen <= 5) {
                 minSepDist *= maxLen;
@@ -344,7 +346,7 @@ public class BCDResource extends
                     continue;
                 }
 
-                if (view.isVisible(p.pixel) && p.distance >= minSepDist) {
+                if (view.isVisible(p.pixel) && (p.distance >= minSepDist)) {
                     DrawableString string = new DrawableString(p.label, color);
                     string.font = font;
                     string.setCoordinates(p.pixel[0], p.pixel[1]);

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java

@@ -49,8 +49,6 @@ import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
 import com.raytheon.uf.common.dataquery.db.QueryResult;
 import com.raytheon.uf.common.geospatial.MapUtil;
 import com.raytheon.uf.common.geospatial.util.WorldWrapCorrector;
-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.viz.core.DrawableString;
 import com.raytheon.uf.viz.core.IExtent;
@@ -107,6 +105,7 @@ import com.vividsolutions.jts.io.WKBReader;
  * Aug 13, 2014     #3492  mapeters    Updated deprecated createWireframeShape() calls.
  * Aug 14, 2014     #3523  mapeters    Updated deprecated {@link DrawableString#textStyle} 
  *                                     assignments.
+ * Aug 21, 2014     #3459  randerso    Restructured Map resource class hierarchy
  * 
  * </pre>
  * 
@@ -115,8 +114,6 @@ import com.vividsolutions.jts.io.WKBReader;
  */
 
 public class ZoneSelectorResource extends DbMapResource {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(ZoneSelectorResource.class);
 
     private static final RGB NO_ZONE_COLOR;
     static {
@@ -266,7 +263,7 @@ public class ZoneSelectorResource extends DbMapResource {
                                 // zoneName = "";
                             }
 
-                            if (limitZones != null
+                            if ((limitZones != null)
                                     && !limitZones.contains(zoneName)) {
                                 continue;
                             }
@@ -1089,7 +1086,7 @@ public class ZoneSelectorResource extends DbMapResource {
                     String zoneName = (String) mappedResult.getRowColumnValue(
                             i, "editarea");
 
-                    if (this.limitZones != null
+                    if ((this.limitZones != null)
                             && !this.limitZones.contains(zoneName)) {
                         continue;
                     }

cave/com.raytheon.viz.lpi/src/com/raytheon/viz/lpi/LPIResource.java

@@ -34,8 +34,6 @@ import org.eclipse.swt.graphics.RGB;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.core.DrawableString;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
@@ -47,7 +45,7 @@ import com.raytheon.uf.viz.core.drawables.IFont;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.IMapDescriptor;
-import com.raytheon.uf.viz.core.maps.rsc.AbstractMapResource;
+import com.raytheon.uf.viz.core.maps.rsc.StyledMapResource;
 import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
@@ -69,6 +67,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Spe 17, 2007           randerso    Initial Creation.
  * May 16, 2014  3163     bsteffen    Remove WORD_WRAP TextStyle and handle
  *                                    wrapping locally.
+ * Aug 21, 2014 #3459     randerso    Restructured Map resource class hierarchy
  * 
  * </pre>
  * 
@@ -76,10 +75,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  */
 public class LPIResource extends
-        AbstractMapResource<LPIResourceData, IMapDescriptor> implements
+        StyledMapResource<LPIResourceData, IMapDescriptor> implements
         IResourceDataChanged {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(LPIResource.class);
 
     /** Whether the resource is ready to be drawn */
     private boolean ready = false;
@@ -146,7 +143,7 @@ public class LPIResource extends
                 file = PathManagerFactory.getPathManager().getStaticFile(
                         filename);
             }
-            if (file == null || file.exists() == false) {
+            if ((file == null) || (file.exists() == false)) {
                 throw new VizException("Could not find lpi file",
                         new FileNotFoundException(filename));
             }
@@ -281,8 +278,7 @@ public class LPIResource extends
                     if (isLabeled && (magnification > 0.0)) {
                         String label = p.label;
                         label = label.replaceAll("([^\n]{3}\\S*)\\s+", "$1\n");
-                        DrawableString string = new DrawableString(label,
+                        DrawableString string = new DrawableString(label, color);
-                                color);
                         string.font = font;
                         string.setCoordinates(p.pixel[0] + offsetX, p.pixel[1]
                                 + offsetY);

cave/com.raytheon.viz.spi/src/com/raytheon/viz/spi/SPIResource.java

@@ -40,7 +40,7 @@ import com.raytheon.uf.viz.core.drawables.IFont;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
-import com.raytheon.uf.viz.core.maps.rsc.AbstractMapResource;
+import com.raytheon.uf.viz.core.maps.rsc.StyledMapResource;
 import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
@@ -62,6 +62,7 @@ import com.raytheon.viz.pointdata.StaticPlotInfoPV.SPIEntry;
  *    ------------  ----------  ----------- --------------------------
  *    1/10/08       562         bphillip    Initial Creation.
  *    8/04/14       3489        mapeters    Updated deprecated getStringBounds() calls.
+ *    08/21/2014   #3459        randerso    Restructured Map resource class hierarchy
  * 
  * </pre>
  * 
@@ -69,7 +70,7 @@ import com.raytheon.viz.pointdata.StaticPlotInfoPV.SPIEntry;
  * 
  */
 public class SPIResource extends
-        AbstractMapResource<SPIResourceData, MapDescriptor> implements
+        StyledMapResource<SPIResourceData, MapDescriptor> implements
         IResourceDataChanged {
 
     /** The line color */
@@ -111,7 +112,7 @@ public class SPIResource extends
             file = PathManagerFactory.getPathManager().getStaticFile(
                     resourceData.getFilename());
         }
-        if (file == null || file.exists() == false) {
+        if ((file == null) || (file.exists() == false)) {
             throw new VizException("Could not find spi file",
                     new FileNotFoundException(resourceData.getFilename()));
         }
@@ -189,7 +190,7 @@ public class SPIResource extends
             key = iterator.next();
             entry = entries.get(key);
 
-            if (entry.pixel != null
+            if ((entry.pixel != null)
                     && paintProps.getView().isVisible(entry.pixel)
                     && (entry.distance >= minSepDist)) {
                 points.add(entry.pixel);