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

Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development

Browse source 
Former-commit-id: 12192b633f [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]
Former-commit-id: c1bda09fd9
This commit is contained in:
Ron Anderson 2013-11-07 14:39:06 -06:00 • committed by Gerrit Code Review
commit d2cd7c1257
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
View file

@ -92,6 +92,8 @@ import com.vividsolutions.jts.io.WKBReader;
* Sep 18, 2012 1019 randerso improved error handling
* Aug 12, 2013 1133 bsteffen Better error handling for invalid
* polygons in map resource.
* Nov 06, 2013 2361 njensen Prepopulate fields in initInternal
* instead of constructor for speed
*
* </pre>
*
@ -295,9 +297,10 @@ public class DbMapResource extends
fields.add(column.toString());
}
}
double[] lev = getLevels();
QueryResult mappedResult = DbMapQueryFactory.getMapQuery(
resourceData.getTable(),
getGeomField(levels[levels.length - 1]))
getGeomField(lev[lev.length - 1]))
.queryWithinEnvelope(req.envelope, fields,
constraints);
Map<Integer, Geometry> gidMap = new HashMap<Integer, Geometry>(
@ -533,7 +536,7 @@ public class DbMapResource extends
protected Map<Object, RGB> colorMap;
protected double[] levels;
private double[] levels;
protected double lastSimpLev;
@ -543,16 +546,11 @@ public class DbMapResource extends
private MapQueryJob queryJob;
protected String geometryType;
private String geometryType;
public DbMapResource(DbMapResourceData data, LoadProperties loadProperties) {
super(data, loadProperties);
queryJob = new MapQueryJob();
// Prepopulate fields
getGeometryType();
getLabelFields();
getLevels();
}
@Override
@ -571,6 +569,13 @@ public class DbMapResource extends
@Override
protected void initInternal(IGraphicsTarget target) throws VizException {
super.initInternal(target);
// Prepopulate fields in initInternal since this is not on the UI
// thread
getGeometryType();
getLabelFields();
getLevels();
getCapability(ShadeableCapability.class).setAvailableShadingFields(
getLabelFields().toArray(new String[0]));
}