From 4613f0e9d1255eb405d5ac3567072ee9ff792171 Mon Sep 17 00:00:00 2001 From: Michael Gamazaychikov Date: Mon, 6 Oct 2014 15:31:37 -0400 Subject: [PATCH 1/5] ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed. Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410 Former-commit-id: f0b644d92eeb897c0883b4b596f33fb8509f8a2e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463] Former-commit-id: e6d3baaa9ccc5e4f46d9dc828fd819dd5d856331 --- .../viz/warngen/gui/WarngenLayer.java | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java index a06fc1e270..1d67a4ef8b 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java @@ -369,14 +369,11 @@ public class WarngenLayer extends AbstractStormTrackResource { private Set mapsToLoad; - private Set preloadedMaps; - private final MapManager manager; public CustomMaps() { super("Loading WarnGen Maps"); manager = MapManager.getInstance(descriptor); - preloadedMaps=new HashSet(); } @Override @@ -393,15 +390,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(); } @@ -411,11 +408,6 @@ public class WarngenLayer extends AbstractStormTrackResource { } public void loadCustomMaps(Collection maps) { - for (String map : maps) { - if (manager.isMapLoaded(map)) { - preloadedMaps.add(map); - } - } synchronized (this) { mapsToLoad = new HashSet(maps); } From 4589f2e1832e345b83078ac44ccfbff35a6c3a1d Mon Sep 17 00:00:00 2001 From: "Qinglu.Lin" Date: Mon, 6 Oct 2014 16:05:26 -0400 Subject: [PATCH 2/5] ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM Change-Id: I2a64416b861d3b374538db8efad51a9509a87892 Former-commit-id: 636f054077f63c7d4ae5a905bf90a3a9f79fb6f0 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba] Former-commit-id: 47be3aa143b539f133211b6520664c85332adf6f --- .../common_static/base/warngen/VM_global_library.vm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm index 9af25053c2..601e3736b5 100755 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm @@ -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 From 00adad95465cc20eb0c0f709d13c38ab0975792f Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Mon, 6 Oct 2014 15:41:42 -0500 Subject: [PATCH 3/5] Issue #3686 fix kml export when maps are the only thing loaded Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0 Former-commit-id: 446e0bcdf619f259d9053498faa0517dd1c51b4d [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095] Former-commit-id: 9025e166ddbac290e43520e21d6bae4f7b344b22 --- .../src/com/raytheon/uf/viz/kml/export/KmlExportJob.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportJob.java b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportJob.java index 28554d7108..a705975c75 100644 --- a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportJob.java +++ b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportJob.java @@ -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 * * * @@ -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 pastFrames = new ArrayList(); for (int i = startIndex; i < lastIndex; i += 1) { descriptor.setFramesInfo(new FramesInfo(i)); From b0e68c1ed14d100bee7a9e85dbde7c47f33d39de Mon Sep 17 00:00:00 2001 From: "Kevin.Johnson" Date: Tue, 7 Oct 2014 14:55:41 -0400 Subject: [PATCH 4/5] ASM #15672 - fixed script to allow for full path of input file to be passed Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae Former-commit-id: 355274e7acbe412214897379f6d2f133b50be14c [formerly 0982ab6536679921a6afdc85166fe57e92aeac63] Former-commit-id: 5cf5cac9f780eafcac1f531b3d0a2f7608532c94 --- .../impl/check_baseline_changes.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh b/edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh index 0d7458a8ab..1b017d9689 100755 --- a/edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh +++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh @@ -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 ) From c2acd70bc5d2a0d0e88dd6e809e7f95258e868ed Mon Sep 17 00:00:00 2001 From: "Shawn.Hooper" Date: Fri, 10 Oct 2014 13:14:25 -0400 Subject: [PATCH 5/5] ASM #13467 - GFE: Need to add Beach Hazards Statement Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6 Former-commit-id: cea5061c6199e93a5f35515f0f53c9c225f85eea [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9] Former-commit-id: 0c61661989a307c405f13dca5f4ec565f406a037 --- .../templates/product/Hazard_CFW_MultiPil.py | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_CFW_MultiPil.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_CFW_MultiPil.py index d60fe1fdaf..e4b6fd6edf 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_CFW_MultiPil.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_CFW_MultiPil.py @@ -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 #