Skip to content

Commit 2ae2911

Browse files
argiloargilo
committed
Remove YUI Compressor and use plain JavaScript
1 parent 8f0940f commit 2ae2911

12 files changed

+75
-195
lines changed

‎.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
*.swp
22
*.pyc
33
*.log
4-
js/mobile.js
5-
js/init_plot.js
6-
css/mobile.css
7-
cache.manifest
4+
/index.html
5+
/service-worker.js
86
tiles/

‎.htaccess

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎DEVELOPER_README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ To get a copy of the code and run a test web server:
44

55
1. [Fork the repository](https://github.com/projecthorus/sondehub-amateur-tracker/fork) by visiting [https://github.com/projecthorus/sondehub-amateur-tracker/fork](https://github.com/projecthorus/sondehub-amateur-tracker/fork).
66
2. Clone the repository with your git tool of choice.
7-
3. Run `build.sh` to compile the javascript files. (This requires Java to be installed and in your path.)
7+
3. Run `build.sh` to generate `index.html` and `service-worker.js`.
88
4. Run `python serve.py` to run a simple web server to (This requires python 3.x)
99
5. Visit [http://localhost:8000](http://localhost:8000) to view the local version of the server!

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ Pull requests are welcome.
3131

3232
## Installation
3333

34-
Requirements: Java
35-
3634
$ git clone https://github.com/projecthorus/sondehub-amateur-tracker.git
3735
$ ./build.sh
36+
$ python serve.py
37+
38+
Visit [http://localhost:8000](http://localhost:8000) to view the local version of the tracker!
3839

3940
## Original design
4041

‎build.sh

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,18 @@
11
#!/bin/bash
22

3-
# compile stylesheet
4-
echo -n "Compiling CSS... "
5-
cd css
6-
rm -f mobile.css
7-
cat base.css skeleton.css layout.css habitat-font.css main.css leaflet.css leaflet.fullscreen.css > mobile.tmp
8-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=css mobile.tmp > mobile.css
9-
rm -f mobile.tmp
10-
cd ..
11-
echo "Done!"
12-
13-
#compile javascript
14-
echo -n "Compiling JavaScript... "
15-
cd js
16-
rm -f mobile.js init_plot.js
17-
# precompiled libs
18-
cat jquery* >> mobile.js
3+
set -e
194

205
VERSION="`git rev-parse --short HEAD`"
21-
226
BUILD_DATE="`date -u +%Y-%m-%dT%H:%M:%SZ`"
237

24-
# compile the rest
25-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge iscroll.js >> mobile.js
26-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge chasecar.lib.js | sed "s/{VER}/$VERSION/" >> mobile.js
27-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge tracker.js >> mobile.js
28-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge app.js | sed "s/{VER}/$VERSION/" | sed "s/{BUILD_DATE}/$BUILD_DATE/" >> mobile.js
29-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge colour-map.js >> mobile.js
30-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge suncalc.js >> mobile.js
31-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge format.js >> mobile.js
32-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge flight_doc.js >> mobile.js
33-
348

35-
#compile plot lib and config
36-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge _jquery.flot.js >> init_plot.js
37-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge plot_config.js >> init_plot.js
38-
39-
cd ..
9+
# cache fixes
10+
echo -n "Generating index.html... "
11+
sed -e "s/{VER}/$VERSION/" -e "s/{BUILD_DATE}/$BUILD_DATE/" index.template.html > index.html
4012
echo "Done!"
41-
echo -n "Generate cache.manifest..."
42-
43-
44-
sed "s/^\(# version\) .*$/\1 $VERSION `date +%s`/" cache.manifest-dev > cache.manifest
4513

14+
echo -n "Generating service-worker.js... "
15+
sed -e "s/{VER}/$VERSION/" service-worker.template.js > service-worker.js
4616
echo "Done!"
4717

48-
echo "Build version: $VERSION Build date: $BUILD_DATE"
18+
echo "Build version: $VERSION Build date: $BUILD_DATE"

‎cache.manifest-dev

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎index.html renamed to ‎index.template.html

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,35 @@
1919
<link rel="icon" type="image/x-icon" href="favicon.ico" />
2020
<link rel="manifest" href="manifest.json">
2121

22-
<link rel="stylesheet" href="css/mobile.css"/>
22+
<link rel="stylesheet" href="css/base.css"/>
23+
<link rel="stylesheet" href="css/skeleton.css"/>
24+
<link rel="stylesheet" href="css/layout.css"/>
25+
<link rel="stylesheet" href="css/habitat-font.css"/>
26+
<link rel="stylesheet" href="css/main.css"/>
27+
<link rel="stylesheet" href="css/leaflet.css"/>
28+
<link rel="stylesheet" href="css/leaflet.fullscreen.css"/>
2329

30+
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.1130.0.min.js"></script>
31+
<script type="text/javascript" language="javascript" src="js/leaflet.js?v={VER}"></script>
32+
<script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js?v={VER}"></script>
33+
<script type="text/javascript" language="javascript" src="js/L.Terminator.js?v={VER}"></script>
34+
<script type="text/javascript" language="javascript" src="js/L.TileLayer.NoGap.js?v={VER}"></script>
35+
<script type="text/javascript" language="javascript" src="js/leaflet.antimeridian-src.js?v={VER}"></script>
36+
<script type="text/javascript" language="javascript" src="js/paho-mqtt.js?v={VER}"></script>
37+
38+
<script type="text/javascript" language="javascript" src="js/jquery-1.12.4-min.js"></script>
39+
<script type="text/javascript" language="javascript" src="js/iscroll.js?v={VER}"></script>
40+
<script type="text/javascript" language="javascript" src="js/chasecar.lib.js?v={VER}"></script>
41+
<script type="text/javascript" language="javascript" src="js/sondehub.js?v={VER}"></script>
42+
<script type="text/javascript" language="javascript" src="js/colour-map.js?v={VER}"></script>
43+
<script type="text/javascript" language="javascript" src="js/suncalc.js?v={VER}"></script>
44+
<script type="text/javascript" language="javascript" src="js/format.js?v={VER}"></script>
45+
46+
<script type="text/javascript" language="javascript" src="js/rbush.js?v={VER}"></script>
47+
<script type="text/javascript" language="javascript" src="js/pwa.js?v={VER}"></script>
48+
2449
</head>
25-
<body>
50+
<body data-version="{VER}">
2651

2752
<div id="loading">
2853
<div>
@@ -131,9 +156,10 @@ <h4>Contribute</h4>
131156
<a href="https://github.com/projecthorus/sondehub-amateur-tracker" target="_blank" rel="noopener">github/sondehub-amateur-tracker</a>.
132157
Bug reports, suggestions and pull requests are welcome. A huge thanks to RGP for developing the mobile tracker that this site is based on.
133158
<br/><br/>
134-
Tracker Revision: <span class="r" id="build_version"></span>
159+
Tracker Revision: <span class="r">{VER}</span>
135160
<br/>
136-
Build Date: <span class="r" id="build_date"></span>
161+
Build Date: <span class="r">{BUILD_DATE}</span>
162+
137163
</p>
138164
</div>
139165
</div>
@@ -380,26 +406,10 @@ <h2>Prediction Settings</h2>
380406
</div>
381407
</div>
382408
<!-- Was 3.31-->
409+
410+
<script type="text/javascript" language="javascript" src="js/app.js?v={VER}"></script>
411+
<script type="text/javascript" language="javascript" src="js/flight_doc.js?v={VER}"></script>
412+
383413
<script type="text/javascript" language="javascript" src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js" async defer></script>
384-
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.1130.0.min.js"></script>
385-
<script type="text/javascript" language="javascript" src="js/leaflet.js"></script>
386-
<script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js"></script>
387-
<script type="text/javascript" language="javascript" src="js/L.Terminator.js"></script>
388-
<script type="text/javascript" language="javascript" src="js/L.TileLayer.NoGap.js"></script>
389-
<script type="text/javascript" language="javascript" src="js/leaflet.antimeridian-src.js"></script>
390-
<script type="text/javascript" language="javascript" src="js/paho-mqtt.js"></script>
391-
<!--
392-
<script type="text/javascript" language="javascript" src="js/iscroll.js"></script>
393-
<script type="text/javascript" language="javascript" src="js/jquery-1.12.4-min.js"></script>
394-
<script type="text/javascript" language="javascript" src="js/jquery-ui.min.js"></script>
395-
<script type="text/javascript" language="javascript" src="js/chasecar.lib.js"></script>
396-
<script type="text/javascript" language="javascript" src="js/tracker.js"></script>
397-
<script type="text/javascript" language="javascript" src="js/tracker.js"></script>
398-
<script type="text/javascript" language="javascript" src="js/color-map.js"></script>
399-
-->
400-
<script type="text/javascript" language="javascript" src="js/mobile.js"></script>
401-
<script type="text/javascript" language="javascript" src="js/rbush.js"></script>
402-
<script type="text/javascript" language="javascript" src="js/pwa.js"></script>
403-
404414
</body>
405415
</html>

‎js/app.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,17 @@ function trackerInit() {
197197
if(is_mobile || wvar.enabled) $(".nav .wvar").hide();
198198

199199
if(!is_mobile) {
200-
$.getScript("js/init_plot.js", function() { checkSize(); if(!map) load(); });
200+
$.getScript("js/_jquery.flot.js", function() {
201+
$.getScript("js/plot_config.js", function() { checkSize(); if(!map) load(); });
202+
});
201203
if(wvar.graph) $('#telemetry_graph').attr('style','');
202204

203205
return;
204206
}
205207
if(!map) load();
206208
}
207209

208-
// if for some reason, applicationCache is not working, load the app after a 3s timeout
210+
// load the app after a 3s timeout
209211
var initTimer = setTimeout(trackerInit, 3000);
210212

211213
var listScroll;
@@ -362,7 +364,7 @@ var positionUpdateHandle = function(position) {
362364
}
363365
else { return; }
364366

365-
// add/update marker on the map (tracker.js)
367+
// add/update marker on the map (sondehub.js)
366368
updateCurrentPosition(lat, lon);
367369

368370
// round the coordinates
@@ -463,10 +465,6 @@ $(window).ready(function() {
463465
updateTime(new Date());
464466
}, 1000);
465467

466-
// Update Tracker version info
467-
$('#build_version').text("{VER}");
468-
$('#build_date').text("{BUILD_DATE}");
469-
470468
// resize elements if needed
471469
checkSize();
472470

‎js/chasecar.lib.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ChaseCar.updatePosition = function(callsign, position) {
2323

2424
var _doc = {
2525
"software_name": "SondeHub-Amateur",
26-
"software_version": "{VER}",
26+
"software_version": document.body.dataset.version,
2727
"uploader_callsign": callsign,
2828
"uploader_position": [position.coords.latitude, position.coords.longitude, _position_alt],
2929
"uploader_antenna": "Mobile Station",
@@ -39,4 +39,4 @@ ChaseCar.updatePosition = function(callsign, position) {
3939
dataType: "json",
4040
data: JSON.stringify(_doc),
4141
});
42-
};
42+
};

‎js/tracker.js renamed to ‎js/sondehub.js

File renamed without changes.

0 commit comments

Comments
 (0)