From a5c8b160dba113f740fea6c378116dc0829d49eb Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Fri, 21 Aug 2015 13:24:11 +0100 Subject: [PATCH 01/50] prefix flight docid for habitat archieve payloads --- js/tracker.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/tracker.js b/js/tracker.js index 6884b23..546bdb0 100644 --- a/js/tracker.js +++ b/js/tracker.js @@ -2321,7 +2321,7 @@ function refreshPredictions() { }); } -function habitat_translation_layer(json_result) { +function habitat_translation_layer(json_result, prefix) { if(json_result.rows.length === 0) { habitat_payload_step(true); return; @@ -2349,7 +2349,7 @@ function habitat_translation_layer(json_result) { var row = { 'position_id': 0, - 'vehicle': doc.data.payload, + 'vehicle': prefix + doc.data.payload, 'server_time': doc.data._parsed.time_parsed, 'sequence': doc.data.sentence_id, 'gps_lat': doc.data.latitude, @@ -2404,12 +2404,13 @@ function habitat_payload_step(remove_current) { habitat_payload_step_data.idx += 1; habitat_payload_step_data.idx = habitat_payload_step_data.idx % habitat_payload_step_data.payloads.length; + var prefix = habitat_payload_step_data.payloads[habitat_payload_step_data.idx].prefix; var url = habitat_payload_step_data.payloads[habitat_payload_step_data.idx].url; url += habitat_payload_step_data.payloads[habitat_payload_step_data.idx].skip; habitat_payload_step_data.payloads[habitat_payload_step_data.idx].skip += habitat_max; ajax_positions = $.getJSON(url, function(response) { - habitat_translation_layer(response); + habitat_translation_layer(response, prefix); }); } @@ -2451,6 +2452,7 @@ function habitat_doc_step(hab_docs) { url = url.replace("{START}", ts_start).replace("{END}", ts_end); habitat_payload_step_data.payloads.push({ + prefix: response._id.substr(-4) + "/", url: url, skip: 0, }); From 3bb3baf6e7dda4faf00b4d2383e19a487a2ce0af Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Sun, 11 Oct 2015 14:18:20 +0300 Subject: [PATCH 02/50] fix calender localization to only english --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index db7c0f1..85a8352 100644 --- a/index.html +++ b/index.html @@ -87,7 +87,7 @@

Welcome


- +

Want to track with Google Earth instead?
Just click here

From 00a12f3a8609927a75365b29386cca12e295c98b Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Sun, 11 Oct 2015 14:27:20 +0300 Subject: [PATCH 03/50] change localization to en_GB for 24hr time --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 85a8352..5246a85 100644 --- a/index.html +++ b/index.html @@ -87,7 +87,7 @@

Welcome


- +

Want to track with Google Earth instead?
Just click here

From 9111808131a20b33ed8f1d78e063578bc97f698f Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Thu, 28 Jan 2016 14:53:41 +0000 Subject: [PATCH 04/50] make path infobox available for habitat flights --- js/tracker.js | 102 +++++++++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 38 deletions(-) diff --git a/js/tracker.js b/js/tracker.js index 546bdb0..7cf1b89 100644 --- a/js/tracker.js +++ b/js/tracker.js @@ -1301,7 +1301,25 @@ var mapInfoBox_handle_path = function(event) { }; var mapInfoBox_handle_path_fetch = function(id,vehicle) { - $.getJSON("http://spacenear.us/tracker/datanew.php?mode=single&format=json&position_id=" + id, function(data) { + var ishabitat = id.length == 64 + + if(ishabitat) { + var url = 'http://habitat.habhub.org/habitat/' + id; + } else { + var url = "http://spacenear.us/tracker/datanew.php?mode=single&format=json&position_id=" + id; + } + + $.getJSON(url, function(data) { + if(ishabitat) { + var encap = {positions: { position: [] }}; + + if(!data.hasOwnProperty('error')) { + data._id = data._id.substring(58); + encap.positions.position.push(habitat_doc_to_snus(data)); + data = encap; + } + } + if('positions' in data && data.positions.position.length === 0) { mapInfoBox.setContent("not found"); mapInfoBox.open(map); @@ -2333,48 +2351,13 @@ function habitat_translation_layer(json_result, prefix) { result.fetch_timestamp = Date.now(); $("#stTimer").attr("data-timestamp", result.fetch_timestamp); - var blacklist = { - altitude: 1, - date: 1, - latitude: 1, - longitude: 1, - payload: 1, - sentence_id: 1, - time: 1, - }; - for(var i in json_result) { var doc = json_result[i].doc; - if(doc.data.latitude === 0 && doc.data.longitude === 0) continue; - - var row = { - 'position_id': 0, - 'vehicle': prefix + doc.data.payload, - 'server_time': doc.data._parsed.time_parsed, - 'sequence': doc.data.sentence_id, - 'gps_lat': doc.data.latitude, - 'gps_lon': doc.data.longitude, - 'gps_alt': doc.data.altitude, - 'callsign': "HABITAT ARCHIVE", - 'data': {} - }; - - try { - row.gps_time = "20" + doc.data.date.replace(/([0-9]{2})/g, "$1-") + doc.data.time; - } catch (e) { - row.gps_time = row.server_time; - } - // move all other properties as data - for(var x in doc.data) { - // skip internal and reserved vars - if(x[0] == '_' || blacklist.hasOwnProperty(x)) continue; + if(doc.data.latitude === 0 && doc.data.longitude === 0) continue; - row.data[x] = doc.data[x]; - } - row.data = JSON.stringify(row.data); + var row = habitat_doc_to_snus(doc, prefix); - // append the packet result.positions.position.push(row); } @@ -2386,6 +2369,49 @@ function habitat_translation_layer(json_result, prefix) { }, 500); } +var habitat_field_blacklist = { + altitude: 1, + date: 1, + latitude: 1, + longitude: 1, + payload: 1, + sentence_id: 1, + time: 1, +}; + +function habitat_doc_to_snus(doc, prefix) { + prefix = prefix || ''; + + var row = { + 'position_id': doc._id, + 'vehicle': prefix + doc.data.payload, + 'server_time': doc.data._parsed.time_parsed, + 'sequence': doc.data.sentence_id, + 'gps_lat': doc.data.latitude, + 'gps_lon': doc.data.longitude, + 'gps_alt': doc.data.altitude, + 'callsign': "HABITAT ARCHIVE", + 'data': {} + }; + + try { + row.gps_time = "20" + doc.data.date.replace(/([0-9]{2})/g, "$1-") + doc.data.time; + } catch (e) { + row.gps_time = row.server_time; + } + + // move all other properties as data + for(var x in doc.data) { + // skip internal and reserved vars + if(x[0] == '_' || habitat_field_blacklist.hasOwnProperty(x)) continue; + + row.data[x] = doc.data[x]; + } + row.data = JSON.stringify(row.data); + + return row; +} + var habitat_payload_step_data; function habitat_payload_step(remove_current) { From bcbd5b8c07cf87eb7e5226ed46a34233bff8bb5a Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Thu, 28 Jan 2016 14:54:11 +0000 Subject: [PATCH 05/50] revert not using mobile.js --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 5246a85..0101efb 100644 --- a/index.html +++ b/index.html @@ -303,9 +303,8 @@

Chase car mode

- + +