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

Merge tag 'OB_14.3.1-26m' into omaha_14.4.1

Browse source 
Former-commit-id: 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly f2fdf98d2f [formerly aff75d954b [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]]
Former-commit-id: f2fdf98d2f
Former-commit-id: 2858cc538b [formerly f3017b859e] [formerly 2b876a6e0e17ef46bda5eb65707f10272b529e42 [formerly da238d6478]]
Former-commit-id: 97fce6689e379c3cd2d664d9ad9821a9d4ec910b [formerly 3f6bdf84c5]
Former-commit-id: 3954f6981f
This commit is contained in:
Steve Harris 2014-10-15 08:42:02 -05:00
commit 728899ed0c
5 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportJob.java
View file

@ -102,7 +102,7 @@ import de.micromata.opengis.kml.v_2_2_0.Vec2;
* ------------- -------- ----------- --------------------------
* Jun0 6, 2012 bsteffen Initial creation
* Jan 23, 2014 2703 bsteffen Use framesInfo for frame count.
*
* Oct 06, 2014 3686 njensen Ensure lastIndex is at least 1
*
* </pre>
*
@ -305,6 +305,8 @@ public class KmlExportJob extends Job {
int lastIndex = options.getLastFrameIndex();
lastIndex = Math.min(lastIndex, descriptor.getFramesInfo()
.getFrameCount());
// in case there's zero frames (i.e. all time agnostic)
lastIndex = Math.max(lastIndex, 1);
rscmonitor.beginTask("Saving " + rsc.getName(), lastIndex
- startIndex);
DataTime[] times = descriptor.getFramesInfo().getTimeMap()
@ -321,6 +323,7 @@ public class KmlExportJob extends Job {
}
}
}
List<DataTime> pastFrames = new ArrayList<DataTime>();
for (int i = startIndex; i < lastIndex; i += 1) {
descriptor.setFramesInfo(new FramesInfo(i));

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

@ -379,14 +379,11 @@ public class WarngenLayer extends AbstractStormTrackResource {
private Set<String> mapsToLoad;
private Set<String> preloadedMaps;
private final MapManager manager;
public CustomMaps() {
super("Loading WarnGen Maps");
manager = MapManager.getInstance(descriptor);
preloadedMaps=new HashSet<String>();
}
@Override
@ -403,15 +400,15 @@ public class WarngenLayer extends AbstractStormTrackResource {
if (toLoad != null) {
for (String loaded : customMaps) {
if (!preloadedMaps.contains(loaded)) {
manager.unloadMap(loaded);
manager.unloadMap(loaded);
}
customMaps.clear();
for (String load : toLoad) {
if (!manager.isMapLoaded(load)) {
manager.loadMapByName(load);
customMaps.add(load);
}
}
for (String load : toLoad) {
manager.loadMapByName(load);
}
customMaps = toLoad;
issueRefresh();
}
@ -421,11 +418,6 @@ public class WarngenLayer extends AbstractStormTrackResource {
}
public void loadCustomMaps(Collection<String> maps) {
for (String map : maps) {
if (manager.isMapLoaded(map)) {
preloadedMaps.add(map);
}
}
synchronized (this) {
mapsToLoad = new HashSet<String>(maps);
}

26
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_CFW_MultiPil.py
View file

@ -1,19 +1,19 @@
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
@ -104,10 +104,11 @@ class TextProduct(GenericHazards.TextProduct):
('RP.S', allActions, 'RipCurrent'), # HIGH RIP CURRENT RISK
]
def _bulletDict(self):
def _bulletDict(self):
return {
"CF" : ("COASTAL FLOODING,TIMING,IMPACTS"), ### coastal flood warning, advisory, watch
"LS" : ("LAKE SHORE FLOODING,TIMING,IMPACTS"), ### lake shore flood warning, advisory, watch
"BH" : ("HAZARDS,TIMING,LOCATION,POTENTIAL IMPACTS"), ### hazardous beach conditions
"SU" : ("WAVES AND SURF,TIMING,IMPACTS"), ### high surf warning, advisory
"RP" : ("TIMING,IMPACTS"), ### high rip current risk
}
@ -117,11 +118,14 @@ class TextProduct(GenericHazards.TextProduct):
"COASTAL FLOODING",
"LAKE SHORE FLOODING",
"WAVES AND SURF",
"HAZARDS",
"TIMING",
"LOCATION",
"POTENTIAL IMPACTS",
"IMPACTS",
]
#
# Overridden to allow for attribution statement
#

9
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
View file

@ -14,6 +14,7 @@
##### Qinglu Lin 05-21-2014 DR 16309. Updated inserttorwatches and insertsvrwatches by changing 'FOR##' to 'FOR ##'.
##### D. Friedman 08-28-2014 ASM #15658. Add marine watch wording.
##### Qinglu Lin 09-15-2014 ASM #15551. Overhauled inserttorwatches and insertsvrwatches, added until.
##### Qinglu Lin 10-06-2014 ASN #556. Updated secondBullet.
####################################################################################################
#*
Mile Marker Test Code
@ -1184,15 +1185,15 @@ ${partOfArea}${area.name}...
######### MACRO TO GENERATE SECOND BULLET (UNTIL XXXX AMPM TZ (DAY) IN WARNINGS ##########
#macro(secondBullet $dateUtil $expire $timeFormat $localtimezone $secondtimezone $duration)
#if(${duration} >= 360)
UNTIL ${dateUtil.format(${expire}, ${timeFormat.plain}, 15, ${localtimezone})}##
UNTIL ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${localtimezone})}##
#else
UNTIL ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}##
UNTIL ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}##
#end
#if(${secondtimezone})
#if(${duration} >= 360)
/${dateUtil.format(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
/${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
#else
/${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})}/##
/${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})}/##
#end
#end
#end

7
edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
View file

@ -115,8 +115,11 @@ function setupEnv() {
logIt INFO main "User passed an argument which we're using for the input file name : $1"
fi
inputFile=${fullScriptPath}/${inputFileName}
if echo ${inputFileName} | grep '/' > /dev/null ; then
inputFile=${inputFileName}
else
inputFile=${fullScriptPath}/${inputFileName}
fi
runTimeStamp=$( date +%Y%m%d_%H%M%S )