Commit graph

11493 commits

Author SHA1 Message Date
Fay.Liang
1a6abf79b8 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: fed9465db6 [formerly 3b5e81259b [formerly 8d83603093c9283749c7fa83fca41a43c71095be]]
Former-commit-id: 3b5e81259b
Former-commit-id: 823f71d24a
2015-04-29 14:21:21 -04:00
Fay.Liang
3b5e81259b Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 8d83603093c9283749c7fa83fca41a43c71095be
2015-04-29 14:21:21 -04:00
Ron Anderson
6b3a0d1478 Omaha #4027 More changes for Mixed Case
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e

Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Shawn.Hooper
6d88d51a06 ASM #17430 - Update Manifest file
Change-Id: I576bbbdca03198b671efa07b320ed2a652c31f5f

Former-commit-id: 4a50b7bfbf [formerly 89091d3a6c [formerly 2a5e22aa3703a7a205ca39bcaf5075f5169ad3b0]]
Former-commit-id: 89091d3a6c
Former-commit-id: 2b121b4f0b
2015-04-29 14:04:06 -04:00
Shawn.Hooper
89091d3a6c ASM #17430 - Update Manifest file
Change-Id: I576bbbdca03198b671efa07b320ed2a652c31f5f

Former-commit-id: 2a5e22aa3703a7a205ca39bcaf5075f5169ad3b0
2015-04-29 14:04:06 -04:00
AWIPS User
69ff01c94c bump grib decoder threads to 8; split to 4
Former-commit-id: a3fdef38b9 [formerly bd23d82443] [formerly d93d861fb0b91105b2529fc0894f9dc2089cfa54 [formerly 0973c23ee0]]
Former-commit-id: 307d74c11b1f768d09e13f281f9dfa79df185532 [formerly 99558a146c]
Former-commit-id: adc121e5ba
2015-04-29 09:51:34 -06:00
AWIPS User
4ede6d34e9 LDM pqact and ingestGrib product updates
Former-commit-id: 69461c8528 [formerly fb99a25a52] [formerly a25c50b82145c7dfae273676cc34f328bb59d1a9 [formerly 2a29315894]]
Former-commit-id: f366e2761ba75a73b6ac341dcaef373d4093dcb7 [formerly 68793205ea]
Former-commit-id: 9a79e57d73
2015-04-28 21:52:28 -06:00
AWIPS User
7d416919bd forecast models: menus and names
Former-commit-id: 4b87f72098 [formerly 65f6b45d4d] [formerly bdfcbe7a62f07dbb7dad0a823ee463b3f326122d [formerly 33dd7cec73]]
Former-commit-id: 1df28483f1d2e2d5f4673d0ca790856eb6241706 [formerly 2895d9ddb6]
Former-commit-id: 22b168b5dc
2015-04-28 21:42:24 -06:00
mjames-upc
ba867739be LDM pqact and ingestGrib product updates
Former-commit-id: 0ad5759403 [formerly c779c551ca] [formerly 1de9ff057fc9c0861669617590900416db26bf37 [formerly 3c41589061]]
Former-commit-id: d130b42517394e3d33bac534c0ce6faa2364e28b [formerly 835f0e0f02]
Former-commit-id: 877f18c243
2015-04-28 16:01:39 -06:00
Fay.Liang
6852fa06c8 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 240af4fbd4 [formerly 7e0ca92095 [formerly c8f056b03ea55db06e3d104dc15e3e787dcfdf62]]
Former-commit-id: 7e0ca92095
Former-commit-id: 0da589eb8d
2015-04-28 16:46:12 -04:00
Fay.Liang
7e0ca92095 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: c8f056b03ea55db06e3d104dc15e3e787dcfdf62
2015-04-28 16:46:12 -04:00
Rici.Yu
22f132003c ASM #17435 - Fix hibernate query syntax issue
Change-Id: I2bfd5e927fe97c3348d7366320dc535b6e67f590

Former-commit-id: 7c66a2a356 [formerly 590af514a5 [formerly 4c70c322956fa4a356e06e908a43b80611ae273f]]
Former-commit-id: 590af514a5
Former-commit-id: 60e9ee0bed
2015-04-28 16:21:43 -04:00
Rici.Yu
590af514a5 ASM #17435 - Fix hibernate query syntax issue
Change-Id: I2bfd5e927fe97c3348d7366320dc535b6e67f590

