From dc25e9d8dde69d7ca47b8bc76bb2b838ffc58610 Mon Sep 17 00:00:00 2001 From: David Friedman Date: Mon, 9 Mar 2015 14:23:35 +0000 Subject: [PATCH 1/2] ASM #17190 - Counties being listed twice in Zone based products with extra county entries in shapefile Change-Id: Ie3cb35803e7ef08a4147d85c9a7f28b0476ce5a2 Former-commit-id: 3c45c2d1587f30700fd0e38a4f08d56ddaecad2d [formerly 6d8bd3315f48d188507a76092a950511a75c142c] Former-commit-id: cfb3788972e000348401d784c6131175ee61c109 --- .../com/raytheon/viz/warngen/gis/Area.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java index 47ace4c5e2..fa73aa4e3e 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java @@ -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. * * * @author chammack @@ -191,8 +192,7 @@ public class Area { } } - List uniqueFips = new ArrayList(); - List uniqueCountyname = new ArrayList(); + List uniqueAreaIDs = new ArrayList(); List areas = new ArrayList(); 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); } } From 006d437d1786330afca364d04363d0d07204ee27 Mon Sep 17 00:00:00 2001 From: Michael Gamazaychikov Date: Tue, 10 Mar 2015 13:17:29 -0400 Subject: [PATCH 2/2] ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable. Change-Id: I7b0f6b3974e8a8e4072fa530dce7443a9d85244a Former-commit-id: 12304947c6e206ad24757ea126876833d74269f6 [formerly a437417c6a07fc069e194cd08d515c6984d15616] Former-commit-id: 24d10369ab630f559c698e31e2d0232beea017d1 --- .../edex/plugin/gfe/server/lock/ClearGfeOrphanedLocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/ClearGfeOrphanedLocks.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/ClearGfeOrphanedLocks.java index 85bbe5253c..3d803403fc 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/ClearGfeOrphanedLocks.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/ClearGfeOrphanedLocks.java @@ -144,10 +144,10 @@ public class ClearGfeOrphanedLocks { lockList = (List) 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; } }