Skip to content

Commit 0c21880

Browse files
LukePriorLukePrior
authored
Merge pull request #207 from LukePrior/testing
initial SkewT support
2 parents fe8afc9 + 54a2d5c commit 0c21880

File tree

6 files changed

+311
-14
lines changed

6 files changed

+311
-14
lines changed

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
echo -n "Compiling CSS... "
55
cd css
66
rm -f mobile.css
7-
cat base.css skeleton.css layout.css habitat-font.css main.css > mobile.tmp
7+
cat base.css skeleton.css layout.css habitat-font.css main.css leaflet.css leaflet.fullscreen.css skewt.css > mobile.tmp
88
java -jar "../tools/yuicompressor-2.4.8.jar" --type=css mobile.tmp > mobile.css
99
rm -f mobile.tmp
1010
cd ..

‎css/main.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ header .search form input[type='submit'] {
412412
#main .row .data .vbutton {
413413
position: absolute;
414414
background-color: #fff;
415-
width: 25px !important;
415+
width: 30px !important;
416416
right: 5px;
417417
top: 150px;
418418
padding-left: 3px;
@@ -428,7 +428,7 @@ header .search form input[type='submit'] {
428428
#main .row .data .sbutton {
429429
position: absolute;
430430
background-color: #fff;
431-
width: 25px !important;
431+
width: 30px !important;
432432
right: 5px;
433433
top: 170px;
434434
padding-left: 3px;

‎css/skewt.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
<link rel="manifest" href="manifest.json">
2121

2222
<link rel="stylesheet" href="css/mobile.css"/>
23-
<link rel="stylesheet" href="css/leaflet.css" />
24-
<link rel="stylesheet" href="css/leaflet.fullscreen.css" />
23+
2524
</head>
2625
<body>
2726

@@ -50,6 +49,11 @@
5049
<path style="fill:#ffffff;" d="M 18.28125,5 C 17.665689,5.1577701 18.03897,6.072102 17.9375,6.6048171 17.961629,7.7933649 17.891319,9.0210305 17.96875,10.1875 18.260664,10.655295 18.988694,10.16755 19.495121,10.179003 19.915569,10.180314 20.482932,9.9817615 20.218593,9.5070668 19.685242,8.0689805 19.166647,6.5372411 18.625,5.15625 18.528924,5.0654291 18.420762,5.0014609 18.28125,5 z M 28.15625,6.78125 C 27.636383,7.0532274 27.291342,7.7650855 26.831767,8.2022559 26.183602,9.0036626 25.432231,9.7753304 24.84375,10.59375 24.760617,11.249334 25.657959,11.271078 26.078986,11.644576 26.390422,11.953835 26.933703,11.952146 27.000157,11.538317 27.50744,10.067568 28.117357,8.594139 28.5625,7.125 28.492656,6.9017107 28.410263,6.7690543 28.15625,6.78125 z M 9.5,10 C 9.0954231,10.135594 9.2373811,10.695886 9.5795967,10.908518 10.537018,12.015516 11.460558,13.256267 12.4375,14.28125 13.029751,14.410245 13.239648,13.580555 13.666521,13.22967 13.9948,13.00156 14.131018,12.482443 13.78125,12.375 12.489706,11.554805 11.012447,10.783392 9.71875,10 9.6458333,10 9.5729167,10 9.5,10 z M 20.84375,11.84375 C 18.371908,11.824599 15.919598,13.01633 14.4375,15 11.081301,15.152911 7.9058815,17.160924 6.28125,20.09375 2.2666586,20.646663 -0.69921244,24.862902 0.11714748,28.826804 0.69396943,32.528614 4.3500351,35.295394 8.0531848,35 13.498142,34.979277 18.945738,35.041925 24.389003,34.967703 28.012052,34.706771 30.775569,30.845122 29.836019,27.330847 29.833738,25.300645 26.765497,24.336816 28.355407,22.48894 29.815113,18.665861 27.745092,13.988203 23.952748,12.472903 22.972942,12.055889 21.908328,11.842683 20.84375,11.84375 z M 20.21875,13.59375 C 23.527165,13.23952 26.784739,15.868299 27.030581,19.205159 27.115191,20.410269 26.970056,22.322167 26.040039,22.926528 23.85825,22.779121 24.34015,19.916014 22.792045,18.711734 21.278161,16.832506 19.06924,15.524713 16.6875,15.125 17.664583,14.25896 18.917452,13.711132 20.21875,13.59375 z M 34.53125,14.5 C 32.976676,14.79175 31.359523,14.999412 29.84375,15.34375 29.432201,15.70465 29.988892,16.309044 30.057328,16.768486 30.153946,17.218356 30.409976,17.817605 30.892161,17.453583 32.226329,16.650798 33.669292,15.884461 34.9375,15.0625 35.138066,14.780605 34.838029,14.456276 34.53125,14.5 z M 15,16.75 C 18.527258,16.691328 21.880457,19.184293 22.875,22.5625 21.79535,22.747412 19.681154,23.400321 19.66679,24.380589 20.173956,24.71003 20.627331,25.845369 21.195407,25.029384 23.413999,23.416094 26.91018,24.431242 27.896354,26.999192 29.087621,29.561636 27.239462,32.866375 24.435283,33.198105 21.16923,33.314717 17.892696,33.218673 14.62245,33.25 11.957151,33.213512 9.2843705,33.327734 6.6243627,33.183689 3.2643734,32.772467 0.9055326,29.012617 2.003206,25.808244 2.6850371,23.482227 4.9843514,21.775323 7.40625,21.78125 8.6597695,18.794322 11.749593,16.71468 15,16.75 z M 30.46875,22.1875 C 30.056841,22.438736 30.028318,23.215643 29.779714,23.682554 29.505486,24.023058 29.684998,24.517691 30.15025,24.501295 31.642521,24.753547 33.129447,25.065901 34.625,25.28125 35.096754,25.222871 35.037983,24.560567 34.590363,24.47021 33.258254,23.721082 31.923603,22.888061 30.59375,22.1875 30.552083,22.1875 30.510417,22.1875 30.46875,22.1875 z"></path>
5150
</svg>
5251
</li>
52+
<li class="skewt" style="display:none">
53+
<svg width="35" height="40" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" version="1.1" version="1.1">
54+
<path style="fill:#ffffff" d="M64 400C64 408.8 71.16 416 80 416H480C497.7 416 512 430.3 512 448C512 465.7 497.7 480 480 480H80C35.82 480 0 444.2 0 400V64C0 46.33 14.33 32 32 32C49.67 32 64 46.33 64 64V400zM342.6 278.6C330.1 291.1 309.9 291.1 297.4 278.6L240 221.3L150.6 310.6C138.1 323.1 117.9 323.1 105.4 310.6C92.88 298.1 92.88 277.9 105.4 265.4L217.4 153.4C229.9 140.9 250.1 140.9 262.6 153.4L320 210.7L425.4 105.4C437.9 92.88 458.1 92.88 470.6 105.4C483.1 117.9 483.1 138.1 470.6 150.6L342.6 278.6z"></path>
55+
</svg>
56+
</li>
5357
<li class="about last"><i class="icon-question"></i></li>
5458
</ol>
5559
<span id="locate-me" style="display: none"><i class="icon-target"></i></span>
@@ -59,7 +63,7 @@
5963

6064
<div id="recoveriesbox" style="display: none" class="flatpage">
6165
<div class="slimContainer">
62-
<h2>Recoveries</h2>
66+
<h2><i class="icon-habhub rfloat"></i>Recoveries</h2>
6367
<hr/>
6468
<p>Recovery reports can be added on the Chase-Car pane.</p>
6569
<hr/>
@@ -223,8 +227,30 @@ <h4>Overlays</h4>
223227
</div>
224228
</div>
225229
</div>
230+
<div id="skewtbox" style="display: none" class="flatpage">
231+
<div class="slimContainer" style="width:400px!important">
232+
<h2>SkewT Diagram
233+
<svg width="35" height="40" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" version="1.1" class="rfloat">
234+
<path style="fill:#666666" d="M64 400C64 408.8 71.16 416 80 416H480C497.7 416 512 430.3 512 448C512 465.7 497.7 480 480 480H80C35.82 480 0 444.2 0 400V64C0 46.33 14.33 32 32 32C49.67 32 64 46.33 64 64V400zM342.6 278.6C330.1 291.1 309.9 291.1 297.4 278.6L240 221.3L150.6 310.6C138.1 323.1 117.9 323.1 105.4 310.6C92.88 298.1 92.88 277.9 105.4 265.4L217.4 153.4C229.9 140.9 250.1 140.9 262.6 153.4L320 210.7L425.4 105.4C437.9 92.88 458.1 92.88 470.6 105.4C483.1 117.9 483.1 138.1 470.6 150.6L342.6 278.6z"></path>
235+
</svg>
236+
</h2>
237+
<hr>
238+
<div style="display:flex;justify-content:center;">
239+
<span style="display:none;" id="skewtSerial"></span>
240+
</div>
241+
<div style="display:flex;justify-content:center;">
242+
<img style="width:90px;height:30px;display:none;" src="img/hab-spinner.gif" id="skewtLoading" />
243+
</div>
244+
<div id="skewt-plot" class="skew-t"></div>
245+
<br>
246+
<div style="display:flex;justify-content:center;">
247+
<button style="display:none;margin:0px 5px;" id="resetSkewt" onclick="skewTrefresh()">Reset Plot</button>
248+
<button style="display:none;margin:0px 5px;" id="deleteSkewt" onclick="skewTdelete()">Delete Plot</button>
249+
</div>
250+
</div>
251+
</div>
226252
<div id="weatherbox" style="display: none" class="flatpage">
227-
<div class="slimContainer">
253+
<div class="slimContainer">
228254
<h2>Weather
229255
<svg width="35" height="40" viewbox="0 0 35 40" xmlns="http://www.w3.org/2000/svg" version="1.1" version="1.1" class="rfloat">
230256
<path style="fill:#666666;" d="M 18.28125,5 C 17.665689,5.1577701 18.03897,6.072102 17.9375,6.6048171 17.961629,7.7933649 17.891319,9.0210305 17.96875,10.1875 18.260664,10.655295 18.988694,10.16755 19.495121,10.179003 19.915569,10.180314 20.482932,9.9817615 20.218593,9.5070668 19.685242,8.0689805 19.166647,6.5372411 18.625,5.15625 18.528924,5.0654291 18.420762,5.0014609 18.28125,5 z M 28.15625,6.78125 C 27.636383,7.0532274 27.291342,7.7650855 26.831767,8.2022559 26.183602,9.0036626 25.432231,9.7753304 24.84375,10.59375 24.760617,11.249334 25.657959,11.271078 26.078986,11.644576 26.390422,11.953835 26.933703,11.952146 27.000157,11.538317 27.50744,10.067568 28.117357,8.594139 28.5625,7.125 28.492656,6.9017107 28.410263,6.7690543 28.15625,6.78125 z M 9.5,10 C 9.0954231,10.135594 9.2373811,10.695886 9.5795967,10.908518 10.537018,12.015516 11.460558,13.256267 12.4375,14.28125 13.029751,14.410245 13.239648,13.580555 13.666521,13.22967 13.9948,13.00156 14.131018,12.482443 13.78125,12.375 12.489706,11.554805 11.012447,10.783392 9.71875,10 9.6458333,10 9.5729167,10 9.5,10 z M 20.84375,11.84375 C 18.371908,11.824599 15.919598,13.01633 14.4375,15 11.081301,15.152911 7.9058815,17.160924 6.28125,20.09375 2.2666586,20.646663 -0.69921244,24.862902 0.11714748,28.826804 0.69396943,32.528614 4.3500351,35.295394 8.0531848,35 13.498142,34.979277 18.945738,35.041925 24.389003,34.967703 28.012052,34.706771 30.775569,30.845122 29.836019,27.330847 29.833738,25.300645 26.765497,24.336816 28.355407,22.48894 29.815113,18.665861 27.745092,13.988203 23.952748,12.472903 22.972942,12.055889 21.908328,11.842683 20.84375,11.84375 z M 20.21875,13.59375 C 23.527165,13.23952 26.784739,15.868299 27.030581,19.205159 27.115191,20.410269 26.970056,22.322167 26.040039,22.926528 23.85825,22.779121 24.34015,19.916014 22.792045,18.711734 21.278161,16.832506 19.06924,15.524713 16.6875,15.125 17.664583,14.25896 18.917452,13.711132 20.21875,13.59375 z M 34.53125,14.5 C 32.976676,14.79175 31.359523,14.999412 29.84375,15.34375 29.432201,15.70465 29.988892,16.309044 30.057328,16.768486 30.153946,17.218356 30.409976,17.817605 30.892161,17.453583 32.226329,16.650798 33.669292,15.884461 34.9375,15.0625 35.138066,14.780605 34.838029,14.456276 34.53125,14.5 z M 15,16.75 C 18.527258,16.691328 21.880457,19.184293 22.875,22.5625 21.79535,22.747412 19.681154,23.400321 19.66679,24.380589 20.173956,24.71003 20.627331,25.845369 21.195407,25.029384 23.413999,23.416094 26.91018,24.431242 27.896354,26.999192 29.087621,29.561636 27.239462,32.866375 24.435283,33.198105 21.16923,33.314717 17.892696,33.218673 14.62245,33.25 11.957151,33.213512 9.2843705,33.327734 6.6243627,33.183689 3.2643734,32.772467 0.9055326,29.012617 2.003206,25.808244 2.6850371,23.482227 4.9843514,21.775323 7.40625,21.78125 8.6597695,18.794322 11.749593,16.71468 15,16.75 z M 30.46875,22.1875 C 30.056841,22.438736 30.028318,23.215643 29.779714,23.682554 29.505486,24.023058 29.684998,24.517691 30.15025,24.501295 31.642521,24.753547 33.129447,25.065901 34.625,25.28125 35.096754,25.222871 35.037983,24.560567 34.590363,24.47021 33.258254,23.721082 31.923603,22.888061 30.59375,22.1875 30.552083,22.1875 30.510417,22.1875 30.46875,22.1875 z" ></path>
@@ -236,7 +262,7 @@ <h2>Weather
236262
</div>
237263
<div id="chasecarbox" style="display: none" class="flatpage">
238264
<div class="slimContainer">
239-
<h2>Chase car mode</h2>
265+
<h2><i class="icon-car rfloat"></i>Chase Mode</h2>
240266
<hr>
241267
<div class="row option">
242268
<span>Enable</span>
@@ -358,20 +384,23 @@ <h3>Report Recovery</h3>
358384
</div>
359385
</div>
360386
<!-- Was 3.31-->
361-
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
387+
<script type="text/javascript" language="javascript" src="https://www.google.com/recaptcha/api.js" async defer></script>
388+
<script type="text/javascript" language="javascript" src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js" async defer></script>
389+
<script type="text/javascript" language="javascript" src="js/skewt.js"></script>
362390
<script type="text/javascript" language="javascript" src="js/aws-sdk-2.1029.0.min.js"></script>
363391
<script type="text/javascript" language="javascript" src="js/leaflet.js"></script>
364392
<script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js"></script>
365393
<script type="text/javascript" language="javascript" src="js/L.Terminator.js"></script>
366394
<script type="text/javascript" language="javascript" src="js/L.TileLayer.NoGap.js"></script>
367395
<script type="text/javascript" language="javascript" src="js/paho-mqtt.js"></script>
368-
<script src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js" async defer></script>
369396
<!--
370397
<script type="text/javascript" language="javascript" src="js/iscroll.js"></script>
371398
<script type="text/javascript" language="javascript" src="js/jquery-1.12.4-min.js"></script>
399+
<script type="text/javascript" language="javascript" src="js/jquery-ui.min.js"></script>
372400
<script type="text/javascript" language="javascript" src="js/chasecar.lib.js"></script>
373401
<script type="text/javascript" language="javascript" src="js/tracker.js"></script>
374-
<script type="text/javascript" language="javascript" src="js/app.js"></script>
402+
<script type="text/javascript" language="javascript" src="js/tracker.js"></script>
403+
<script type="text/javascript" language="javascript" src="js/color-map.js"></script>
375404
-->
376405
<script type="text/javascript" language="javascript" src="js/mobile.js"></script>
377406
<script type="text/javascript" language="javascript" src="js/rbush.js"></script>

‎js/skewt.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)