diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/CrashCymbal.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/CrashCymbal.wav new file mode 100644 index 0000000000..c9d6fafc15 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/CrashCymbal.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Explosion.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Explosion.wav new file mode 100644 index 0000000000..fca947fc66 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Explosion.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/HitMe.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/HitMe.wav new file mode 100644 index 0000000000..65d0327d56 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/HitMe.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/MetalAlarm.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/MetalAlarm.wav new file mode 100644 index 0000000000..3cb51f2349 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/MetalAlarm.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Passing_Train.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Passing_Train.wav new file mode 100644 index 0000000000..47568b55e7 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Passing_Train.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Whoosh.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Whoosh.wav new file mode 100644 index 0000000000..dab035bdec Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/Whoosh.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bark.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bark.wav new file mode 100644 index 0000000000..8dc5dee5a2 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bark.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/beep.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/beep.wav new file mode 100644 index 0000000000..4db24a45a5 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/beep.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/beethovens5.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/beethovens5.wav new file mode 100644 index 0000000000..49b36c6342 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/beethovens5.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bells.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bells.wav new file mode 100644 index 0000000000..9405f6ee3e Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bells.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/breaking_glass.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/breaking_glass.wav new file mode 100644 index 0000000000..f4b667ae21 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/breaking_glass.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bugle.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bugle.wav new file mode 100644 index 0000000000..8563093d7b Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/bugle.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/crash.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/crash.wav new file mode 100644 index 0000000000..79665bfd89 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/crash.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/cuckoo.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/cuckoo.wav new file mode 100644 index 0000000000..866f83d227 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/cuckoo.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/doorbell.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/doorbell.wav new file mode 100644 index 0000000000..9ad08ed9e8 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/doorbell.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/drums.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/drums.wav new file mode 100644 index 0000000000..5043d1b04d Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/drums.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/gong.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/gong.wav new file mode 100644 index 0000000000..f680a1d8db Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/gong.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/laserShots.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/laserShots.wav new file mode 100644 index 0000000000..71fcde934a Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/laserShots.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/lotsOfChaos.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/lotsOfChaos.wav new file mode 100644 index 0000000000..cdf2848e34 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/lotsOfChaos.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/rooster.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/rooster.wav new file mode 100644 index 0000000000..5b403297be Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/rooster.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/train.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/train.wav new file mode 100644 index 0000000000..cf507bd2d5 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/train.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/trumpets.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/trumpets.wav new file mode 100644 index 0000000000..92cd2742a3 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/trumpets.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/wheee.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/wheee.wav new file mode 100644 index 0000000000..ad19288a6a Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/wheee.wav differ diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/whistle.wav b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/whistle.wav new file mode 100644 index 0000000000..c7e2208c02 Binary files /dev/null and b/cave/com.raytheon.uf.viz.alertviz.ui/localization/alertVizAudio/whistle.wav differ diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml new file mode 100644 index 0000000000..6b8bb7e599 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml new file mode 100644 index 0000000000..05e6b58239 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml new file mode 100644 index 0000000000..8d874e8a39 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml @@ -0,0 +1,378 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml new file mode 100644 index 0000000000..42588166b7 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml new file mode 100644 index 0000000000..d198ddf2cf --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml new file mode 100644 index 0000000000..6276d382a3 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml new file mode 100644 index 0000000000..14ec27d479 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml new file mode 100644 index 0000000000..5a89824c7d --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml new file mode 100644 index 0000000000..5fd00185f4 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml index e219202574..ee4c188974 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml @@ -1,283 +1,382 @@ + - - - - + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml index 77d9e8baed..1fa770726a 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml @@ -1,147 +1,215 @@ - + - - - - + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalMarineWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalMarineWarnings.xml new file mode 100644 index 0000000000..58458c1f18 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/LocalMarineWarnings.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml index 2eb75bd840..6d2153b89f 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml @@ -1,146 +1,216 @@ + - - - - + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalMarineWarning.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalMarineWarning.xml new file mode 100644 index 0000000000..d389d70aa1 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalMarineWarning.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalSPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalSPS.xml new file mode 100644 index 0000000000..405d260b77 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalSPS.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml index d550e8e093..9dd1e3a77d 100644 --- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml +++ b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml @@ -1,147 +1,175 @@ - + - - - - + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsNational.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsNational.xml new file mode 100644 index 0000000000..58d2816f06 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsNational.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/NationalConvWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/NationalConvWarnings.xml new file mode 100644 index 0000000000..acc65e14e2 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/NationalConvWarnings.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/NationalFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/NationalFloodWarnings.xml new file mode 100644 index 0000000000..435183d081 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/NationalFloodWarnings.xml @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-AR.xml new file mode 100644 index 0000000000..aba15a6713 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-AR.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-CR.xml new file mode 100644 index 0000000000..56d05ee5fe --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-CR.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-ER.xml new file mode 100644 index 0000000000..c60c5baa2f --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-ER.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-PR.xml new file mode 100644 index 0000000000..d6248d421d --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-PR.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-SR.xml new file mode 100644 index 0000000000..afbe6db6ed --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-SR.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-WR.xml new file mode 100644 index 0000000000..ad23d2b695 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-WR.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-AR.xml new file mode 100644 index 0000000000..5c05e124e4 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-AR.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-CR.xml new file mode 100644 index 0000000000..1d1017b1ae --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-CR.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-ER.xml new file mode 100644 index 0000000000..9f57a2b113 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-ER.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-PR.xml new file mode 100644 index 0000000000..6a6ba6c157 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-PR.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-SR.xml new file mode 100644 index 0000000000..0d9bce3a89 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-SR.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-WR.xml new file mode 100644 index 0000000000..8bebb84234 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-WR.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-AR.xml new file mode 100644 index 0000000000..34fc8afc3a --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-AR.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-CR.xml new file mode 100644 index 0000000000..7f605112ab --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-CR.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-ER.xml new file mode 100644 index 0000000000..8ad23c52df --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-ER.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-PR.xml new file mode 100644 index 0000000000..13579254f2 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-PR.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-SR.xml new file mode 100644 index 0000000000..4878a8f5dd --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-SR.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-WR.xml new file mode 100644 index 0000000000..3f4f2941b2 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-WR.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-AR.xml new file mode 100644 index 0000000000..2542b37a34 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-AR.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-CR.xml new file mode 100644 index 0000000000..c6e677c337 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-CR.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-ER.xml new file mode 100644 index 0000000000..7f6e59304c --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-ER.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-PR.xml new file mode 100644 index 0000000000..7f3952c45d --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-PR.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-SR.xml new file mode 100644 index 0000000000..fa67a9820f --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-SR.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-WR.xml new file mode 100644 index 0000000000..bcdd259ee5 --- /dev/null +++ b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-WR.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml index 04e9d2b022..e9565d7e12 100644 --- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml +++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml @@ -19,49 +19,221 @@ further_licensing_information. --> - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml b/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml index 1ce9f3ac2e..66307ec6e0 100644 --- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml +++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml @@ -19,11 +19,22 @@ further_licensing_information. --> - - - - + + + + + + + + + + - \ No newline at end of file + diff --git a/crh/gov.noaa.nws.crh.edex.grib.decoderpostprocessor/src/gov/noaa/nws/crh/edex/grib/decoderpostprocessor/GFS20PostProcessor.java b/crh/gov.noaa.nws.crh.edex.grib.decoderpostprocessor/src/gov/noaa/nws/crh/edex/grib/decoderpostprocessor/GFS20PostProcessor.java index 6c46264d45..03dce690f3 100644 --- a/crh/gov.noaa.nws.crh.edex.grib.decoderpostprocessor/src/gov/noaa/nws/crh/edex/grib/decoderpostprocessor/GFS20PostProcessor.java +++ b/crh/gov.noaa.nws.crh.edex.grib.decoderpostprocessor/src/gov/noaa/nws/crh/edex/grib/decoderpostprocessor/GFS20PostProcessor.java @@ -6,29 +6,28 @@ import java.util.List; import com.raytheon.edex.plugin.grib.decoderpostprocessors.ThreeHrPrecipGridProcessor; import com.raytheon.edex.plugin.grib.exception.GribException; -import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.grid.GridConstants; import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.edex.database.DataAccessLayerException; -import com.raytheon.uf.edex.database.query.DatabaseQuery; +import com.raytheon.uf.common.parameter.Parameter; import com.raytheon.uf.edex.plugin.grid.dao.GridDao; /** * Grib post processor implementation to generate 3-hr precipitation grids from * the alternating (3-hr, 6-hr, 3-hr, 3-hr, 6-hr, etc.) precip grids in the * GFS20 output. - * + * * 
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer    Description
  * ------------- -------- ----------- --------------------------
  * Jun 08, 2015           M. Foster   Initial Creation
- *
- *
+ * Nov 10, 2015  DR18246  M. Foster   Added ability to process CP grids
+ * 
+ * 
  *
- * + * * @author matthew.foster * @version 1.0 */ @@ -38,28 +37,29 @@ public class GFS20PostProcessor extends ThreeHrPrecipGridProcessor { @Override public GridRecord[] process(GridRecord record) throws GribException { // Post process the data if this is a Total Precipitation grid - if (record.getParameter().getAbbreviation().equals("TP6hr")) { + if (record.getParameter().getAbbreviation().equals("TP6hr") + || record.getParameter().getAbbreviation().equals("CP6hr")) { return super.process(record); } return new GridRecord[] { record }; } /** - * Retrieves a List of GridRecord via DAO query for the given datasetId, parm - * and refTime. - * + * Retrieves a List of GridRecord via DAO query for the given datasetId, + * parm and refTime. + * * @param datasetId - * The datasetId from which to retrieve the GridRecords + * The datasetId from which to retrieve the GridRecords * @param parm - * The parameter for which to retrieve GridRecords + * The parameter for which to retrieve GridRecords * @param refTime - * The reference (cycle) time for the aforementioned datasetId + * The reference (cycle) time for the aforementioned datasetId * @return * @throws GribException */ @SuppressWarnings("unchecked") - protected List getPrecipInventory(String datasetId, String parm, - Date refTime) throws GribException { + protected List getPrecipInventory(String datasetId, + String parm, Date refTime) throws GribException { GridDao dao = null; try { dao = new GridDao(); @@ -74,17 +74,17 @@ public class GFS20PostProcessor extends ThreeHrPrecipGridProcessor { try { return (List) dao.queryByCriteria(query); } catch (DataAccessLayerException e) { - throw new GribException( - "Error getting Precip inventory for "+datasetId, e); + throw new GribException("Error getting Precip inventory for " + + datasetId, e); } } /** * Generates the 3 hour accumulated grid by taking the difference of the - * current 6-hr accumulation and the previous 3-hr accumulation. - * This function will look in the inventory and generate any 3-hr grids - * that can be generated. - * + * current 6-hr accumulation and the previous 3-hr accumulation. This + * function will look in the inventory and generate any 3-hr grids that can + * be generated. + * * @param record * The grib record for which to generate the 3 hour accumulated * precipitation grid @@ -94,19 +94,32 @@ public class GFS20PostProcessor extends ThreeHrPrecipGridProcessor { protected synchronized GridRecord[] generate3hrPrecipGrids(GridRecord record) throws GribException { + String abbrev6; + String abbrev3; + + if (record.getParameter().getAbbreviation().equals("TP6hr")) { + abbrev6 = "TP6hr"; + abbrev3 = "TP3hr"; + } else { + abbrev6 = "CP6hr"; + abbrev3 = "CP3hr"; + } + // The current 6-hr precipitation grid inventory in the database - List precip6hrInventory = getPrecipInventory(record.getDatasetId(), - "TP6hr", record.getDataTime().getRefTime()); + List precip6hrInventory = getPrecipInventory( + record.getDatasetId(), abbrev6, record.getDataTime() + .getRefTime()); // The current 3-hr precipitation grid inventory in the database - List precip3hrInventory = getPrecipInventory(record.getDatasetId(), - "TP3hr", record.getDataTime().getRefTime()); - + List precip3hrInventory = getPrecipInventory( + record.getDatasetId(), abbrev3, record.getDataTime() + .getRefTime()); + // Make a list of the 3-hr forecast times List precip3hrTimes = new ArrayList(); - for (int i=0; i < precip3hrInventory.size(); i++) { - precip3hrTimes.add(precip3hrInventory.get(i) - .getDataTime().getFcstTime()); + for (int i = 0; i < precip3hrInventory.size(); i++) { + precip3hrTimes.add(precip3hrInventory.get(i).getDataTime() + .getFcstTime()); } // Adds the current record to the precip inventory @@ -138,6 +151,75 @@ public class GFS20PostProcessor extends ThreeHrPrecipGridProcessor { return generatedRecords.toArray(new GridRecord[] {}); } + /** + * {@inheritDoc} + */ + @Override + protected GridRecord calculate3hrPrecip(GridRecord inventoryRecord, + GridRecord currentRecord) throws GribException { + + // Clone the current record and set the ID to 0 so Hibernate will + // recognize it as a new record + GridRecord tp3hrRecord = new GridRecord(currentRecord); + tp3hrRecord.setId(0); + if (currentRecord.getMessageData() == null) { + GridDao dao = null; + try { + dao = new GridDao(); + currentRecord.setMessageData(((FloatDataRecord) dao + .getHDF5Data(currentRecord, -1)[0]).getFloatData()); + } catch (PluginException e) { + throw new GribException("Error populating grib data!", e); + } + } + + // Copy the data to the new record so the data from the original record + // does not get modified + float[] currentData = (float[]) currentRecord.getMessageData(); + currentRecord.setMessageData(currentData); + float[] newData = new float[currentData.length]; + System.arraycopy(currentData, 0, newData, 0, currentData.length); + tp3hrRecord.setMessageData(newData); + + // First determine if this is Total Precip (TP) or Convective Precip + // (CP) + // Assign the new parameter abbreviation and cache it if necessary + + String abbrev; + String name; + if (currentRecord.getParameter().getAbbreviation().equals("TP6hr")) { + abbrev = "TP3hr"; + name = "Precip Accum 3 hr"; + } else { + abbrev = "CP3hr"; + name = "Convective Precip Accum 3hr"; + } + Parameter param = new Parameter(abbrev, name, currentRecord + .getParameter().getUnit()); + tp3hrRecord.setParameter(param); + tp3hrRecord.getInfo().setId(null); + // Change the data time to include the 3-hr time range + modifyDataTime(tp3hrRecord); + + // Calculate the new data values + if (inventoryRecord != null) { + if (inventoryRecord.getMessageData() == null) { + GridDao dao = null; + try { + dao = new GridDao(); + inventoryRecord + .setMessageData(((FloatDataRecord) dao.getHDF5Data( + inventoryRecord, 0)[0]).getFloatData()); + } catch (PluginException e) { + throw new GribException("Error populating grib data!", e); + } + } + calculatePrecipValues((float[]) inventoryRecord.getMessageData(), + (float[]) tp3hrRecord.getMessageData()); + } + return tp3hrRecord; + } + /** * {@inheritDoc} */ diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml index 0041c33bf6..f0521a7436 100644 --- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml +++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml @@ -132,4 +132,8 @@ id="gov.noaa.nws.sr.oun.edex.mping.feature" version="0.0.0"/> + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period1.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period1.xml index fca06d7d4a..be6b86a3a5 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period1.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period1.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period10.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period10.xml index 3b65787e02..74420aab5f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period10.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period10.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period2.xml index d27d4ed6d8..f8d0eb6816 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period2.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period2.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period3.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period3.xml index d7091d75fd..a1c9e4e199 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period3.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period3.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period4.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period4.xml index 2be0d8123a..1069996978 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period4.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period4.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period5.xml index 9288bca990..3dbc9c61fd 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period5.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period5.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period6.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period6.xml index 3e657e35d4..4b65b4daa7 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period6.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period6.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period7.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period7.xml index fa9e05e35a..555f12df10 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period7.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period7.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period8.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period8.xml index 3a70e77517..6e869c90f6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period8.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period8.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period9.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period9.xml index ed930e45fd..2f65cd320a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period9.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period9.xml @@ -19,7 +19,7 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave1.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave1.xml index d6466e8aa4..21676f7974 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave1.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave1.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave10.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave10.xml index e00d063a51..f336b34611 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave10.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave10.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave2.xml index 9f0562c3f8..85cf30c94a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave2.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave2.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave3.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave3.xml index 65f0d2edb5..319436a7a9 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave3.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave3.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave4.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave4.xml index 3d02321de0..888428eb75 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave4.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave4.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave5.xml index 578e5e5b74..01bd053e40 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave5.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave5.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave6.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave6.xml index 3054ee4cf2..43d2d93599 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave6.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave6.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave7.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave7.xml index a0e01be71d..5dc146b5c7 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave7.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave7.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave8.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave8.xml index d0ded47b97..80a56e2ae5 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave8.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave8.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave9.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave9.xml index e952f4dc47..8a0fa40e52 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave9.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave9.xml @@ -19,8 +19,8 @@ further_licensing_information. --> - - + + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/.project b/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/.project new file mode 100644 index 0000000000..1e66744437 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/.project @@ -0,0 +1,17 @@ + + + gov.nasa.msfc.sport.edex.glmdecoder.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/build.properties b/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/build.properties new file mode 100644 index 0000000000..64f93a9f0b --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/feature.xml b/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/feature.xml new file mode 100644 index 0000000000..726183d25d --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.glmdecoder.feature/feature.xml @@ -0,0 +1,27 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/.classpath b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/.classpath new file mode 100644 index 0000000000..098194ca4b --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/.project b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/.project new file mode 100644 index 0000000000..db1888aba7 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/.project @@ -0,0 +1,28 @@ + + + gov.nasa.msfc.sport.edex.plugin.glmdecoder + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/META-INF/MANIFEST.MF b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..d878730936 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Glmdecoder +Bundle-SymbolicName: gov.nasa.msfc.sport.edex.plugin.glmdecoder +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: NASA SPoRT +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: ucar.nc2;bundle-version="4.2.0", + com.raytheon.uf.common.dataplugin;bundle-version="1.14.0", + com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.14.0", + com.raytheon.uf.common.status;bundle-version="1.14.1", + com.raytheon.uf.common.wmo;bundle-version="1.14.0" diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/build.properties b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/build.properties new file mode 100644 index 0000000000..73974cda80 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + res/,\ + utility/ diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/res/spring/glm-ingest.xml b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/res/spring/glm-ingest.xml new file mode 100644 index 0000000000..608d898f47 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/res/spring/glm-ingest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + glm + + + + + + + + + java.lang.Throwable + + + + + + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/src/gov/nasa/msfc/sport/edex/glmdecoder/decoder/GLMDecoder.java b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/src/gov/nasa/msfc/sport/edex/glmdecoder/decoder/GLMDecoder.java new file mode 100644 index 0000000000..bf0a498394 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/src/gov/nasa/msfc/sport/edex/glmdecoder/decoder/GLMDecoder.java @@ -0,0 +1,241 @@ +package gov.nasa.msfc.sport.edex.glmdecoder.decoder; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; +import java.util.TimeZone; + +import ucar.ma2.Array; +import ucar.nc2.NetcdfFile; +import ucar.nc2.Variable; + +import com.raytheon.uf.common.dataplugin.PluginDataObject; +import com.raytheon.uf.common.dataplugin.binlightning.BinLightningRecord; +import com.raytheon.uf.common.dataplugin.binlightning.impl.LightningStrikePoint; +import com.raytheon.uf.common.dataplugin.binlightning.impl.LtgMsgType; +import com.raytheon.uf.common.dataplugin.binlightning.impl.LtgStrikeType; +import com.raytheon.uf.common.status.IUFStatusHandler; +import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.common.wmo.WMOHeader; + +/** + * The Class GLMDecoder decodes the GLM Netcdf format files. The decoder + * extracts flash, groups, and events and encodes them into BinLightningRecords. + */ +public class GLMDecoder { + + /** The Constant handler for logging. */ + private static final IUFStatusHandler handler = UFStatus + .getHandler(GLMDecoder.class); + + /** The Constant Greenwich Mean Time zone. */ + private static final TimeZone gmt = TimeZone.getTimeZone("GMT"); + + /** + * The Enum Type to indentify various types of decoded types of detections. + */ + private static enum Type { + + /** The flash lightning element. */ + FLASH("flash", "flash_time_offset_of_first_event"), + /** The event lightning element. */ + EVENT("event", "event_time_offset"), + /** The group lightning element. */ + GROUP("group", "group_time_offset"); + + /** The name. */ + public final String name; + + /** The offset name. */ + public final String offsetName; + + /** + * Instantiates a new type. + * + * @param name + * the name of the lightning type + * @param offsetName + * the offset name of the variable in the netcdf file that + * describes the offset of time for the particular record. + */ + Type(String name, String offsetName) { + this.name = name; + this.offsetName = offsetName; + } + } + + /** + * Decode the netcdf data from ingest and return the lightning flashes, + * groups and events from the input netcdf GLM file. + * + * @param data + * the data input array of the netcdf input file. + * @return the plugin data object[] that contains all of the flashes, + * groups, and events in the file. They are of type + * BinLightningRecord. + */ + public PluginDataObject[] decode(byte[] data) { + WMOHeader wmoHdr = new WMOHeader(data); + if (wmoHdr.isValid()) { + data = removeWMOHeader(data, wmoHdr); + } + NetcdfFile netCdfFile = null; + List records = new ArrayList(); + try { + netCdfFile = NetcdfFile.openInMemory(null, data); + + Date productTime = decodeProductTime(netCdfFile); + List flashes = decode(Type.FLASH, netCdfFile, + productTime); + List groups = decode(Type.GROUP, netCdfFile, + productTime); + List events = decode(Type.EVENT, netCdfFile, + productTime); + + if (events != null) { + BinLightningRecord eventsRecord = new BinLightningRecord(events); + eventsRecord.setSource("GLMev"); + records.add(eventsRecord); + } + + if (flashes != null) { + BinLightningRecord flashrecord = new BinLightningRecord(flashes); + flashrecord.setSource("GLMfl"); + records.add(flashrecord); + } + if (groups != null) { + BinLightningRecord groupsRecord = new BinLightningRecord(groups); + groupsRecord.setSource("GLMgr"); + records.add(groupsRecord); + } + + } catch (IOException e) { + handler.error(e.getMessage()); + } finally { + if (netCdfFile != null) { + try { + netCdfFile.close(); + } catch (IOException e) { + + } + } + } + int size = records.size(); + PluginDataObject[] objs = new PluginDataObject[size]; + return records.toArray(objs); + } + + /** + * Removes the wmo header. + * + * @param data + * the data input array. + * @param wmoHdr + * the wmo hdr + * @return the byte[] of the data without the WMOHeader + */ + private byte[] removeWMOHeader(byte[] data, WMOHeader wmoHdr) { + return Arrays.copyOfRange(data, wmoHdr.getMessageDataStart(), + data.length); + } + + /** + * Decode product time which is the basis for all other time measurements in + * the file. The times are based on January 1, 2000 at 12Z. + * + * @param netCdfFile + * the net cdf file input + * @return the date for the basis of the file + * @throws IOException + * Signals that an I/O exception has occurred. + */ + private Date decodeProductTime(NetcdfFile netCdfFile) throws IOException { + Variable product_time_var = netCdfFile.findVariable("product_time"); + + GregorianCalendar cal = new GregorianCalendar(gmt); + // Dates are based on seconds since January 1, 2000 at 12Z + cal.set(2000, 0, 1, 12, 0, 0); + int secondstimesince2000 = (int) product_time_var.readScalarFloat(); + cal.add(Calendar.SECOND, secondstimesince2000); + Date date = cal.getTime(); + return date; + + } + + /** + * Decode actual elements in the file. The method decodes flashes, events, + * and groups from the netcdf file. + * + * @param type + * the type to decode, can be group, flash or event. + * @param netCdfFile + * the net cdf file to read the data. + * @param producttime + * the producttime is the basis time for the file. + * @return the list of plugin objects that represent the lightning element + * type decoded. + */ + private List decode(Type type, NetcdfFile netCdfFile, + Date producttime) { + List points = new ArrayList(); + + Variable lon = netCdfFile.findVariable(type.name + "_lon"); + Variable lat = netCdfFile.findVariable(type.name + "_lat"); + double event_lon_scale_factor = 1; + double event_lon_add_offset = 0; + double event_lat_scale_factor = 1; + double event_lat_add_offset = 0; + if (type == Type.EVENT) { + event_lon_scale_factor = lon.findAttribute("scale_factor") + .getNumericValue().doubleValue(); + event_lon_add_offset = lon.findAttribute("add_offset") + .getNumericValue().doubleValue(); + event_lat_scale_factor = lat.findAttribute("scale_factor") + .getNumericValue().doubleValue(); + event_lat_add_offset = lat.findAttribute("add_offset") + .getNumericValue().doubleValue(); + } + + Variable offset = netCdfFile.findVariable(type.offsetName); + try { + Array lon_array = lon.read(); + Array lat_array = lat.read(); + Array offset_array = offset.read(); + + while (lon_array.hasNext() && lat_array.hasNext() + && offset_array.hasNext()) { + float lonValue; + float latValue; + + if (type == Type.EVENT) { + int lon_short = ucar.ma2.DataType + .unsignedShortToInt(lon_array.nextShort()); + lonValue = (float) (lon_short * event_lon_scale_factor + event_lon_add_offset); + latValue = (float) (ucar.ma2.DataType + .unsignedShortToInt(lat_array.nextShort()) + * event_lat_scale_factor + event_lat_add_offset); + } else { + lonValue = lon_array.nextFloat(); + latValue = lat_array.nextFloat(); + } + + short offsetValue = offset_array.nextShort(); + GregorianCalendar cal = new GregorianCalendar(gmt); + cal.setTimeInMillis(producttime.getTime() + offsetValue); + LightningStrikePoint point = new LightningStrikePoint(latValue, + lonValue, cal, LtgMsgType.TOTAL_LIGHTNING); + point.setType(LtgStrikeType.TOTAL_FLASH); + points.add(point); + } + + } catch (IOException e) { + handler.error(e.getMessage()); + } + return points; + } + +} diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/test/TestGLMDecoder.java b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/test/TestGLMDecoder.java new file mode 100644 index 0000000000..b679ebdd0d --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/test/TestGLMDecoder.java @@ -0,0 +1,38 @@ +import gov.nasa.msfc.sport.edex.glmdecoder.decoder.GLMDecoder; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import com.raytheon.uf.common.dataplugin.PluginDataObject; + +public class TestGLMDecoder { + + public void processFile(String file) { + try { + byte[] array = readFileInAsByteArray(file); + GLMDecoder decoder = new GLMDecoder(); + PluginDataObject[] objects = decoder.decode(array); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public byte[] readFileInAsByteArray(String file) throws IOException { + Path path = Paths.get(file); + + return Files.readAllBytes(path); + + } + + public static void main(String[] args) { + TestGLMDecoder testDecoder = new TestGLMDecoder(); + testDecoder + .processFile("/data1/awips/sampledata/GLM/OR_GLM-L2-LCFA_G16_s20151831153096_e20151831153297_c20152020147422.nc"); + testDecoder + .processFile("/data1/awips/sampledata/GLM/newsamples/glm/IXTR99_KNES_190001_18889.2015081900"); + } + +} diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/common_static/base/menus/glm/glmlightningMenuItems.xml b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/common_static/base/menus/glm/glmlightningMenuItems.xml new file mode 100644 index 0000000000..1ffcf7587d --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/common_static/base/menus/glm/glmlightningMenuItems.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/common_static/base/menus/glm/index.xml b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/common_static/base/menus/glm/index.xml new file mode 100644 index 0000000000..b0d5fd1b47 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/common_static/base/menus/glm/index.xml @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/edex_static/base/distribution/glm.xml b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/edex_static/base/distribution/glm.xml new file mode 100644 index 0000000000..d215030948 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.glmdecoder/utility/edex_static/base/distribution/glm.xml @@ -0,0 +1,6 @@ + + + + OR_GLM-L2-LCFA_G16 + ^IXTR99 KNES + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml index 6b2e35ee45..9043aabcc2 100644 --- a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml @@ -1,828 +1,923 @@ - - - - - /grid/NALMA/%/%/lmasd - - - - - - - - /grid/NALMA/%/%/lmamsd - - - - - - - - /grid/NALMA/%/%/lmafed - - - - - - - - /grid/NALMA/%/%/lmafid - - - - - - - - /grid/NALMA/%/%/lmamfd - - - - - - - - /grid/NALMA/%/%/lmaroc - - - - - - - - - - /grid/DCLMA/%/%/lmasd - - - - - - - - /grid/DCLMA/%/%/lmafed - - - - - - - - /grid/DCLMA/%/%/lmafid - - - - - - - - /grid/DCLMA/%/%/lmamfd - - - - - - - - - - - /grid/KLDAR/%/%/lmasd - - - - - - - - /grid/KLDAR/%/%/lmafed - - - - - - - - /grid/KLDAR/%/%/lmafid - - - - - - - - /grid/KLDAR/%/%/lmamfd - - - - - - - - - - - /grid/OKLMA/%/%/lmasd - - - - - - - - /grid/OKLMA/%/%/lmafed - - - - - - - - /grid/OKLMA/%/%/lmafid - - - - - - - - /grid/OKLMA/%/%/lmamfd - - - - - - - - - - - /grid/COLMA/%/%/lmasd - - - - - - - - /grid/COLMA/%/%/lmafed - - - - - - - - /grid/COLMA/%/%/lmafid - - - - - - - - /grid/COLMA/%/%/lmamfd - - - - - - - - - - - /grid/HGLMA/%/%/lmasd - - - - - - - - /grid/HGLMA/%/%/lmafed - - - - - - - - /grid/HGLMA/%/%/lmafid - - - - - - - - /grid/HGLMA/%/%/lmamfd - - - - - - - - - - - /grid/WTLMA/%/%/lmasd - - - - - - - - /grid/WTLMA/%/%/lmafed - - - - - - - - /grid/WTLMA/%/%/lmafid - - - - - - - - /grid/WTLMA/%/%/lmamfd - - - - - - - - - - - /grid/CFLMA/%/%/lmasd - - - - - - - - /grid/CFLMA/%/%/lmafed - - - - - - - - /grid/CFLMA/%/%/lmafid - - - - - - - - /grid/CFLMA/%/%/lmamfd - - - - - - - - - - - /grid/LLLMA/%/%/lmasd - - - - - - - - /grid/LLLMA/%/%/lmafed - - - - - - - - /grid/LLLMA/%/%/lmafid - - - - - - - - /grid/LLLMA/%/%/lmamfd - - - - - - - - - - - - /grid/KSCLMA/%/%/lmasd - - - - - - - - /grid/KSCLMA/%/%/lmafed - - - - - - - - /grid/KSCLMA/%/%/lmafid - - - - - - - - /grid/KSCLMA/%/%/lmamfd - - - - - - - - - - - /grid/NGLMA/%/%/lmasd - - - - - - - - /grid/NGLMA/%/%/lmafed - - - - - - - - /grid/NGLMA/%/%/lmafid - - - - - - - - /grid/NGLMA/%/%/lmamfd - - - - - - - - - - - /grid/ONLMA/%/%/lmasd - - - - - - - - /grid/ONLMA/%/%/lmafed - - - - - - - - /grid/ONLMA/%/%/lmafid - - - - - - - - /grid/ONLMA/%/%/lmamfd - - - - - - - - - - - /grid/WILMA/%/%/lmasd - - - - - - - - /grid/WILMA/%/%/lmafed - - - - - - - - /grid/WILMA/%/%/lmafid - - - - - - - - /grid/WILMA/%/%/lmamfd - - - - - - - - - - - /grid/WSLMA/%/%/lmasd - - - - - - - - /grid/WSLMA/%/%/lmafed - - - - - - - - /grid/WSLMA/%/%/lmafid - - - - - - - - /grid/WSLMA/%/%/lmamfd - - - - - - - - - - - - - /grid/PGNA/%/%/lmafed - - - - - - - - /grid/PGNA/%/%/lmafid - - - - - - - - /grid/PGNA/%/%/lmamfd - - - - - - - - /grid/PGNA/%/%/lmasum - - - - - - - - - - - /grid/PGDC/%/%/lmafed - - - - - - - - /grid/PGDC/%/%/lmafid - - - - - - - - /grid/PGDC/%/%/lmamfd - - - - - - - - /grid/PGDC/%/%/lmasum - - - - - - - - - - - /grid/PGSC/%/%/lmafed - - - - - - - - /grid/PGSC/%/%/lmafid - - - - - - - - /grid/PGSC/%/%/lmamfd - - - - - - - - /grid/PGSC/%/%/lmasum - - - - - - - - - - - /grid/PGOK/%/%/lmafed - - - - - - - - /grid/PGOK/%/%/lmafid - - - - - - - - /grid/PGOK/%/%/lmamfd - - - - - - - - /grid/PGOK/%/%/lmasum - - - - - - - - - - - /grid/PGCO/%/%/lmafed - - - - - - - - /grid/PGCO/%/%/lmafid - - - - - - - - /grid/PGCO/%/%/lmamfd - - - - - - - - /grid/PGCO/%/%/lmasum - - - - - - - - - - - /grid/PGHG/%/%/lmafed - - - - - - - - /grid/PGHG/%/%/lmafid - - - - - - - - /grid/PGHG/%/%/lmamfd - - - - - - - - /grid/PGHG/%/%/lmasum - - - - - - - - - - - /grid/PGWT/%/%/lmafed - - - - - - - - /grid/PGWT/%/%/lmafid - - - - - - - - /grid/PGWT/%/%/lmamfd - - - - - - - - /grid/PGWT/%/%/lmasum - - - - - - - - - - - /grid/PGCF/%/%/lmafed - - - - - - - - /grid/PGCF/%/%/lmafid - - - - - - - - /grid/PGCF/%/%/lmamfd - - - - - - - - /grid/PGCF/%/%/lmasum - - - - - - - - - - - /grid/PGLL/%/%/lmafed - - - - - - - - /grid/PGLL/%/%/lmafid - - - - - - - - /grid/PGLL/%/%/lmamfd - - - - - - - - /grid/PGLL/%/%/lmasum - - - - - - - - + + + + + /grid/NALMA/%/%/lmasd + + + + + + + + /grid/NALMA/%/%/lmamsd + + + + + + + + /grid/NALMA/%/%/lmafed + + + + + + + + /grid/NALMA/%/%/lmafid + + + + + + + + /grid/NALMA/%/%/lmamfd + + + + + + + + /grid/NALMA/%/%/lmaroc + + + + + + + + + + /grid/DCLMA/%/%/lmasd + + + + + + + + /grid/DCLMA/%/%/lmafed + + + + + + + + /grid/DCLMA/%/%/lmafid + + + + + + + + /grid/DCLMA/%/%/lmamfd + + + + + + + + + + + /grid/KLDAR/%/%/lmasd + + + + + + + + /grid/KLDAR/%/%/lmafed + + + + + + + + /grid/KLDAR/%/%/lmafid + + + + + + + + /grid/KLDAR/%/%/lmamfd + + + + + + + + + + + /grid/OKLMA/%/%/lmasd + + + + + + + + /grid/OKLMA/%/%/lmafed + + + + + + + + /grid/OKLMA/%/%/lmafid + + + + + + + + /grid/OKLMA/%/%/lmamfd + + + + + + + + + + + /grid/COLMA/%/%/lmasd + + + + + + + + /grid/COLMA/%/%/lmafed + + + + + + + + /grid/COLMA/%/%/lmafid + + + + + + + + /grid/COLMA/%/%/lmamfd + + + + + + + + + + + /grid/HGLMA/%/%/lmasd + + + + + + + + /grid/HGLMA/%/%/lmafed + + + + + + + + /grid/HGLMA/%/%/lmafid + + + + + + + + /grid/HGLMA/%/%/lmamfd + + + + + + + + + + + /grid/WTLMA/%/%/lmasd + + + + + + + + /grid/WTLMA/%/%/lmafed + + + + + + + + /grid/WTLMA/%/%/lmafid + + + + + + + + /grid/WTLMA/%/%/lmamfd + + + + + + + + + + + /grid/CFLMA/%/%/lmasd + + + + + + + + /grid/CFLMA/%/%/lmafed + + + + + + + + /grid/CFLMA/%/%/lmafid + + + + + + + + /grid/CFLMA/%/%/lmamfd + + + + + + + + + + + /grid/LLLMA/%/%/lmasd + + + + + + + + /grid/LLLMA/%/%/lmafed + + + + + + + + /grid/LLLMA/%/%/lmafid + + + + + + + + /grid/LLLMA/%/%/lmamfd + + + + + + + + + + + + /grid/KSCLMA/%/%/lmasd + + + + + + + + /grid/KSCLMA/%/%/lmafed + + + + + + + + /grid/KSCLMA/%/%/lmafid + + + + + + + + /grid/KSCLMA/%/%/lmamfd + + + + + + + + + + + /grid/NGLMA/%/%/lmasd + + + + + + + + /grid/NGLMA/%/%/lmafed + + + + + + + + /grid/NGLMA/%/%/lmafid + + + + + + + + /grid/NGLMA/%/%/lmamfd + + + + + + + + + + + /grid/ONLMA/%/%/lmasd + + + + + + + + /grid/ONLMA/%/%/lmafed + + + + + + + + /grid/ONLMA/%/%/lmafid + + + + + + + + /grid/ONLMA/%/%/lmamfd + + + + + + + + + + + /grid/WILMA/%/%/lmasd + + + + + + + + /grid/WILMA/%/%/lmafed + + + + + + + + /grid/WILMA/%/%/lmafid + + + + + + + + /grid/WILMA/%/%/lmamfd + + + + + + + + + + + /grid/WSLMA/%/%/lmasd + + + + + + + + /grid/WSLMA/%/%/lmafed + + + + + + + + /grid/WSLMA/%/%/lmafid + + + + + + + + /grid/WSLMA/%/%/lmamfd + + + + + + + + + + + + + /grid/PGNA/%/%/lmafed + + + + + + + + /grid/PGNA/%/%/lmafid + + + + + + + + /grid/PGNA/%/%/lmamfd + + + + + + + + /grid/PGNA/%/%/lmasum + + + + + + + + + + + /grid/PGDC/%/%/lmafed + + + + + + + + /grid/PGDC/%/%/lmafid + + + + + + + + /grid/PGDC/%/%/lmamfd + + + + + + + + /grid/PGDC/%/%/lmasum + + + + + + + + + + + /grid/PGSC/%/%/lmafed + + + + + + + + /grid/PGSC/%/%/lmafid + + + + + + + + /grid/PGSC/%/%/lmamfd + + + + + + + + /grid/PGSC/%/%/lmasum + + + + + + + + + + + /grid/PGOK/%/%/lmafed + + + + + + + + /grid/PGOK/%/%/lmafid + + + + + + + + /grid/PGOK/%/%/lmamfd + + + + + + + + /grid/PGOK/%/%/lmasum + + + + + + + + + + + /grid/PGCO/%/%/lmafed + + + + + + + + /grid/PGCO/%/%/lmafid + + + + + + + + /grid/PGCO/%/%/lmamfd + + + + + + + + /grid/PGCO/%/%/lmasum + + + + + + + + + + + /grid/PGHG/%/%/lmafed + + + + + + + + /grid/PGHG/%/%/lmafid + + + + + + + + /grid/PGHG/%/%/lmamfd + + + + + + + + /grid/PGHG/%/%/lmasum + + + + + + + + + + + /grid/PGWT/%/%/lmafed + + + + + + + + /grid/PGWT/%/%/lmafid + + + + + + + + /grid/PGWT/%/%/lmamfd + + + + + + + + /grid/PGWT/%/%/lmasum + + + + + + + + + + + /grid/PGCF/%/%/lmafed + + + + + + + + /grid/PGCF/%/%/lmafid + + + + + + + + /grid/PGCF/%/%/lmamfd + + + + + + + + /grid/PGCF/%/%/lmasum + + + + + + + + + + + /grid/PGLL/%/%/lmafed + + + + + + + + /grid/PGLL/%/%/lmafid + + + + + + + + /grid/PGLL/%/%/lmamfd + + + + + + + + /grid/PGLL/%/%/lmasum + + + + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Alaska_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Alaska_Reg.xml new file mode 100755 index 0000000000..d310cc3124 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Alaska_Reg.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Albers_Conic_Equal_Area", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Albers_Conic_Equal_Area"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -150.0], + PARAMETER["latitude_of_origin", 60.0], + PARAMETER["standard_parallel_1", 60.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + PARAMETER["standard_parallel_2", 60.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/AsiaPacific.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/AsiaPacific.xml new file mode 100755 index 0000000000..566b9b2052 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/AsiaPacific.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ the_geom + name not in ('CANADA', 'MEXICO', 'UNITED STATES') + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ + + State/County Boundaries + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + mapdata.latlon10
+ Lat/Lon 10 over Ocean + + + + + + + + + PLAN_VIEW + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371200.0], + PARAMETER["semi_minor", 6371200.0], + PARAMETER["central_meridian", 130.0], + PARAMETER["latitude_of_origin", 10.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Atlantic.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Atlantic.xml new file mode 100755 index 0000000000..49fa31520a --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Atlantic.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ the_geom + name not in ('CANADA', 'MEXICO', 'UNITED STATES') + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ + + State/County Boundaries + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + mapdata.latlon10
+ Lat/Lon 10 over Ocean + + + + + + + + + PLAN_VIEW + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371200.0], + PARAMETER["semi_minor", 6371200.0], + PARAMETER["central_meridian", -50.0], + PARAMETER["latitude_of_origin", 10.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/EuroAfrica.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/EuroAfrica.xml new file mode 100755 index 0000000000..9c377127f7 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/EuroAfrica.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ the_geom + name not in ('CANADA', 'MEXICO', 'UNITED STATES') + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ + + State/County Boundaries + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + mapdata.latlon10
+ Lat/Lon 10 over Ocean + + + + + + + + + PLAN_VIEW + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371200.0], + PARAMETER["semi_minor", 6371200.0], + PARAMETER["central_meridian", 40.0], + PARAMETER["latitude_of_origin", 10.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/GreatLakes_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/GreatLakes_Reg.xml new file mode 100755 index 0000000000..ac524d75ca --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/GreatLakes_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -84.5], + PARAMETER["latitude_of_origin", 43.25], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/GulfCoast_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/GulfCoast_Reg.xml new file mode 100755 index 0000000000..a7ade57a4e --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/GulfCoast_Reg.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -89.5], + PARAMETER["latitude_of_origin", 30.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Hawaii_regional.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Hawaii_regional.xml new file mode 100755 index 0000000000..97eee6c827 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Hawaii_regional.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('CANADA', + 'MEXICO', 'UNITED STATES') + + the_geom + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + mapdata.latlon10
+ Lat/Lon 10 over Ocean + + + + + + + + + PLAN_VIEW + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + + PROJCS["Mercator_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Mercator_1SP"], + PARAMETER["semi_major", 6371200.0], + PARAMETER["semi_minor", 6371200.0], + PARAMETER["latitude_of_origin", 0.0], + PARAMETER["central_meridian", -158.5], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + + \ No newline at end of file diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Hawaii_state.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Hawaii_state.xml new file mode 100755 index 0000000000..47fdbb7a3d --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Hawaii_state.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('CANADA', + 'MEXICO', 'UNITED STATES') + + the_geom + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + mapdata.latlon10
+ Lat/Lon 10 over Ocean + + + + + + + + + PLAN_VIEW + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + + PROJCS["Mercator_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Mercator_1SP"], + PARAMETER["semi_major", 6371200.0], + PARAMETER["semi_minor", 6371200.0], + PARAMETER["latitude_of_origin", 0.0], + PARAMETER["central_meridian", -160.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Mid-Atlantic_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Mid-Atlantic_Reg.xml new file mode 100755 index 0000000000..5d09ec85b0 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Mid-Atlantic_Reg.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -76.5], + PARAMETER["latitude_of_origin", 36.5], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NorthEast_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NorthEast_Reg.xml new file mode 100755 index 0000000000..253d6fb3ff --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NorthEast_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -71.0], + PARAMETER["latitude_of_origin", 42.5], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NorthWest_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NorthWest_Reg.xml new file mode 100755 index 0000000000..a71caa046c --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NorthWest_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -117.25], + PARAMETER["latitude_of_origin", 43.5], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NrnPlains_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NrnPlains_Reg.xml new file mode 100755 index 0000000000..51d1a7e83b --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/NrnPlains_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -98.0], + PARAMETER["latitude_of_origin", 43.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/OzarkTennV_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/OzarkTennV_Reg.xml new file mode 100755 index 0000000000..5414441acf --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/OzarkTennV_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -88.75], + PARAMETER["latitude_of_origin", 35.25], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Pacific.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Pacific.xml new file mode 100755 index 0000000000..f92df9eaeb --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Pacific.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ the_geom + name not in ('CANADA', 'MEXICO', 'UNITED STATES') + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ + + State/County Boundaries + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + mapdata.latlon10
+ Lat/Lon 10 over Ocean + + + + + + + + + PLAN_VIEW + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -130.0], + PARAMETER["latitude_of_origin", 10.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Puerto_Rico.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Puerto_Rico.xml new file mode 100755 index 0000000000..c9623e3412 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/Puerto_Rico.xml @@ -0,0 +1,165 @@ + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + World + mapdata.world
+ name not in ('CANADA', 'MEXICO', 'UNITED STATES') + the_geom + + + + + PLAN_VIEW + + + + + + + + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + PLAN_VIEW + + + + + + + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + Lat/Lon 10 over Ocean + mapdata.latlon10
+ the_geom + + + + + PLAN_VIEW + + + + + + + + + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_2SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_2SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -66.43333300000002], + PARAMETER["latitude_of_origin", 17.833333], + PARAMETER["standard_parallel_1", 18.433333], + PARAMETER["false_easting", 200000.0], + PARAMETER["false_northing", 200000.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["standard_parallel_2", 18.433333], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SouthEast_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SouthEast_Reg.xml new file mode 100755 index 0000000000..d75e0e0b90 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SouthEast_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -82.0], + PARAMETER["latitude_of_origin", 30.5], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SouthWest_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SouthWest_Reg.xml new file mode 100755 index 0000000000..205f76657a --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SouthWest_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -114.0], + PARAMETER["latitude_of_origin", 36.75], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SrnPlains_Reg.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SrnPlains_Reg.xml new file mode 100755 index 0000000000..0ea0583dff --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/SrnPlains_Reg.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ name not in ('Canada', 'Mexico', 'United States') + the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ the_geom + + + State/County Boundaries + + + + 12 + 2147483647 + + PROJCS["Lambert_Conformal_Conic_1SP", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Lambert_Conformal_Conic_1SP"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -97.25], + PARAMETER["latitude_of_origin", 33.0], + PARAMETER["scale_factor", 1.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/World.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/World.xml new file mode 100755 index 0000000000..4a63a53e03 --- /dev/null +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/World.xml @@ -0,0 +1,201 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + World + mapdata.world
+ the_geom + name not in ('CANADA', 'MEXICO', 'UNITED STATES') + + + + + + + + + PLAN_VIEW + + + + + + State Boundaries + mapdata.states
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Canada + mapdata.canada
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + Mexico + mapdata.mexico
+ the_geom + + + + + + + + + PLAN_VIEW + + + + + + County Boundaries + mapdata.county
+ + + State/County Boundaries + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + PLAN_VIEW + + + + + + mapdata.latlon10
+ Lat/Lon 10 over Ocean + + + + + + + + + PLAN_VIEW + + + + + + latlon10.lpi + + + Lat/Lon 10 over Ocean + + + + 12 + + + + PROJCS["Equidistant Cylindrical (Spherical)", + GEOGCS["WGS84(DD)", + DATUM["WGS84", + SPHEROID["WGS84", 6378137.0, 298.257223563]], + PRIMEM["Greenwich", 0.0], + UNIT["degree", 0.017453292519943295], + AXIS["Geodetic longitude", EAST], + AXIS["Geodetic latitude", NORTH]], + PROJECTION["Equidistant Cylindrical (Spherical)"], + PARAMETER["semi_major", 6371229.0], + PARAMETER["semi_minor", 6371229.0], + PARAMETER["central_meridian", -95.0], + PARAMETER["latitude_of_origin", 0.0], + PARAMETER["standard_parallel_1", 0.0], + PARAMETER["false_easting", 0.0], + PARAMETER["false_northing", 0.0], + UNIT["m", 1.0], + AXIS["Easting", EAST], + AXIS["Northing", NORTH]] + + + + + + diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml old mode 100644 new mode 100755 index 4d8ea295f6..40f573c603 --- a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml @@ -19,21 +19,63 @@ further_licensing_information. --> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template index c9f01c2ffb..6a6915f824 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -44,6 +44,7 @@ #20150827 4687 skorolev Add pattern for ECMWF station-based MOS text bulletins #20150930 4930 rferrel Corrected patterns for intlsigmets. #20151008 4958 dgilling Add pattern for NationalBlend +#20151030 DR 17683 jwatson Add pattern for Day 8-11 Alaska 3km gridded MOS #*************************************************************** # AWIPS 1 PATTERN GRAPHIC ^[PQ].* /redbook/Raw @@ -246,6 +247,14 @@ NGRID ^([LM][ABCDFGH]U...) (KWBN) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/# NGRID ^(Y.UZ9[0-9]) (KWB.) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/GMOS/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H +# DR 17683 +# Day 8-11 3km Alaska Gridded MOS +# Pattern added by Josh Watson +# The noaaportIngester does not yet read a grib2 SBN file with more than one message. + +NGRID ^(L[BCDEFGHR]RZ96) (KWBQ) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/GMOS/GRID255/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H + # DR 17426 # 2.5km Hawaii GMOS # Pattern added by Josh Watson @@ -297,7 +306,8 @@ NGRID ^([LM].[EF].{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([ # Pattern added by Josh Watson # The noaaportIngester does not yet read a grib2 SBN file with more than one message. # RM 17414 Split out EKDMOS from KMDL pattern -NGRID ^(L[ABCDKLMN]U[ABZ][0-9][0-9]) (KMDL) (..)(..)(..) +# DCS 11447 Fix Gridded LAMP pattern to add sky and wind +NGRID ^(L[ABCDEFGKLMNOPQ]U[ABZ][0-9][0-9]) (KMDL) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/LAMP/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H NGRID ^([LM][EFGH][A-L]Z9[0-9]) (KMDL) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/EKDMOS/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H