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

Omaha #4518: ISC_Send_Area is always at least a union of ISC and FireWXAOR edit areas.

Browse source 
Change-Id: I3fd34061832341fe8a528f4c9d49ac18c19f3661

Former-commit-id: 2e07ebe8efcd10fc7ad0878b9c2564a62cc37b49
This commit is contained in:
David Gillingham 2015-05-21 14:43:49 -05:00
parent 8f2c551485
commit 08ad47c82e
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.edex.plugin.gfe/build.properties
View file

@ -3,4 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
res/,\
resources/
resources/,\
utility/

16
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
View file

@ -36,6 +36,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -112,7 +113,10 @@ import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
* Oct 20, 2014 #3685 randerso Changed structure of editAreaAttrs to keep zones from different maps separated
* Feb 19, 2015 #4125 rjpeter Fix jaxb performance issue
* Apr 08, 2015 #4383 dgilling Change ISC_Send_Area to be union of
* areas ISC_XXX and FireWxAOR_XXX.
* areas ISC_XXX and all edit area prefixes
* in AdditionalISCRouting.
* May 21, 2015 #4518 dgilling Change ISC_Send_Area to always be union
* of at least ISC_XXX and FireWxAOR_XXX.
*
* </pre>
*
@ -519,8 +523,14 @@ public class MapManager {
return;
}
Collection<String> altISCEditAreas = _config
.alternateISCEditAreaMasks();
/*
* ISC_Send_Area will always be at least the union of the ISC and
* FireWxAOR edit areas. If any additional ISC databases have been
* defined, we'll union in that database's edit area too.
*/
Collection<String> altISCEditAreas = new HashSet<>();
altISCEditAreas.add("FireWxAOR_");
altISCEditAreas.addAll(_config.alternateISCEditAreaMasks());
for (String altISCEditArea : altISCEditAreas) {
ReferenceID editAreaName = new ReferenceID(altISCEditArea
+ thisSite);

6
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
View file

@ -58,12 +58,10 @@
# 03/30/2015 #17206 yteng Changed some parameters that are not rate parameters
# 03/31/2015 #17288 bhunder Added Weather Params for RTMA
# 04/03/2015 #4367 dgilling Change WindGust's time constraints back to TC1
# 04/08/2015 #4383 dgilling Define FireWX ISC configuration parameters.
#
# for Fcst/Official.
# 04/08/2015 #4383 dgilling Define FireWX ISC configuration parameters.
# 04/15/2015 #17383 yteng Change localTC to fix error that time constraints
# being off
# being off
# being off
# 04/20/2015 #4414 dgilling Add missing NWPSTrkngCG0 weather elements.
# 05/12/2015 #17144 bhunder Added RTMA model
########################################################################