Former-commit-id: 4c70c322956fa4a356e06e908a43b80611ae273f
2015-04-28 16:21:43 -04:00
AWIPS User
b72904bfde remove subgrid files; update volume browser menus
Former-commit-id: a4199ddb85 [formerly 3eae4296f9] [formerly 13924f27bf1e52084833d7622ef8af3609b298d0 [formerly 70ce2e57d7]]
Former-commit-id: f6e35d6c222d5754d20bfd7eaa858272d592f93c [formerly 725176f853]
Former-commit-id: f75e5a3169
2015-04-28 13:16:45 -06:00
Fay.Liang
77b5662f60 Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 664cdfb4408cecac0e4e5c6ce33d4f0b7df85164
2015-04-27 14:10:21 -04:00
Fay.Liang
40a8c1f7f0 Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 634a33f7265840363d11bb1068b6ceb602fba4ed
2015-04-27 14:09:40 -04:00
Fay.Liang
3d25551183 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 483383876bfe73eb58ec0eb314106288dab4d172
2015-04-27 14:08:47 -04:00
Fay.Liang
26319e7b3e Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 0c4b131c1dce6a545d83ca244848bf2ad887217c
2015-04-27 14:07:29 -04:00
Fay.Liang
53eb7d8353 Merge tag 'OB_14.3.3-7' into master_14.4.1
14.3.3-7


Former-commit-id: 8447b70f93 [formerly 6fc5cf9230 [formerly d1529f1c72bdf5a69ac611e0e93d936b6dc898f5]]
Former-commit-id: 6fc5cf9230
Former-commit-id: 8de59f59fb
2015-04-27 10:20:49 -04:00
Fay.Liang
6fc5cf9230 Merge tag 'OB_14.3.3-7' into master_14.4.1
14.3.3-7


Former-commit-id: d1529f1c72bdf5a69ac611e0e93d936b6dc898f5
2015-04-27 10:20:49 -04:00
Fay.Liang
b6b61d06f5 ASM #17424 - Fix missing data in MPE
Change-Id: Iab479a5ad9d6187363b6c097360ebc563bf9fd4b

Former-commit-id: 43049e62c7 [formerly 2f06e8830b [formerly 45bdcaf1d1f41ef064cf4a6a95eab1655d68b3e9]]
Former-commit-id: 2f06e8830b
Former-commit-id: 95dce80f43
2015-04-25 19:59:53 -04:00
Fay.Liang
2f06e8830b ASM #17424 - Fix missing data in MPE
Change-Id: Iab479a5ad9d6187363b6c097360ebc563bf9fd4b

Former-commit-id: 45bdcaf1d1f41ef064cf4a6a95eab1655d68b3e9
2015-04-25 19:59:53 -04:00
Shawn.Hooper
4a34651671 Merge branch 'master_14.4.1' into asm_14.4.1
Merge up to 14.4.1-28

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I94021611ed076207a6632895925f20cc0edd4888

Former-commit-id: bfeceac493 [formerly 1e2a6f0dcb [formerly 12eaf1024c288cfbe746d70336f13268587848ad]]
Former-commit-id: 1e2a6f0dcb
Former-commit-id: 0479064ded
2015-04-24 16:27:06 -04:00
Shawn.Hooper
1e2a6f0dcb Merge branch 'master_14.4.1' into asm_14.4.1
Merge up to 14.4.1-28

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I94021611ed076207a6632895925f20cc0edd4888

Former-commit-id: 12eaf1024c288cfbe746d70336f13268587848ad
2015-04-24 16:27:06 -04:00
Shawn.Hooper
ec10118b39 ASM #17024 - Fix bad XML merge for d2dContourStyleRules.xml and gridImageryStyleRules.xml
Change-Id: I600498d43bdc146ddb873f457f73e054c6497e5e

