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

Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Browse source 
Former-commit-id: e4269dfba4 [formerly ff4a350eca07ea0f158ca0c3082890faa5bda368]
Former-commit-id: 7a62d03b55
This commit is contained in:
Fay.Liang 2015-03-13 15:58:28 -04:00
commit 7873b16eac
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,6 +86,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometry;
* Jul 22, 2014 3419 jsanchez Cleaned up converFeAreaToPartList.
* Sep 14, 2014 ASM #641 dhuffman Filtered out cases where Areas do not match Zones by using
* refactored WarngenLayer::filterArea.
* Mar 9, 2014 ASM #17190 D. Friedman Use fipsField and areaField for unique area ID.
* </pre>
*
* @author chammack
@ -191,8 +192,7 @@ public class Area {
}
}
List<String> uniqueFips = new ArrayList<String>();
List<String> uniqueCountyname = new ArrayList<String>();
List<String> uniqueAreaIDs = new ArrayList<String>();
List<AffectedAreas> areas = new ArrayList<AffectedAreas>();
for (GeospatialData regionFeature : countyMap.values()) {
Geometry regionGeom = regionFeature.geometry;
@ -272,14 +272,15 @@ public class Area {
area.points = pointList.toArray(new String[pointList.size()]);
}
String countyName = (String) regionFeature.attributes
.get("COUNTYNAME");
if (uniqueFips.contains(area.fips) == false
|| !uniqueCountyname.contains(countyName)) {
uniqueFips.add(area.fips);
if (countyName != null) {
uniqueCountyname.add(countyName);
}
/*
* Usually, the fipsField value is a unique identifier, but in some
* cases there are multiple areas that have the same value. These
* areas have different names, so we make that part of the unique
* ID.
*/
String areaID = area.fips + ':' + area.name;
if (uniqueAreaIDs.contains(areaID) == false) {
uniqueAreaIDs.add(areaID);
areas.add(area);
}
}

2
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/ClearGfeOrphanedLocks.java
View file

@ -144,10 +144,10 @@ public class ClearGfeOrphanedLocks {
lockList = (List<Lock>) lockMgr.getAllLocks(siteId);
// find orphaned locks and break them
breakLocks(clients, lockList, lockMgr, siteId);
return;
} catch (GfeException e) {
statusHandler.error("Error retrieving all locks", e);
}
}
return;
}
}