renamed embed var to wvar

Author: rossengeorgiev

js/app.js

@@ -11,11 +11,11 @@ if(
  || navigator.userAgent.match(/BlackBerry/i)
  ) is_mobile = true;
 
-// embed detection
+// wvar detection
 var vfilter = "";
 var nyan_mode = false;
 
-var embed = {
+var wvar = {
     enabled: false,
     vlist: true,
     graph: true,
@@ -31,21 +31,21 @@ for(var idx in params) {
     if(line.length < 2) continue;
 
     switch(line[0]) {
-        case "embed": if(line[1] == "1") embed.enabled = true; break;
-        case "hidelist": if(line[1] == "1") embed.vlist = false; break;
-        case "hidegraph": if(line[1] == "1") embed.graph = false; break;
-        case "expandgraph": if(line[1] == "1") embed.graph_expanded = true; break;
+        case "wvar": if(line[1] == "1") wvar.enabled = true; break;
+        case "hidelist": if(line[1] == "1") wvar.vlist = false; break;
+        case "hidegraph": if(line[1] == "1") wvar.graph = false; break;
+        case "expandgraph": if(line[1] == "1") wvar.graph_expanded = true; break;
         case "filter": vfilter = line[1]; break;
         case "nyan": nyan_mode = true; break;
-        case "latestonly": embed.latestonly = (parseInt(line[1]) == 1) ? true : false; break;
-        case "focus": embed.focus = line[1]; break;
-        case "docid": embed.docid = line[1]; break;
+        case "latestonly": wvar.latestonly = (parseInt(line[1]) == 1) ? true : false; break;
+        case "focus": wvar.focus = line[1]; break;
+        case "docid": wvar.docid = line[1]; break;
     }
 }
 
-if(embed.latestonly) $("#latestonly").show();
+if(wvar.latestonly) $("#latestonly").show();
 
-if(embed.enabled) {
+if(wvar.enabled) {
     //analytics
     if(typeof _gaq == 'object') _gaq.push(['_trackEvent', 'Functionality', 'Embed Opts', window.location.search]);
 }
@@ -103,11 +103,11 @@ function trackerInit() {
 
     if(map) return;
 
-    if(is_mobile || embed.enabled) $(".nav .embed").hide();
+    if(is_mobile || wvar.enabled) $(".nav .wvar").hide();
 
     if(!is_mobile) {
         $.getScript("js/init_plot.js", function() { checkSize(); if(!map) load(); });
-        if(embed.graph) $('#telemetry_graph').attr('style','');
+        if(wvar.graph) $('#telemetry_graph').attr('style','');
 
         // fetch hysplit jobs
         setInterval(refresh_hysplit, 60 * 1000);
@@ -153,7 +153,7 @@ function checkSize() {
 
     $("#mapscreen,.flatpage").height(h-hh-5);
 
-    sw = (embed.vlist) ? 199 : 0;
+    sw = (wvar.vlist) ? 199 : 0;
 
     $('.container').width(w-20);
 
@@ -169,7 +169,7 @@ function checkSize() {
         $('#main').width(sw);
     } else { // portrait mode
         //if(h < 420) h = 420;
-        var mh = (embed.vlist) ? 180 : 0;
+        var mh = (wvar.vlist) ? 180 : 0;
 
         $('body,#loading').height(h);
         $('#map,#mapscreen').height(h-hh-5-mh);
@@ -399,7 +399,7 @@ $(window).ready(function() {
     });
 
     // expand graph on startup, if nessary
-    if(embed.graph_expanded) $('#telemetry_graph .graph_label').click();
+    if(wvar.graph_expanded) $('#telemetry_graph .graph_label').click();
 
     // hysplit button
     $("#main").on('click','.row .data .hysplit', function(event) {
@@ -684,7 +684,7 @@ $(window).ready(function() {
     if(navigator.geolocation) {
         // if we have geolocation services, show the locate me button
         // the button pants the map to the user current location
-        if(is_mobile && !embed.enabled) $(".chasecar").show();
+        if(is_mobile && !wvar.enabled) $(".chasecar").show();
         $("#locate-me,#app_name").attr('style','').click(function() {
             if(map && currentPosition) {
                 // disable following of vehicles

js/tracker.js

@@ -792,7 +792,7 @@ function updateVehicleInfo(index, newPosition) {
   $('.landscape .vehicle'+index).html(a + l + b);
 
   // redraw canvas
-  if(!embed.latestonly && vehicles[index].graph_data.length) {
+  if(!wvar.latestonly && vehicles[index].graph_data.length) {
       var c = $('.vehicle'+index+' .graph');
       drawAltitudeProfile(c.get(0), c.get(1), vehicles[index].graph_data[0], vehicles[index].max_alt);
   }
@@ -1350,7 +1350,7 @@ function addPosition(position) {
              }
 
             // add the new position
-            if(embed.latestonly) {
+            if(wvar.latestonly) {
                 vehicle.num_positions= 1;
                 vehicle.positions.push(new_latlng);
                 vehicle.positions_ts.push(new_ts);
@@ -1626,7 +1626,7 @@ function refresh() {
   //if(typeof _gaq == 'object') _gaq.push(['_trackEvent', 'ajax', 'refresh', 'Vehicles']);
   //
   var data_str = "type=positions&format=json&max_positions=" + max_positions + "&position_id=" + position_id + "&vehicles=" + encodeURIComponent(vfilter);
-  if(embed.latestonly) data_str = "mode=latest&" + data_str;
+  if(wvar.latestonly) data_str = "mode=latest&" + data_str;
 
   $.ajax({
     type: "GET",
@@ -1756,7 +1756,7 @@ function habitat_translation_layer(json_result, url, skip) {
 function initHabitat() {
     $.ajax({
         type: "GET",
-        url: habitat_url + embed.docid,
+        url: habitat_url + wvar.docid,
         data: "",
         dataType: "json",
         success: function(response, textStatus) {
@@ -1803,7 +1803,7 @@ function startAjax() {
 
     // the periodical starts here, the * 1000 is because milliseconds required
 
-    if(embed.docid != "") {
+    if(wvar.docid != "") {
         initHabitat();
     }
     else {
@@ -2038,7 +2038,7 @@ function update(response) {
           if(follow_vehicle != -1 && vehicles[follow_vehicle].graph_data_updated) updateGraph(follow_vehicle, false);
 
           // store in localStorage
-          if(embed.docid == "") offline.set('positions', ctx.lastPositions);
+          if(wvar.docid == "") offline.set('positions', ctx.lastPositions);
 
           if (got_positions && !zoomed_in && vehicles.length) {
               zoom_on_payload();
@@ -2054,8 +2054,8 @@ function zoom_on_payload() {
     // find a the first balloon
     var i = -1, ii = vehicles.length;
 
-    if(embed.focus != "" && vehicle_names.indexOf(embed.focus) > -1) {
-        i = vehicle_names.indexOf(embed.focus);
+    if(wvar.focus != "" && vehicle_names.indexOf(wvar.focus) > -1) {
+        i = vehicle_names.indexOf(wvar.focus);
     } else {
         while(++i < ii) if(vehicles[i].vehicle_type == "balloon") break;
     }