Former-commit-id: 098391a703022ae7d0e85f6cfab11ab3d8dcdfdf
2015-04-24 16:05:57 -04:00
Shawn.Hooper
a6f5c26175 Merge branch 'master_15.1.1' into asm_15.1.1
Former-commit-id: a11fce758ca741e4f300444f08c609875f722264
2015-04-24 15:57:40 -04:00
Shawn.Hooper
0e6e87b762 Merge branch 'master_15.1.1' into asm_15.1.1
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267

Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
2015-04-24 15:44:14 -04:00
AWIPS User
c27ebe7056 RadarMenuUtil now builds from MOSAIC_RADAR (full list) rather than DIAL_RADAR
Former-commit-id: 9649d324f7 [formerly b6b737c0df] [formerly b0de64df78c644d48e5c0533f66d028351963333 [formerly 21e4ee2d0c]]
Former-commit-id: 89adfeb39c4bb6037c9565d153948f9d57a3bd35 [formerly 6e885e0335]
Former-commit-id: 82d2f640d9
2015-04-24 07:46:18 -06:00
Fay.Liang
0a2f65f2b8 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 56788f19aa [formerly 737633b865 [formerly f6e078c4124945a1169f992c6e0051569d3c5450]]
Former-commit-id: 737633b865
Former-commit-id: 0a051ca5bd
2015-04-23 15:55:45 -04:00
Fay.Liang
737633b865 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f6e078c4124945a1169f992c6e0051569d3c5450
2015-04-23 15:55:45 -04:00
Ron Anderson
9e7bb1053a Omaha #4383 Improved logging in iscMosaic and iscDataRec
Change-Id: I2a93a46e6bb0db447ab722265f2cc14e3c957a69

Former-commit-id: 28e7b70e9b8e495e22de71881ef9aa2932e8accf
2015-04-23 13:13:40 -05:00
Jason Burks
f6db1928e4 VLab Issue #7704 - Fixed problem with LMADecoder decoding single level files. Added optional colormaps that would be useful for some users; Changed scaling on few parameters in image style rules; fixes #7704
Change-Id: If8599b7bf64c788063aa63e3bfc07c84a55654fd

Former-commit-id: eba4333d02 [formerly 7164c4729d [formerly d747cb5700e68997f6b7b579d9d8f9d9698fbd8a]]
Former-commit-id: 7164c4729d
Former-commit-id: 1df3f4e987
2015-04-23 10:53:53 -05:00
Jason Burks
7164c4729d VLab Issue #7704 - Fixed problem with LMADecoder decoding single level files. Added optional colormaps that would be useful for some users; Changed scaling on few parameters in image style rules; fixes #7704
Change-Id: If8599b7bf64c788063aa63e3bfc07c84a55654fd

Former-commit-id: d747cb5700e68997f6b7b579d9d8f9d9698fbd8a
2015-04-23 10:53:53 -05:00
Melissa Porricel
ebfafc7cbd ASM #16923 - Fix METAR decoder extra whitespace problem
Change-Id: I55ca60148f4079237876c74279ef7cb528eb6c12

Former-commit-id: c4ce7f8bd1bbf8e971b80f8291f67f5f7af09d46
2015-04-23 10:21:52 -04:00
AWIPS User
46f7e6bb8d LOCAL_RADARS will not show under main menu anymore
Former-commit-id: 26d3cfdf39 [formerly 07afa1ef0d] [formerly 13396447405d71652a5a45bdf024e2c65f3a9c5b [formerly 67632b57bd]]
Former-commit-id: 8a107784ef89e4f80b84cf9d84c51f656bc40204 [formerly 98678aa032]
Former-commit-id: 4f28f24f15
2015-04-22 17:34:42 -06:00
AWIPS User
f6df3bb55c TDWR menu separate from NEXRAD sites
Former-commit-id: a2b9a1d78c [formerly b402f25eca] [formerly 838f9a10ed9485a2332abf8360333c30a03c784b [formerly aa23b0afe0]]
Former-commit-id: 090bc56cb5b52d559971a30bff06a90b7e281107 [formerly fa78f4b8c6]
Former-commit-id: a1a9195e79
2015-04-22 17:28:24 -06:00
AWIPS User
7101784a38 D2D menus
Former-commit-id: b992f650c3 [formerly 0e116e6e5a] [formerly 1c74b47a384ca893f233d0e5aa1c22ab4d23dd24 [formerly 2a6d837672]]
Former-commit-id: cbc7b955d1b9dd187b1b63139e38924d8eb92a49 [formerly 9ba75100cb]
Former-commit-id: 3337eead54
2015-04-22 17:05:35 -06:00
mjames-upc
d33cf5cbc8 Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: a2e6b5e6ed [formerly f71c396cef] [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a [formerly 2288995260]]
Former-commit-id: 7a2ac36eca3df270f4afc658f6f3530848347ee4 [formerly cd4cb8eb1d]
Former-commit-id: 93b22eeb17
2015-04-22 15:11:19 -06:00
David Lovely
00a34f5d56 Omaha #4392 Fixed broker address substitution
Change-Id: Ib7ea0577e8d020ad2d94aa7ddbaa08459c9fa433

