diff --git a/tracking-dashboard/backend/mqtt-syncer.py b/tracking-dashboard/backend/mqtt-syncer.py index bd48db9..6c06d96 100644 --- a/tracking-dashboard/backend/mqtt-syncer.py +++ b/tracking-dashboard/backend/mqtt-syncer.py @@ -160,7 +160,7 @@ def on_message(client, userdata, message): # if key is "ss" (seconds), add message to db - if key == "lat" or key == "lon": + if key == "lat" or key == "lon" or key == "alt": # add message to db msg = build_json_message(id) if msg is None: @@ -181,9 +181,9 @@ def on_message(client, userdata, message): return # check if lat, lon, or alt changed - if 'lat' in message_building[id] and 'lon' in message_building[id]: + if 'lat' in message_building[id] and 'lon' in message_building[id] and 'alt' in message_building[id]: if id in old_messages: - if message_building[id]['lat'] == old_messages[id]['lat'] and message_building[id]['lon'] == old_messages[id]['lon']: + if (message_building[id]['lat'] == old_messages[id]['lat'] and message_building[id]['lon'] == old_messages[id]['lon'] and message_building[id]['alt'] == old_messages[id]['alt']): # send telemetry data to mqtt if 'telemetry' in src['data']: topic = "TELEMETRY/" + message_building[id]['name'] + "-" + str(message_building[id]['ssid']) @@ -196,6 +196,8 @@ def on_message(client, userdata, message): message_building[id]['lat'] = payload elif key == "lon": message_building[id]['lon'] = payload + elif key == "alt": + message_building[id]['alt'] = payload return try: @@ -213,6 +215,8 @@ def on_message(client, userdata, message): message_building[id]['lat'] = payload elif key == "lon": message_building[id]['lon'] = payload + elif key == "alt": + message_building[id]['alt'] = payload return elif key == "spd": # convert speed to mph from knots diff --git a/tracking-dashboard/frontend/index.html b/tracking-dashboard/frontend/index.html index d5863e7..5e0a959 100644 --- a/tracking-dashboard/frontend/index.html +++ b/tracking-dashboard/frontend/index.html @@ -2,7 +2,7 @@ - + Balloon Tracking Map @@ -24,6 +24,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/tracking-dashboard/frontend/main.js b/tracking-dashboard/frontend/main.js index 2d05a70..a0d31de 100644 --- a/tracking-dashboard/frontend/main.js +++ b/tracking-dashboard/frontend/main.js @@ -1,3 +1,5 @@ +const versionNumber = "Version: 1.0.5"; + // boolean to tell us if we've been offline and need to re-request old track data let needData = true; @@ -114,7 +116,7 @@ const settings = () => { // create p element for version number const version = document.createElement("p"); // TODO: get version number from service-worker.js - version.innerText = "Version: 1.0.4"; + version.innerText = versionNumber; // create button for debug logs const debug = `
Debug Logs
`; diff --git a/tracking-dashboard/frontend/metatags.txt b/tracking-dashboard/frontend/metatags.txt new file mode 100644 index 0000000..e1815d9 --- /dev/null +++ b/tracking-dashboard/frontend/metatags.txt @@ -0,0 +1,40 @@ + 1. Upload the files from the /images folder to your server + + 2. Copy the tags below between the and tags in your HTML template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3. Don't want to bother with these meta tags and images? Sign up to progressier.com for a one-liner version. \ No newline at end of file diff --git a/tracking-dashboard/frontend/service-worker.js b/tracking-dashboard/frontend/service-worker.js index 57c4452..cf33572 100644 --- a/tracking-dashboard/frontend/service-worker.js +++ b/tracking-dashboard/frontend/service-worker.js @@ -1,4 +1,4 @@ -const CACHE_NAME = "balloon-map-cache-v1.0.4"; +const CACHE_NAME = "balloon-map-cache-v1.0.5"; const urlsToCache = [ "/", "/main.js", diff --git a/tracking-dashboard/frontend/splash_screens/10.2__iPad_landscape.png b/tracking-dashboard/frontend/splash_screens/10.2__iPad_landscape.png new file mode 100644 index 0000000..898b0ed Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/10.2__iPad_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/10.2__iPad_portrait.png b/tracking-dashboard/frontend/splash_screens/10.2__iPad_portrait.png new file mode 100644 index 0000000..e249168 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/10.2__iPad_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/10.5__iPad_Air_landscape.png b/tracking-dashboard/frontend/splash_screens/10.5__iPad_Air_landscape.png new file mode 100644 index 0000000..4db4c41 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/10.5__iPad_Air_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/10.5__iPad_Air_portrait.png b/tracking-dashboard/frontend/splash_screens/10.5__iPad_Air_portrait.png new file mode 100644 index 0000000..f8a6aef Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/10.5__iPad_Air_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/10.9__iPad_Air_landscape.png b/tracking-dashboard/frontend/splash_screens/10.9__iPad_Air_landscape.png new file mode 100644 index 0000000..fe0c9df Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/10.9__iPad_Air_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/10.9__iPad_Air_portrait.png b/tracking-dashboard/frontend/splash_screens/10.9__iPad_Air_portrait.png new file mode 100644 index 0000000..4698484 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/10.9__iPad_Air_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png b/tracking-dashboard/frontend/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png new file mode 100644 index 0000000..d8a8972 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png b/tracking-dashboard/frontend/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png new file mode 100644 index 0000000..a7ad2bf Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/12.9__iPad_Pro_landscape.png b/tracking-dashboard/frontend/splash_screens/12.9__iPad_Pro_landscape.png new file mode 100644 index 0000000..2e35a22 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/12.9__iPad_Pro_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/12.9__iPad_Pro_portrait.png b/tracking-dashboard/frontend/splash_screens/12.9__iPad_Pro_portrait.png new file mode 100644 index 0000000..6bd200d Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/12.9__iPad_Pro_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png b/tracking-dashboard/frontend/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png new file mode 100644 index 0000000..bed550a Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png b/tracking-dashboard/frontend/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png new file mode 100644 index 0000000..6d09466 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/8.3__iPad_Mini_landscape.png b/tracking-dashboard/frontend/splash_screens/8.3__iPad_Mini_landscape.png new file mode 100644 index 0000000..8f47ab0 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/8.3__iPad_Mini_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/8.3__iPad_Mini_portrait.png b/tracking-dashboard/frontend/splash_screens/8.3__iPad_Mini_portrait.png new file mode 100644 index 0000000..5509c1a Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/8.3__iPad_Mini_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png b/tracking-dashboard/frontend/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png new file mode 100644 index 0000000..592d608 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png b/tracking-dashboard/frontend/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png new file mode 100644 index 0000000..1db52e1 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png new file mode 100644 index 0000000..95efa06 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png new file mode 100644 index 0000000..7b13e7c Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_11__iPhone_XR_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_11__iPhone_XR_landscape.png new file mode 100644 index 0000000..606ad77 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_11__iPhone_XR_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_11__iPhone_XR_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_11__iPhone_XR_portrait.png new file mode 100644 index 0000000..d817242 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_11__iPhone_XR_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png new file mode 100644 index 0000000..02af856 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png new file mode 100644 index 0000000..50d2147 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png new file mode 100644 index 0000000..9434e09 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png new file mode 100644 index 0000000..a3d07b8 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png new file mode 100644 index 0000000..2dfe75b Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png new file mode 100644 index 0000000..cc0e5d1 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png new file mode 100644 index 0000000..11ed791 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png new file mode 100644 index 0000000..09fdc44 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png new file mode 100644 index 0000000..3a654f6 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png new file mode 100644 index 0000000..d49deb7 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png new file mode 100644 index 0000000..6b6af73 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png new file mode 100644 index 0000000..74dff73 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png b/tracking-dashboard/frontend/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png new file mode 100644 index 0000000..98f364b Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png differ diff --git a/tracking-dashboard/frontend/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png b/tracking-dashboard/frontend/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png new file mode 100644 index 0000000..d4c72b1 Binary files /dev/null and b/tracking-dashboard/frontend/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png differ