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

Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2

Browse source 
Former-commit-id: bf765525b7 [formerly b5e4bc1fdc] [formerly bf765525b7 [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]
Former-commit-id: 102da2d0f7
Former-commit-id: b4d23902a7 [formerly 7ed2a8cbd4]
Former-commit-id: 8f3581340b
This commit is contained in:
Juliya Dynina 2014-07-01 10:05:57 -05:00 • committed by Gerrit Code Review
commit 5a9181fcc1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
View file

@ -76,6 +76,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometry;
* Aug 19, 2013 2177 jsanchez Used portionsUtil to calculate area portion descriptions. * Aug 19, 2013 2177 jsanchez Used portionsUtil to calculate area portion descriptions.
* Apr 29, 2014 3033 jsanchez Updated method to retrieve files in localization. * Apr 29, 2014 3033 jsanchez Updated method to retrieve files in localization.
* May 16, 2014 DR 17365 D. Friedman Reduce precision of warning area to avoid topology errors. * May 16, 2014 DR 17365 D. Friedman Reduce precision of warning area to avoid topology errors.
* Jun 30, 2014 DR 17447 Qinglu lin Updated findAffectedAreas().
* </pre> * </pre>
* *
* @author chammack * @author chammack
@ -178,6 +179,7 @@ public class Area {
} }
List<String> uniqueFips = new ArrayList<String>(); List<String> uniqueFips = new ArrayList<String>();
List<String> uniqueCountyname = new ArrayList<String>();
List<AffectedAreas> areas = new ArrayList<AffectedAreas>(); List<AffectedAreas> areas = new ArrayList<AffectedAreas>();
for (GeospatialData regionFeature : countyMap.values()) { for (GeospatialData regionFeature : countyMap.values()) {
Geometry regionGeom = regionFeature.geometry; Geometry regionGeom = regionFeature.geometry;
@ -257,8 +259,12 @@ public class Area {
area.points = pointList.toArray(new String[pointList.size()]); area.points = pointList.toArray(new String[pointList.size()]);
} }
if (uniqueFips.contains(area.fips) == false) { String countyName = (String)regionFeature.attributes.get("COUNTYNAME");
if (uniqueFips.contains(area.fips) == false || !uniqueCountyname.contains(countyName)) {
uniqueFips.add(area.fips); uniqueFips.add(area.fips);
if (countyName != null) {
uniqueCountyname.add(countyName);
}
areas.add(area); areas.add(area);
} }
} }