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

Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards

Browse source 
Change-Id: I2ccc6596bbff035a4904a1fa6b0fe45c3416c85e

Former-commit-id: 0b64b70ab9c1f518062fd8f0c78ac51abea6e11b
This commit is contained in:
Chris Cody 2015-01-13 12:56:19 -06:00
parent c75c052122
commit 8b70f9f919
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/portions/GisUtil.java
View file

@ -21,12 +21,12 @@
package com.raytheon.uf.common.dataplugin.warning.portions;
import java.awt.geom.Point2D;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.geotools.referencing.GeodeticCalculator;
@ -58,6 +58,8 @@ import com.vividsolutions.jts.geom.GeometryFactory;
* Dec 4, 2013 2604 jsanchez Moved out of viz.warngen.
* Jun 17, 2014 DR 17390 Qinglu Lin Update calculateLocationPortion(). Use centroid in maps county table for geomCentroid
* for county based products.
* Jan 13, 2015 3996 ccody Correct NPE caused by calculating portions of Geometry objects with multiple sub Geometry objects
* This is a Jim Ramer fix
* </pre>
*
* @author chammack
@ -349,7 +351,14 @@ public class GisUtil {
* @return
*/
public static EnumSet<Direction> calculateLocationPortion(
Geometry locationGeom, Geometry reference, boolean useExtreme, boolean notUseShapefileCentroid) {
Geometry locationGeom, Geometry reference, boolean useExtreme,
boolean notUseShapefileCentroid) {
CountyUserData cud = (CountyUserData) locationGeom.getUserData();
Map<String, Object> atts = cud.entry.attributes;
Number lonNumber = (Number) atts.get("LON");
double lonDouble = lonNumber.doubleValue();
Number latNumber = (Number) atts.get("LAT");
double latDouble = latNumber.doubleValue();
for (int i = 0; i < locationGeom.getNumGeometries(); i++) {
Geometry geom = locationGeom.getGeometryN(i);
if (geom.intersects(reference)) {
@ -360,10 +369,8 @@ public class GisUtil {
.getCoordinate();
} else {
geomCentroid = new Coordinate();
geomCentroid.x = ((BigDecimal)((CountyUserData)geom.getUserData()).
entry.attributes.get("LON")).doubleValue();
geomCentroid.y = ((BigDecimal)((CountyUserData)geom.getUserData()).
entry.attributes.get("LAT")).doubleValue();
geomCentroid.x = lonDouble;
geomCentroid.y = latDouble;
}
Coordinate refCentroid = reference.getCentroid()
.getCoordinate();