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

ASM #16703 - Errors issuing Marine Products over areas under a Watch

Browse source 
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: 78ee5a56c5 [formerly 78ee5a56c5 [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]
Former-commit-id: 6a7638ddae
Former-commit-id: 76d78ff72e
This commit is contained in:
David Friedman 2014-08-20 14:08:27 +00:00
parent 012ed15b36
commit 2ce533f866
2 changed files with 62 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
View file

@ -57,6 +57,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.viz.core.requests.ThriftClient;
import com.raytheon.viz.core.mode.CAVEMode;
import com.raytheon.viz.warngen.gui.WarngenLayer;
import com.raytheon.viz.warngen.gui.WarngenLayer.GeoFeatureType;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Polygon;
@ -70,6 +71,7 @@ import com.vividsolutions.jts.geom.Polygon;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 17, 2014 3419 jsanchez Initial creation
* Aug 20, 2014 ASM #16703 D. Friedman Ensure watches have a state attribute.
*
* </pre>
*
@ -173,7 +175,8 @@ public class WatchUtil {
}
DbQueryRequest request = buildRequest(simulatedTime,
phenSigConstraint.toString(), warngenLayer.getAllUgcs(),
phenSigConstraint.toString(),
warngenLayer.getAllUgcs(GeoFeatureType.COUNTY),
entityClass);
DbQueryResponse response = (DbQueryResponse) ThriftClient
.sendRequest(request);
@ -190,7 +193,7 @@ public class WatchUtil {
System.out.println("create watch area buffer time: "
+ (System.currentTimeMillis() - t0));
Set<String> validUgcZones = warngenLayer
.getUgcsForWatches(watchArea);
.getUgcsForWatches(watchArea, GeoFeatureType.COUNTY);
watches = processRecords(records, validUgcZones);
} catch (RuntimeException e) {
statusHandler
@ -327,6 +330,14 @@ public class WatchUtil {
*/
String ugcZone = ar.getUgcZone();
String state = getStateName(ugcZone.substring(0, 2));
/*
* Temporary fix for SS DR #16703. Remove when marine watch wording
* is fixed.
*/
if (state == null)
continue;
String action = ar.getAct();
String phenSig = ar.getPhensig();
String etn = ar.getEtn();
@ -360,7 +371,16 @@ public class WatchUtil {
@Override
public int compare(Watch watch1, Watch watch2) {
return watch1.getState().compareTo(watch2.getState());
String state1 = watch1.getState();
String state2 = watch2.getState();
if (state1 == state2)
return 0;
else if (state1 == null)
return 1; // null state is greater; put at end
else if (state2 == null)
return -1;
else
return state1.compareTo(state2);
}
});

88
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
View file

@ -212,6 +212,7 @@ import com.vividsolutions.jts.io.WKTReader;
* 07/01/2014 DR 17450 D. Friedman Use list of templates from backup site.
* 07/28/2014 DR 17475 Qinglu Lin Updated populateStrings() and findLargestQuadrant(), removed findLargestGeometry(),
* added createAreaAndCentroidMaps() and movePopulatePt(), updated paintText() to center W.
* 08/20/2014 ASM #16703 D. Friedman Make geo feature types for watches explicit
* </pre>
*
* @author mschenke
@ -1509,50 +1510,42 @@ public class WarngenLayer extends AbstractStormTrackResource {
return null;
}
public enum GeoFeatureType {
COUNTY("county", "FIPS"), MARINE("marinezones", "ID");
final private String tableName;
final private String fipsField;
private GeoFeatureType(String tableName, String fipsField) {
this.tableName = tableName;
this.fipsField = fipsField;
}
}
/**
* Returns a set of UGCs for each area in the CWA that intersects the given
* polygon.
*/
public Set<String> getUgcsForWatches(Polygon polygon)
public Set<String> getUgcsForWatches(Polygon polygon, GeoFeatureType type)
throws Exception {
GeospatialDataAccessor gda = getGeospatialDataAcessor();
boolean isMarineZone = configuration.getGeospatialConfig()
.getAreaSource().equalsIgnoreCase(MARINE);
if (!isMarineZone) {
Set<String> ugcs = new HashSet<String>();
for (String fips : gda.getAllFipsInArea(gda.buildArea(polygon))) {
ugcs.add(FipsUtil.getUgcFromFips(fips));
}
return ugcs;
} else {
Set<String> ids = new HashSet<String>();
Geometry g = gda.buildArea(polygon);
ids = getAllFipsInArea(g);
return ids;
}
Set<String> ugcs = new HashSet<String>();
GeospatialDataAccessor gda = getGeospatialDataAcessor(type);
for (String fips : gda.getAllFipsInArea(gda.buildArea(polygon)))
ugcs.add(FipsUtil.getUgcFromFips(fips));
return ugcs;
}
public Set<String> getAllUgcs() throws Exception {
GeospatialDataAccessor gda;
public Set<String> getAllUgcs(GeoFeatureType type) throws Exception {
// TODO: zig
GeospatialDataAccessor gda = getGeospatialDataAcessor(type);
Set<String> ugcs = new HashSet<String>();
gda = getGeospatialDataAcessor();
boolean isMarineZone = configuration.getGeospatialConfig()
.getAreaSource().equalsIgnoreCase(MARINE);
if (!isMarineZone) {
for (GeospatialData r : gda.geoData.features) {
ugcs.add(FipsUtil.getUgcFromFips(gda.getFips(r)));
}
} else {
for (GeospatialData r : gda.geoData.features) {
ugcs.add(getFips(r));
}
for (GeospatialData r : gda.geoData.features) {
ugcs.add(FipsUtil.getUgcFromFips(gda.getFips(r)));
}
return ugcs;
}
private GeospatialDataAccessor getGeospatialDataAcessor()
private GeospatialDataAccessor getGeospatialDataAcessor(GeoFeatureType type)
throws Exception {
GeospatialDataList gdl = searchGeospatialDataAccessor();
GeospatialDataList gdl = searchGeospatialDataAccessor(type);
if (gdl == null) {
// Cause county geospatial data to be loaded
/*
@ -1562,36 +1555,33 @@ public class WarngenLayer extends AbstractStormTrackResource {
* the filename. What happens in the future if the base file gets
* changed again? A ticket should be opened for this to be resolved.
*/
WarngenConfiguration torConfig = WarngenConfiguration.loadConfig(
"tornadoWarning", getLocalizedSite(), null);
loadGeodataForConfiguration(torConfig);
gdl = searchGeospatialDataAccessor();
String templateName;
if (type == GeoFeatureType.COUNTY)
templateName = "tornadoWarning";
else if (type == GeoFeatureType.MARINE)
templateName = "specialMarineWarning";
else
throw new IllegalArgumentException("Unsupported geo feature type " + type);
WarngenConfiguration config = WarngenConfiguration.loadConfig(
templateName, getLocalizedSite(), null);
loadGeodataForConfiguration(config);
gdl = searchGeospatialDataAccessor(type);
}
// TODO: There should be some way to get the "county" configuration by
// name
// independent of a template
// TODO: FIPS field should not be hardcoded.
AreaSourceConfiguration areaConfig = new AreaSourceConfiguration();
areaConfig.setFipsField("FIPS");
areaConfig.setFipsField(type.fipsField);
return new GeospatialDataAccessor(gdl, areaConfig);
}
private GeospatialDataList searchGeospatialDataAccessor() {
private GeospatialDataList searchGeospatialDataAccessor(GeoFeatureType type) {
synchronized (siteMap) {
for (Map.Entry<String, GeospatialDataList> entry : siteMap
.entrySet()) {
String[] keyParts = entry.getKey().split("\\.");
boolean isMarineZone = configuration.getGeospatialConfig()
.getAreaSource().equalsIgnoreCase(MARINE);
String mapdataTable = null;
if (!isMarineZone) {
mapdataTable = "county";
} else {
mapdataTable = "marinezones";
}
if (keyParts.length == 2
&& mapdataTable.equalsIgnoreCase(keyParts[0])
&& type.tableName.equalsIgnoreCase(keyParts[0])
&& getLocalizedSite().equals(keyParts[1])) {
return entry.getValue();
}