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

Issue #1170 Sped up WWC by using original polygon if no correcting is required. Changed DbMapResource to always do bbox intersections with lowest level geom field.

Browse source 
Change-Id: I81bc0cd1d21a49330e4f91db9541b9bfe3229055

Former-commit-id: b96e8e9d88 [formerly 78d515a01b] [formerly b96e8e9d88 [formerly 78d515a01b] [formerly 8644d00178 [formerly 3b8e3e4ed319f2efc846ae6b15421718a7505bbb]]]
Former-commit-id: 8644d00178
Former-commit-id: 9924916642 [formerly af04746b90]
Former-commit-id: 6eb4163fc1
This commit is contained in:
Max Schenkelberg 2012-10-03 17:57:39 -05:00
parent 12bce5c0cb
commit f5b4872c58
2 changed files with 76 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -292,8 +292,9 @@ public class DbMapResource extends
}
QueryResult mappedResult = DbMapQueryFactory.getMapQuery(
resourceData.getTable(),
resourceData.getGeomField()).queryWithinEnvelope(
req.envelope, fields, constraints);
getGeomField(levels[levels.length - 1]))
.queryWithinEnvelope(req.envelope, fields,
constraints);
Map<Integer, Geometry> gidMap = new HashMap<Integer, Geometry>(
mappedResult.getResultCount() * 2);
List<Integer> toRequest = new ArrayList<Integer>(

135
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
View file

@ -121,74 +121,85 @@ public class WorldWrapCorrector {
gf.createLinearRing(extRing.getCoordinates()), null);
// World wrap correct exterior ring and extract polygons
double[] offsets = flattenGeometry(extPolygon);
List<Geometry> extRings = new ArrayList<Geometry>();
correct(extRings, extPolygon, offsets);
List<Polygon> polygons = new ArrayList<Polygon>();
for (Geometry geom : extRings) {
extractPolygons(polygons, geom);
}
if (offsets != null) {
// This polygon needs to be corrected, process
List<Geometry> extRings = new ArrayList<Geometry>();
correct(extRings, extPolygon, offsets);
List<Polygon> polygons = new ArrayList<Polygon>();
for (Geometry geom : extRings) {
extractPolygons(polygons, geom);
}
// World wrap correct each interior ring
List<Geometry> intRings = new ArrayList<Geometry>(
p.getNumInteriorRing());
for (int n = 0; n < p.getNumInteriorRing(); ++n) {
Polygon intRing = gf.createPolygon(gf.createLinearRing(p
.getInteriorRingN(n).getCoordinates()), null);
offsets = flattenGeometry(intRing);
correct(intRings, intRing, offsets);
}
// World wrap correct each interior ring
List<Geometry> intRings = new ArrayList<Geometry>(
p.getNumInteriorRing());
for (int n = 0; n < p.getNumInteriorRing(); ++n) {
Polygon intRing = gf.createPolygon(gf
.createLinearRing(p.getInteriorRingN(n)
.getCoordinates()), null);
offsets = flattenGeometry(intRing);
correct(intRings, intRing, offsets);
}
// Extract polygons and "preprare" them for intersections
List<Polygon> interiorPolygons = new LinkedList<Polygon>();
for (Geometry geom : intRings) {
extractPolygons(interiorPolygons, geom);
}
List<PreparedGeometry> preparedInteriorPolygons = new LinkedList<PreparedGeometry>();
for (Polygon intPoly : interiorPolygons) {
preparedInteriorPolygons.add(PreparedGeometryFactory
.prepare(intPoly));
}
// Extract polygons and "preprare" them for intersections
List<Polygon> interiorPolygons = new LinkedList<Polygon>();
for (Geometry geom : intRings) {
extractPolygons(interiorPolygons, geom);
}
List<PreparedGeometry> preparedInteriorPolygons = new LinkedList<PreparedGeometry>();
for (Polygon intPoly : interiorPolygons) {
preparedInteriorPolygons.add(PreparedGeometryFactory
.prepare(intPoly));
}
// Final polygon list (may create multipolygon out of)
List<Polygon> finalPolys = new ArrayList<Polygon>(
polygons.size());
for (Polygon polygon : polygons) {
// For each polygon, check if it intersects any interior
// polygons. If so, add them to interior ring list so we
// can reconstruct with them in place
List<LinearRing> interiorRings = new ArrayList<LinearRing>();
Iterator<PreparedGeometry> preparedIntPolys = preparedInteriorPolygons
.iterator();
while (preparedIntPolys.hasNext()) {
PreparedGeometry prepIntPoly = preparedIntPolys.next();
boolean intersects = prepIntPoly.intersects(polygon);
if (intersects) {
preparedIntPolys.remove();
interiorRings.add(gf
.createLinearRing(((Polygon) prepIntPoly
.getGeometry()).getExteriorRing()
.getCoordinates()));
// Final polygon list (may create multipolygon out of)
List<Polygon> finalPolys = new ArrayList<Polygon>(
polygons.size());
for (Polygon polygon : polygons) {
// For each polygon, check if it intersects any interior
// polygons. If so, add them to interior ring list so we
// can reconstruct with them in place
List<LinearRing> interiorRings = new ArrayList<LinearRing>();
Iterator<PreparedGeometry> preparedIntPolys = preparedInteriorPolygons
.iterator();
while (preparedIntPolys.hasNext()) {
PreparedGeometry prepIntPoly = preparedIntPolys
.next();
boolean intersects = prepIntPoly
.intersects(polygon);
if (intersects) {
preparedIntPolys.remove();
interiorRings
.add(gf.createLinearRing(((Polygon) prepIntPoly
.getGeometry())
.getExteriorRing()
.getCoordinates()));
}
}
if (interiorRings.size() > 0) {
// add holes to polygon
polygon = gf.createPolygon(gf
.createLinearRing(polygon.getExteriorRing()
.getCoordinates()), interiorRings
.toArray(new LinearRing[0]));
}
finalPolys.add(polygon);
}
if (finalPolys.size() > 1) {
// More than one polygon resulting, create MultiPolygon
geoms.add(gf.createMultiPolygon(finalPolys
.toArray(new Polygon[0])));
} else {
// 1 or 0 polygons, just add to list
for (Polygon polygon : finalPolys) {
geoms.add(polygon);
}
}
if (interiorRings.size() > 0) {
// add holes to polygon
polygon = gf.createPolygon(gf.createLinearRing(polygon
.getExteriorRing().getCoordinates()),
interiorRings.toArray(new LinearRing[0]));
}
finalPolys.add(polygon);
}
if (finalPolys.size() > 1) {
// More than one polygon resulting, create MultiPolygon
geoms.add(gf.createMultiPolygon(finalPolys
.toArray(new Polygon[0])));
} else {
// 1 or 0 polygons, just add to list
for (Polygon polygon : finalPolys) {
geoms.add(polygon);
}
// offsets were null, polygon can be added as is
geoms.add(g);
}
} else {
double[] offsets = flattenGeometry(g);