Mark Ruebens
99b1b62c99
Merge changes I7e4d3cca,Id75ad2d2 into asm_16.2.1-p1
...
* changes:
ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation
Former-commit-id: 7ecb4d6a9904cf2f0552454a9f3fdf991d3ec2bb
2016-05-13 14:28:21 -05:00
Mark Ruebens
236d191804
Merge "ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm" into asm_16.2.1-p1
...
Former-commit-id: 54b6eff2eddd813b0f08d6344bb0aef6fa6683dd
2016-05-13 13:03:11 -05:00
Shawn.Hooper
c58c624779
ASM #18987 - Updates to Extreme Wind Warning Followup Template
...
Change-Id: I2a8598e6af722a5fbed353f6c8d41c241ad6c45f
Former-commit-id: 7dd216cc9a264147189806ca3549700acb0d5c0b
2016-05-13 12:51:30 -04:00
Shawn.Hooper
3aea06ff70
ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
...
Change-Id: I7e4d3cca6fa3f87c90b5fcec1aee53b97ccfd644
Former-commit-id: b3417552085340863cf193e7555a581c17ec6332
2016-05-13 11:30:20 -04:00
Shawn.Hooper
52976849d0
ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation
...
Change-Id: Id75ad2d2e0204e5ae85249e431a2a189f56d2a6a
Former-commit-id: 1e92a24fe8d7fd3654cb2a0425efce683d7d1d9f
2016-05-13 11:27:01 -04:00
Shawn.Hooper
afd1a817f6
ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm
...
Change-Id: I8234fa9d8011e77a2d26a36fdb5fc6c6e0596ca5
Former-commit-id: d018dfc0d57751b0cf024bad237d004ff49d5367
2016-05-13 11:23:52 -04:00
Mark Ruebens
4519a4b4ef
Merge "ASM #18884 - WarnGen Templates: Impact templates fail to run when source/basis bullet is not selected" into asm_16.2.1
...
Former-commit-id: b659a20accf5fafb2fae4e50422262edafd8a8bc
2016-04-18 14:13:55 -05:00
Shawn.Hooper
c76fb2ff2d
ASM #18880 - WarnGen Templates: Fixes for a few case issues in Impact SVS
...
Change-Id: Ia6dc1c2dc1de956d895069b95909481d0916a778
Former-commit-id: ea972cbcfc1f4764ada203d456166e4ae039a90b
2016-04-18 13:53:46 -04:00
Shawn.Hooper
a0184670b2
ASM #18884 - WarnGen Templates: Impact templates fail to run when source/basis bullet is not selected
...
Change-Id: I60f8f239f3c3304d92acf88dcd7ee908dbb76890
Former-commit-id: cc91434f5e88879baddff8b781ee02df57f00800
2016-04-18 13:34:23 -04:00
Shawn.Hooper
f029d157b0
ASM #18864 - WarnGen Templates: Improve CTA parse strings to be case independent
...
Change-Id: Idf063b4573af3cee87422302df6e4652930c4303
Former-commit-id: 67a56f936708501ec6b5fdc1d28605f6b27bc145
2016-04-08 16:30:07 -04:00
Shawn.Hooper
663c44637f
Merge tag 'OB_16.1.2-20' into asm_16.2.1
...
16.1.2-20
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077
Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
2016-02-22 11:13:16 -05:00
Shawn.Hooper
28598f153b
ASM #18626 - Fix typo: parseSting to parseString
...
Change-Id: I514532b35eb8750ad6acb8b3634879442a048abe
Former-commit-id: 49f2e585dd47426e2395e4f2ab7f6c17b96420ed
2016-02-10 10:41:09 -05:00
Shawn.Hooper
ecaa153f91
ASM #18626 - WarnGen: Softball/Grapefruit hail clarifications and CTA parsing corrections
...
Change-Id: I65490b00dc2c8beb4424896532d722e76a009e63
Former-commit-id: fe5ed11c398ba08c0beb3681aa433615946604b2
2016-02-09 11:04:47 -05:00
Shawn.Hooper
bd27f40c6d
Merge tag 'OB_16.1.2-9' into master_16.2.1
...
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Shawn.Hooper
f7b4040970
ASM #18179 - WarnGen: Template Corrections for the hydro CTA, mixed case and other issues
...
Change-Id: Ibd5db3a6aa75f80f5700925596753231f484777a
Former-commit-id: fe5c90a91d03a24d5f16f47d4834807576ceac23
2016-01-04 13:59:00 -05:00
Shawn.Hooper
c7c3d81479
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: abfd5978ff55d595eaba09c4a70f763fb56986f9
2015-12-28 09:56:50 -05:00
Ana Rivera
01ac45b8cf
VLab Issue #12688 - DR18179(set_3) WarnGen: Template Corrections for the hydro CTA, mixed case and other issues; fixes #12688
...
Change-Id: Icd22291002f7ee2949c8718321e19addfc3b29eb
Former-commit-id: 3329560da2bed8516e69e8100de423ade5940257
2015-12-10 11:06:33 -05:00
Shawn.Hooper
98e669bb00
ASM #17596 - Update column layout
...
Change-Id: I924d8ac5e5baa490ac2f06d00b8f4bc06dd86660
Former-commit-id: abdd7962267c4fe06b467441170f7dae9b17c17a
2015-12-04 17:07:20 -05:00
Ana Rivera
95d0d1e81a
VLab Issue #12688 - DR18179 WarnGen:Template Corrections-VM_global_library.vm; fixes 12688
...
Set_2: revised VM_global_library.vm
Change-Id: I0311acc9ecd9a44005c1f6a6b59ab1fa0245ff75
Former-commit-id: ddf5e7aec89cadf041455d5ad7e75c6383fb3014
2015-11-04 20:28:53 +00:00
Qinglu.Lin
0edd2da34d
ASM #15688 - WarnGen: wrong portions of counties at PQR
...
Change-Id: I50c2e123a3d3748c33823fe6a875c3d0bac3c69f
Former-commit-id: 508318d30bfc6f9429e1311429d30e097669d14e
2015-11-04 13:43:40 -05:00
Ana Rivera
93b89ee2c3
VLab Issue #12688 - DR18179 WarnGen: Template Corrections for the hydro CTA, mixed case and other issues; fixes #12688
...
Change-Id: Ifc130391dc3ec8f1ddd15e49e11332ebe2e5726e
Former-commit-id: dd3cf2d8135473e4dc1daa8731411d2c4e2e4c41
2015-10-30 12:08:43 +00:00
Steve Harris
56131ac305
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
2015-10-21 09:22:00 -05:00
Shawn.Hooper
becd5935a5
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
...
Former-commit-id: 19aefb32d4243a30511b9d5de557c51adf689d2d
2015-10-13 16:21:51 -04:00
Juliya Dynina
75371216ad
Merge "ASM #17978 fixed the hydroview display for time step" into asm_16.1.1
...
Former-commit-id: 82ea99a28bb9183b347c816889679bf8a8e0c27e
2015-10-08 14:41:27 -05:00
Shawn.Hooper
9f01e98c45
ASM #17785 - Minor Template Change for Flash Flood Warning
...
Change-Id: I5e25d173c261e92a7341f8fc5704165669115e93
Former-commit-id: eb717cbd6fd6da565bd6bf99d81db7c89f19c2df
2015-10-07 12:29:53 -04:00
Steve Harris
b0cb953346
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Former-commit-id: dcdb27bc06556bccae34817d33b7a096ebb1def4
2015-10-01 12:39:24 -05:00
Ron Anderson
10bb106c51
Omaha #4547 Fixes for impact SVR TOR and SVS.
...
Change-Id: If567839abf4d8ed7e2112ef7fdca1a8d3a2961a4
Former-commit-id: 934a0e78ceee78058cfde647390ea107052f1896
2015-09-29 12:46:31 -05:00
Ron Anderson
51a2690f2a
Omaha #4547 One more template fix
...
Change-Id: Icfc06c02fd38145344954011da52476e26e2b09c
Former-commit-id: 31966b8a4b1bca7553fe0cfccbfc67e0632de87b
2015-09-29 09:51:52 -05:00
Ron Anderson
e053bbb0a5
Omaha #4547 One more set of changes based on Richard Barnhill's findings
...
Change-Id: I1ec96073a03fb3a2e7a9e01f4d6379db6844cee5
Former-commit-id: 9a5014cde9a12682209ca04500abd05c9d4d3a98
2015-09-23 18:35:11 -05:00
Steve Harris
bc84d97750
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
Former-commit-id: 3ba87373d75582c47288fe39e8f72aa404de0a94
2015-09-22 15:57:39 -05:00
Steve Harris
aea911a2c1
Merge tag 'OB_16.1.1-13' into omaha_16.1.1
...
16.1.1-13
Former-commit-id: c1757c2e5d3957cb70565c4783daee0bb19cad4c
2015-09-22 15:42:47 -05:00
Shawn.Hooper
4154b5d9bd
Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
...
Former-commit-id: bf5ffd9fe9726c04ca6f82ae85c56b894d519289
2015-09-22 14:07:52 -04:00
Ron Anderson
5f0e28c992
Omaha #4547 Template changes from Richard Barnhill
...
Change-Id: I311c5b895053e53fa3325067a223b089f36be891
Former-commit-id: 742865eed638292576a19cedf7a7bd94ae0d162c
2015-09-21 14:37:31 -05:00
Ron Anderson
204788532e
Omaha #4547 Template changes from Richard Barnhill
...
Change-Id: I5e1d840a1e2695c45f087da975d603fe0eb67767
Former-commit-id: cd674630a1e4ce62cafcdeeaaf2a9a90362f96c3
2015-09-21 12:22:47 -05:00
Ron Anderson
f34b2b5c35
Omaha #4547 Fix letter case in arealFloodWarningFollowup.vm
...
Change-Id: I600b00d7135292cf7e7391092da0ee5091b0f140
Former-commit-id: cbc4b0ad0793f9a43d732a0ff549d7a5049533b5
2015-09-16 15:12:59 -05:00
Ron Anderson
2a482bac00
Omaha #4547 Fix letter case in nonCOnvectiveFlashFloodWarningFollowup.vm
...
Change-Id: I3a79c15b430cd65f9f8618be91adf6cc0a7b5dac
Former-commit-id: 9d7fb2c428199d0484c9889af18c02947d0e706c
2015-09-16 14:38:18 -05:00
Ron Anderson
5aadd51c5e
Omaha #4547 Fixed CTA heading in arealFloodWarning.vm
...
Change-Id: I4c6745ef9750c9bfd45bf27fbf3bc5c3a0a9bf47
Former-commit-id: a045db497ccdcd9148916a7ff8017288fdbe3607
2015-09-16 09:19:08 -05:00
Qinglu.Lin
43d40f5484
ASM #17890 - WarnGen can format a duplicate second time zone time in headlines
...
Change-Id: If0d324ad55af6f5bf4d8862993ba88641fe94a9f
Former-commit-id: 4225721333c99f6e16e28f7c40c147021bda39d4
2015-09-11 16:52:23 -04:00
Ron Anderson
0d3e04935f
Omaha #4853 TO56 - Comment out "affectedZones" in geospatialConfig_COUNTY.xml
...
Change-Id: I449c946255a3cdaa43ca43e0f27021768372ebe7
Former-commit-id: dea2bfdc4cc26392fc001e83382a1de135704740
2015-09-09 14:19:53 -05:00
Shawn.Hooper
5759470634
Merge tag 'OB_15.1.1-32' into master_16.1.1
...
15.1.1-32
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
2015-08-19 14:58:31 -04:00
David Friedman
bf77ad45c5
ASM #17841 - WarnGen can format a duplicate second time zone time
...
Change-Id: Ib6462575756af85757f1c4de79f4936c10300b48
Former-commit-id: 2bcda119b2d8cfb9b831868b4ef4df4b3fcae9f6
2015-08-11 21:08:17 +00:00
Ron Anderson
ea8812f51c
Omaha #4547 More template fixes
...
Change-Id: Ifbf3341f669682157fd95d64bcccfd7c1b4243e7
Former-commit-id: 5a02fe4695575b841675dfde6ec3a7ce38c028b8
2015-08-10 11:58:14 -05:00
Ron Anderson
f24e1831f0
Omaha #4547 Fix case inconsistency impactTornadoWarning.vm for TORNADO EMERGENCY
...
Change-Id: I2a7b755fb61b2728b20884da839388a226c84152
Former-commit-id: 5759c8af522ade5a0a18535a2676451daaacd5c3
2015-07-30 13:23:53 -05:00
Ron Anderson
64741d7a70
Omaha #4547 More warngen template fixes.
...
Change-Id: I9619681888bbebc681461f190231cebf325d405f
Former-commit-id: 66b051d8a7a791c8ffc2cf48e1f15f40d47ae71a
2015-07-21 12:56:12 -05:00
Ron Anderson
df708de1e4
Omaha #4547 Fix some more issues with warngen templates
...
Change-Id: I4d7d2635def75a7262b2c70bd699ce37914cbe1f
Former-commit-id: 908dbaea4585226b8742f713dc2a7f20752cee2c
2015-07-17 10:09:57 -05:00
Ron Anderson
aff1b9b21e
Omaha #4547 Fix more issues with extremWindWarningFollowup.vm
...
Change-Id: Ic3b1311c445507170ebd8a175767d2816731254c
Former-commit-id: 6a31d2379a8b5be9fb2bf51ac43e251a4541d523
2015-07-13 17:44:22 -05:00
Ron Anderson
190049ee38
Omaha #4547 Fix more issues in extremeWindWarningFollowup.vm
...
Change-Id: I8b8ce5da4950c581f556b4f6a2744ec87aff8d52
Former-commit-id: 3058151ebcaeef7bd794d110ac28efd7144945ad
2015-07-13 09:33:30 -05:00
Ron Anderson
af0143f330
Omaha #4441 Fix QC issue with snowmelt in immediate cause
...
Change-Id: Iffbccdd1b8230ef118ea734395f8524b68f7aee5
Former-commit-id: 1c9dc2485b2aa52bbe73c7556f5714ff11ce82ef
2015-07-09 13:53:29 -05:00
Ron Anderson
284afa7ec7
Omaha #4547 Fix extremeWindWarning templates
...
Change-Id: I6ed8480751386ceafeabeaf0a675642f7d4046c6
Former-commit-id: f8105007f4c5c632458e6d6395cef93be737df44
2015-07-09 13:46:31 -05:00
Ron Anderson
8083c4994c
Omaha #4547 Fix capitalization of area names in Areal Flood Warning Followups
...
Change-Id: Ica9357d4eb62e3fb9f46831df43f6e9f91bb8434
Former-commit-id: e0c224bbcb537ca6e23527bb8f63a9fee57cd3f1
2015-07-07 12:39:52 -05:00
