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

ASM #17933 - WarnGen: add capability to suppress 'ern' in, for example, Southern Texas for state location.

Browse source 
Change-Id: I9fad8c7dcad62dbec0585e09bba21d4e8aec97f1

Former-commit-id: d1de4f89ee8a7d87375c9bdadafee3e914d0e89c
This commit is contained in:
Michael Gamazaychikov 2015-12-15 10:19:02 -05:00
parent 12981ba3d4
commit 29c59eda80
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,6 +90,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometry;
* refactored WarngenLayer::filterArea.
* Mar 9, 2014 ASM #17190 D. Friedman Use fipsField and areaField for unique area ID.
* May 7, 2015 ASM #17438 D. Friedman Clean up debug and performance logging.
* Dec 15, 2015 ASM #17933 mgamazaychikov Update calculation of partOfParentRegion.
* </pre>
*
* @author chammack
@ -267,7 +268,7 @@ public class Area {
.get(parentAreaField));
String feArea = (String) regionFeature.attributes
.get("FE_AREA");
area.partOfParentRegion = converFeAreaToPartList(feArea);
area.partOfParentRegion = Arrays.asList(feArea);
}
// Search against point matches

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

@ -91,6 +91,7 @@ import com.vividsolutions.jts.geom.Polygon;
* May 7, 2015 ASM #17438 D. Friedman Clean up debug and performance logging.
* Jun 04, 2015 RODO #4522 randerso Added proper primary key to ActiveTableRecord
* Jul 16, 2015 ASM #17741 D. Friedman Use acceptable timestamp format in query
* Dec 15, 2015 ASM #17933 mgamazaychikov Return feAreas from determineAffectedPortions.
* </pre>
*
* @author jsanchez
@ -556,9 +557,7 @@ public class WatchUtil {
}
}
Set<String> affectedPortions = new HashSet(
Area.converFeAreaToPartList(mungeFeAreas(feAreas)));
return affectedPortions;
return feAreas;
}
private List<Watch> generateMarineWatchItems(Watch template,

7
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
View file

@ -65,6 +65,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
* Dec 08, 2014 #4953 randerso Updated Jep include path to allow use of
* LocalizationSupport
* Jul 13, 2015 4500 rjpeter Fix SQL Injection concerns.
* Dec 15, 2015 RM17933 mgamazaychikov Add four new corners to PART_OF_STATE.
* </pre>
*
* @author wldougher
@ -121,6 +122,10 @@ public class AreaDictionaryMaker {
PART_OF_STATE.put("wc", "west central");
PART_OF_STATE.put("wu", "western upper");
PART_OF_STATE.put("ww", "western");
PART_OF_STATE.put("ws", "southwest");
PART_OF_STATE.put("es", "southeast");
PART_OF_STATE.put("wn", "northwest");
PART_OF_STATE.put("en", "northeast");
}
protected IPathManager pathMgr = PathManagerFactory.getPathManager();
@ -426,4 +431,4 @@ public class AreaDictionaryMaker {
statusHandler.error(e.getLocalizedMessage(), e);
}
}
}
}