Former-commit-id: f2a6c66c50 [formerly 3b2a545d77 [formerly 6043b5052225fee426940fa8f32f54d8a265fba2]]
Former-commit-id: 3b2a545d77
Former-commit-id: b60b0e763e
2015-04-22 12:04:54 -05:00
David Lovely
3b2a545d77 Omaha #4392 Fixed broker address substitution
Change-Id: Ib7ea0577e8d020ad2d94aa7ddbaa08459c9fa433

Former-commit-id: 6043b5052225fee426940fa8f32f54d8a265fba2
2015-04-22 12:04:54 -05:00
Ana Rivera
f5bc1eacd9 VLab Issue #7664 - Update VTECTable.py Winter Hazard coding; fixes #7664
Change-Id: Ieafa23f3cbc9e8810a1477caa85a42223fd1c157

Former-commit-id: 6941ac08c5bafb9c0cc7cec382a4339d740adff0
2015-04-22 15:47:17 +00:00
Dave Hladky
f22f9133e7 Omaha #4260 Updated gridproduct URI string, URI's were wrong and never matched.
Change-Id: I9940d4118f783debb12db0758e7c54e96f02ac68

Former-commit-id: e53a51ad872e1476f3a4a9e517f20ddaedd625fa
2015-04-22 09:54:38 -05:00
Baoyu Yin
fcf7f21bd1 VLab Issue #7716 - DR17315 dupCounties.vm not working in WarnGen and DR17318 Independent Cities outside of VA not locked in WarnGen; fixes #7716
Change-Id: I2b7f68ba663c261cf0b4284972792af0804d2d0f

Former-commit-id: 25aa467c5732d26c40fb7dad6e7f372051b0e1ec
2015-04-22 08:36:28 -04:00
mjames-upc
203f1d9e44 Omaha #3952 remove custom gzip handling since it is by default enabled by apache httpclient
Former-commit-id: 543fe99a3e [formerly ebd35d6f3e] [formerly da26b1371c93d368c8dd86cdfc9060db22459f51 [formerly 1d9bee8e7a]]
Former-commit-id: d60e83c8705862a5757a92a685e446f091fea6e9 [formerly 2d90637196]
Former-commit-id: 4bf6994051
2015-04-21 14:14:41 -06:00
Michael Gamazaychikov
3673c79061 ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed.
Change-Id: Idca93f26c05d1d3fc73f0f4c7c3b24a736bc01c0

Former-commit-id: c815d87b1e4c30f9be0406c622c0df27f389a050
2015-04-21 15:04:16 -04:00
Ron Anderson
448456fdf6 Merge "Omaha #4027 More GFE changes for Mixed Case WA" into omaha_15.1.1
Former-commit-id: 8c02aa8eba027eedb9ec8994f520c315c57ed150
2015-04-21 08:30:03 -05:00
Ron Anderson
87286949fd Omaha #4027 More GFE changes for Mixed Case WA
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848

Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
2015-04-20 17:17:08 -05:00
Fay.Liang
d697942abf Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: efff4511cb01552b757678fb2ac64dca2da6f9c0
2015-04-20 15:38:33 -04:00
Ana Rivera
da79c8cca4 Merge branch 'master_15.1.1' into field_15.1.1
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml was removed.
"Visibility Anl Uncertainty" entry in .../fields/planview-timeseries/other.xml was added to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Change-Id: I4cac5e1ee29119569cb19c235ec5d1664eb08b8c

Former-commit-id: 4dad0cb77e2101fc8ec2d46924b6c64dcc0d12cb
2015-04-20 19:14:43 +00:00
David Gillingham
6fd4a86fe1 Omaha #4414: Fix display of nwpsTrkngCG0 D2D and smart init data for GFE.
Change-Id: I466dd123c9a438b8c0d012c66a1ed1af042964fb

Former-commit-id: 740938ee59 [formerly 59161e1b48 [formerly 467a37cb5da18eafb8c5aa1fe0a3851cf10ff0be]]
Former-commit-id: 59161e1b48
Former-commit-id: a754cf5751
2015-04-20 14:05:35 -05:00