Skip to content

Commit a434156

Browse files
JeffHamiltonNOAAJeffHamiltonNOAA
authored
Various MATS bugfixes (#1368)
 - Added documentation link to top navigation bar. - Fixed bug where the upper air app erroneously displayed the "Region Mode" selector when "Truth" was set to some sort of AMDAR. Users should not be offered a choice of region mode for AMDAR, as AMDAR is predefined region only. - Clicking Restore Settings no longer removes all added curves unless the user then clicks confirm. - Clicking Restore Settings no longer changes the values on the blue curve selector buttons (although it may by necessity change plot type). - Fixed bug where the default legend text wouldn't appear on the Edit Legend modal. - Reordered curve legends to be more concise and display forecast lead time earlier. - Made modals larger.
2 parents aae0ca7 + efeec56 commit a434156

File tree

20 files changed

+408
-358
lines changed

20 files changed

+408
-358
lines changed

‎MATScommon‎

Submodule MATScommon updated 18 files

‎METexpress‎

‎apps/airQuality/server/main.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,16 +1265,16 @@ const doCurveTextPatterns = async function () {
12651265
plotType: matsTypes.PlotTypes.timeSeries,
12661266
textPattern: [
12671267
["", "label", ": "],
1268-
["", "data-source", " in "],
1269-
["", "sites", ": "],
1268+
["", "data-source", " at "],
1269+
["", "sites", ", "],
12701270
["", "region", ", "],
1271+
["", "forecast-length", "h "],
12711272
["", "scale", " "],
12721273
["", "variable", " "],
12731274
["", "statistic", " at "],
12741275
["", "threshold", ", "],
1275-
["fcst_len: ", "forecast-length", "h, "],
1276-
["valid-time: ", "valid-time", ", "],
1277-
["avg: ", "average", ""],
1276+
["valid at: ", "valid-time", " UTC, "],
1277+
["", "average", " average"],
12781278
],
12791279
displayParams: [
12801280
"label",
@@ -1297,16 +1297,16 @@ const doCurveTextPatterns = async function () {
12971297
plotType: matsTypes.PlotTypes.dieoff,
12981298
textPattern: [
12991299
["", "label", ": "],
1300-
["", "data-source", " in "],
1301-
["", "sites", ": "],
1300+
["", "data-source", " at "],
1301+
["", "sites", ", "],
13021302
["", "region", ", "],
1303+
["initialized ", "utc-cycle-start", " UTC, "],
13031304
["", "scale", " "],
13041305
["", "variable", " "],
13051306
["", "statistic", " at "],
13061307
["", "threshold", ", "],
13071308
["", "dieoff-type", ", "],
1308-
["valid-time: ", "valid-time", ", "],
1309-
["start utc: ", "utc-cycle-start", ", "],
1309+
["valid at: ", "valid-time", " UTC, "],
13101310
["", "curve-dates", ""],
13111311
],
13121312
displayParams: [
@@ -1333,11 +1333,11 @@ const doCurveTextPatterns = async function () {
13331333
["", "label", ": "],
13341334
["", "data-source", " in "],
13351335
["", "region", ", "],
1336+
["", "forecast-length", "h "],
13361337
["", "scale", " "],
13371338
["", "variable", " "],
13381339
["", "statistic", ", "],
1339-
["fcst_len: ", "forecast-length", "h, "],
1340-
["valid-time: ", "valid-time", ", "],
1340+
["valid at: ", "valid-time", " UTC, "],
13411341
["", "curve-dates", ""],
13421342
],
13431343
displayParams: [
@@ -1357,14 +1357,14 @@ const doCurveTextPatterns = async function () {
13571357
plotType: matsTypes.PlotTypes.validtime,
13581358
textPattern: [
13591359
["", "label", ": "],
1360-
["", "data-source", " in "],
1361-
["", "sites", ": "],
1360+
["", "data-source", " at "],
1361+
["", "sites", ", "],
13621362
["", "region", ", "],
1363+
["", "forecast-length", "h "],
13631364
["", "scale", " "],
13641365
["", "variable", " "],
13651366
["", "statistic", " at "],
13661367
["", "threshold", ", "],
1367-
["fcst_len: ", "forecast-length", "h, "],
13681368
["", "curve-dates", ""],
13691369
],
13701370
displayParams: [
@@ -1387,14 +1387,14 @@ const doCurveTextPatterns = async function () {
13871387
plotType: matsTypes.PlotTypes.dailyModelCycle,
13881388
textPattern: [
13891389
["", "label", ": "],
1390-
["", "data-source", " in "],
1391-
["", "sites", ": "],
1390+
["", "data-source", " at "],
1391+
["", "sites", ", "],
13921392
["", "region", ", "],
1393+
["initialized ", "utc-cycle-start", " UTC"],
13931394
["", "scale", " "],
13941395
["", "variable", " "],
13951396
["", "statistic", " at "],
13961397
["", "threshold", ", "],
1397-
["start utc: ", "utc-cycle-start", ""],
13981398
],
13991399
displayParams: [
14001400
"label",
@@ -1417,11 +1417,11 @@ const doCurveTextPatterns = async function () {
14171417
["", "label", ": "],
14181418
["", "data-source", " in "],
14191419
["", "region", ", "],
1420+
["", "forecast-length", "h "],
14201421
["", "scale", " "],
14211422
["", "variable", " at "],
14221423
["", "threshold", ", "],
1423-
["fcst_len: ", "forecast-length", "h, "],
1424-
["valid-time: ", "valid-time", ", "],
1424+
["valid at: ", "valid-time", " UTC, "],
14251425
["", "curve-dates", ""],
14261426
],
14271427
displayParams: [
@@ -1441,12 +1441,12 @@ const doCurveTextPatterns = async function () {
14411441
await matsCollections.CurveTextPatterns.insertAsync({
14421442
plotType: matsTypes.PlotTypes.map,
14431443
textPattern: [
1444-
["", "data-source", ": "],
1445-
["", "sites", ": "],
1444+
["", "data-source", " at "],
1445+
["", "sites", ", "],
1446+
["", "forecast-length", "h "],
14461447
["", "variable", " "],
14471448
["", "statistic", " at "],
14481449
["", "threshold", ", "],
1449-
["fcst_len: ", "forecast-length", " h "],
14501450
[" valid-time:", "valid-time", ""],
14511451
],
14521452
displayParams: [
@@ -1467,12 +1467,12 @@ const doCurveTextPatterns = async function () {
14671467
["", "label", ": "],
14681468
["", "data-source", " in "],
14691469
["", "region", ", "],
1470+
["", "forecast-length", "h "],
14701471
["", "scale", " "],
14711472
["", "variable", " "],
14721473
["", "statistic", " at "],
14731474
["", "threshold", ", "],
1474-
["fcst_len: ", "forecast-length", "h, "],
1475-
["valid-time: ", "valid-time", ", "],
1475+
["valid at: ", "valid-time", " UTC, "],
14761476
["", "curve-dates", ""],
14771477
],
14781478
displayParams: [
@@ -1495,12 +1495,12 @@ const doCurveTextPatterns = async function () {
14951495
["", "label", ": "],
14961496
["", "data-source", " in "],
14971497
["", "region", ", "],
1498+
["", "forecast-length", "h "],
14981499
["", "scale", " "],
14991500
["", "variable", " "],
15001501
["", "statistic", " at "],
15011502
["", "threshold", ", "],
1502-
["fcst_len: ", "forecast-length", "h, "],
1503-
["valid-time: ", "valid-time", ""],
1503+
["valid at: ", "valid-time", ""],
15041504
],
15051505
displayParams: [
15061506
"label",
@@ -1521,12 +1521,12 @@ const doCurveTextPatterns = async function () {
15211521
["", "label", ": "],
15221522
["", "data-source", " in "],
15231523
["", "region", ", "],
1524+
["", "forecast-length", "h "],
15241525
["", "scale", " "],
15251526
["", "variable", " "],
15261527
["", "statistic", " at "],
15271528
["", "threshold", ", "],
1528-
["fcst_len: ", "forecast-length", "h, "],
1529-
["valid-time: ", "valid-time", ""],
1529+
["valid at: ", "valid-time", ""],
15301530
],
15311531
displayParams: [
15321532
"label",

‎apps/cb-metar/server/main.js‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,15 +1497,15 @@ const doCurveTextPatterns = async function () {
14971497
plotType: matsTypes.PlotTypes.timeSeries,
14981498
textPattern: [
14991499
["", "label", ": "],
1500-
["", "data-source", " in "],
1501-
["", "sites", ": "],
1500+
["", "data-source", " at "],
1501+
["", "sites", ", "],
15021502
["", "region", ", "],
1503+
["", "forecast-length", "h "],
15031504
["", "variable", " "],
15041505
["", "statistic", " at "],
15051506
["", "threshold", ", "],
1506-
["fcst_len: ", "forecast-length", "h, "],
1507-
["valid-time: ", "valid-time", ", "],
1508-
["avg: ", "average", ". "],
1507+
["valid at: ", "valid-time", " UTC, "],
1508+
["", "average", " average."],
15091509
["Model filtered by: ", "filter-model-by", " "],
15101510
["range: ", "filter-model-min", " "],
15111511
["to ", "filter-model-max", ". "],
@@ -1539,15 +1539,15 @@ const doCurveTextPatterns = async function () {
15391539
plotType: matsTypes.PlotTypes.dieoff,
15401540
textPattern: [
15411541
["", "label", ": "],
1542-
["", "data-source", " in "],
1543-
["", "sites", ": "],
1542+
["", "data-source", " at "],
1543+
["", "sites", ", "],
15441544
["", "region", ", "],
1545+
["initialized ", "utc-cycle-start", " UTC, "],
15451546
["", "variable", " "],
15461547
["", "statistic", " at "],
15471548
["", "threshold", ", "],
15481549
["", "dieoff-type", ", "],
1549-
["valid-time: ", "valid-time", ", "],
1550-
["start utc: ", "utc-cycle-start", ", "],
1550+
["valid at: ", "valid-time", " UTC, "],
15511551
["", "curve-dates", ". "],
15521552
["Model filtered by: ", "filter-model-by", " "],
15531553
["range: ", "filter-model-min", " "],
@@ -1583,13 +1583,13 @@ const doCurveTextPatterns = async function () {
15831583
plotType: matsTypes.PlotTypes.threshold,
15841584
textPattern: [
15851585
["", "label", ": "],
1586-
["", "data-source", " in "],
1587-
["", "sites", ": "],
1586+
["", "data-source", " at "],
1587+
["", "sites", ", "],
15881588
["", "region", ", "],
1589+
["", "forecast-length", "h "],
15891590
["", "variable", " "],
15901591
["", "statistic", ", "],
1591-
["fcst_len: ", "forecast-length", "h, "],
1592-
["valid-time: ", "valid-time", ", "],
1592+
["valid at: ", "valid-time", " UTC, "],
15931593
["", "curve-dates", ". "],
15941594
["Model filtered by: ", "filter-model-by", " "],
15951595
["range: ", "filter-model-min", " "],
@@ -1620,13 +1620,13 @@ const doCurveTextPatterns = async function () {
16201620
plotType: matsTypes.PlotTypes.validtime,
16211621
textPattern: [
16221622
["", "label", ": "],
1623-
["", "data-source", " in "],
1624-
["", "sites", ": "],
1623+
["", "data-source", " at "],
1624+
["", "sites", ", "],
16251625
["", "region", ", "],
1626+
["", "forecast-length", "h "],
16261627
["", "variable", " "],
16271628
["", "statistic", " at "],
16281629
["", "threshold", ", "],
1629-
["fcst_len: ", "forecast-length", "h, "],
16301630
["", "curve-dates", ". "],
16311631
["Model filtered by: ", "filter-model-by", " "],
16321632
["range: ", "filter-model-min", " "],
@@ -1660,13 +1660,13 @@ const doCurveTextPatterns = async function () {
16601660
plotType: matsTypes.PlotTypes.dailyModelCycle,
16611661
textPattern: [
16621662
["", "label", ": "],
1663-
["", "data-source", " in "],
1664-
["", "sites", ": "],
1663+
["", "data-source", " at "],
1664+
["", "sites", ", "],
16651665
["", "region", ", "],
1666+
["initialized ", "utc-cycle-start", " UTC. "],
16661667
["", "variable", " "],
16671668
["", "statistic", " at "],
16681669
["", "threshold", ", "],
1669-
["start utc: ", "utc-cycle-start", ". "],
16701670
["Model filtered by: ", "filter-model-by", " "],
16711671
["range: ", "filter-model-min", " "],
16721672
["to ", "filter-model-max", ". "],
@@ -1700,10 +1700,10 @@ const doCurveTextPatterns = async function () {
17001700
["", "label", ": "],
17011701
["", "data-source", " in "],
17021702
["", "region", ", "],
1703+
["", "forecast-length", "h "],
17031704
["", "variable", " at "],
17041705
["", "threshold", ", "],
1705-
["fcst_len: ", "forecast-length", "h, "],
1706-
["valid-time: ", "valid-time", ", "],
1706+
["valid at: ", "valid-time", " UTC, "],
17071707
["", "curve-dates", ". "],
17081708
["Model filtered by: ", "filter-model-by", " "],
17091709
["range: ", "filter-model-min", " "],
@@ -1734,12 +1734,12 @@ const doCurveTextPatterns = async function () {
17341734
await matsCollections.CurveTextPatterns.insertAsync({
17351735
plotType: matsTypes.PlotTypes.map,
17361736
textPattern: [
1737-
["", "data-source", ": "],
1738-
["", "sites", ": "],
1737+
["", "data-source", " at "],
1738+
["", "sites", ", "],
1739+
["", "forecast-length", "h "],
17391740
["", "variable", " "],
17401741
["", "statistic", " at "],
17411742
["", "threshold", ", "],
1742-
["fcst_len: ", "forecast-length", " h "],
17431743
[" valid-time:", "valid-time", ". "],
17441744
["Model filtered by: ", "filter-model-by", " "],
17451745
["range: ", "filter-model-min", " "],
@@ -1770,14 +1770,14 @@ const doCurveTextPatterns = async function () {
17701770
plotType: matsTypes.PlotTypes.histogram,
17711771
textPattern: [
17721772
["", "label", ": "],
1773-
["", "data-source", " in "],
1774-
["", "sites", ": "],
1773+
["", "data-source", " at "],
1774+
["", "sites", ", "],
17751775
["", "region", ", "],
1776+
["", "forecast-length", "h "],
17761777
["", "variable", " "],
17771778
["", "statistic", " at "],
17781779
["", "threshold", ", "],
1779-
["fcst_len: ", "forecast-length", "h, "],
1780-
["valid-time: ", "valid-time", ", "],
1780+
["valid at: ", "valid-time", " UTC, "],
17811781
["", "curve-dates", ". "],
17821782
["Model filtered by: ", "filter-model-by", " "],
17831783
["range: ", "filter-model-min", " "],
@@ -1811,11 +1811,11 @@ const doCurveTextPatterns = async function () {
18111811
["", "label", ": "],
18121812
["", "data-source", " in "],
18131813
["", "region", ", "],
1814+
["", "forecast-length", "h "],
18141815
["", "variable", " "],
18151816
["", "statistic", " at "],
18161817
["", "threshold", ", "],
1817-
["fcst_len: ", "forecast-length", "h, "],
1818-
["valid-time: ", "valid-time", ". "],
1818+
["valid at: ", "valid-time", ". "],
18191819
["Model filtered by: ", "filter-model-by", " "],
18201820
["range: ", "filter-model-min", " "],
18211821
["to ", "filter-model-max", ". "],
@@ -1847,11 +1847,11 @@ const doCurveTextPatterns = async function () {
18471847
["", "label", ": "],
18481848
["", "data-source", " in "],
18491849
["", "region", ", "],
1850+
["", "forecast-length", "h "],
18501851
["", "variable", " "],
18511852
["", "statistic", " at "],
18521853
["", "threshold", ", "],
1853-
["fcst_len: ", "forecast-length", "h, "],
1854-
["valid-time: ", "valid-time", ". "],
1854+
["valid at: ", "valid-time", ". "],
18551855
["Model filtered by: ", "filter-model-by", " "],
18561856
["range: ", "filter-model-min", " "],
18571857
["to ", "filter-model-max", ". "],

0 commit comments

Comments
 (0)