Merge branch 'beta', LOS lines + css tweaks

6a400f9 - increased map size in portrait mode
6733091 - fix css bug, cause by my+vim; f392993
9d3eec3 - added LOS lines from selected balloon to receivers

Author: rossengeorgiev

css/main.css

@@ -435,7 +435,7 @@ header .search form input[type='submit'] {
     position: absolute;
     z-index: 2;
     bottom: 40%;
-    right: 25%;
+    right: 30%;
     opacity: 0.6;
     width: 46px;
     height: 84px;
@@ -740,7 +740,7 @@ header .search form input[type='submit'] {
         height: 225px;
     }
     #main {
-        height: 180px;
+        height: 150px;
     }
     #main .data {
         height: 140px;
@@ -749,17 +749,16 @@ header .search form input[type='submit'] {
         float: left;
         width: 65%;
         padding-left: 5px;
-        padding-right: 20px;
     }
     #main .data .right {
         float: right;
         padding-right: 10px;
-        width: 20%;
+        width: 25%;
     }
     #main .data dl > dt {
         color: #000;
-        l120ne-height: 11px;
-        margin-top: 15px;
+        line-height: 11px;
+        margin-top: 7px;
         font-weight: bold;
         font-size: 14px;
     }

js/app.js

@@ -314,7 +314,7 @@ function checkSize() {
         $('#main').width(sw);
     } else { // portrait mode
         //if(h < 420) h = 420;
-        var mh = (wvar.vlist) ? 180 : 0;
+        var mh = (wvar.vlist) ? 150 : 0;
 
         $('body,#loading').height(h);
         $('#map,#mapscreen').height(h-hh-5-mh);

js/tracker.js

@@ -681,6 +681,51 @@ function updateZoom() {
     }
 }
 
+var los_polylines = [];
+
+function drawLOSPaths(vcallsign) {
+    los_polylines.forEach(function(polyline) {
+        polyline.setMap(null);
+    });
+    los_polylines = [];
+
+    if(offline.get('opt_hide_receivers')) return;
+
+    var vehicle = vehicles[vcallsign];
+
+    if(vehicle === undefined || vehicle.vehicle_type !== "balloon") return;
+
+    var callsigns = vehicle.curr_position.callsign.split(',');
+
+    callsigns.forEach(function(callsign) {
+        callsign = callsign.trim(' ');
+
+        var r_index = receiver_names.indexOf(callsign);
+
+        if(r_index === -1) return;
+
+        var path = [
+            vehicle.marker_shadow.getPosition(),
+            receivers[r_index].marker.getPosition(),
+        ];
+
+        var p = new google.maps.Polyline({
+            map: map,
+            path: path,
+            zIndex: Z_PATH,
+            strokeColor: '#0F0',
+            strokeOpacity: 0.8,
+            strokeWeight: 3,
+            clickable: true,
+            draggable: false,
+            geodesic: true
+        });
+        p.path_length = google.maps.geometry.spherical.computeDistanceBetween(path[0], path[1]);
+        los_polylines.push(p);
+        google.maps.event.addListener(p, 'click', mapInfoBox_handle_prediction_path);
+    });
+}
+
 function focusVehicle(vcallsign, ignoreOpt) {
     if(!offline.get('opt_hilight_vehicle') && ignoreOpt === undefined) return;
 
@@ -723,6 +768,9 @@ function stopFollow(no_data_reset) {
         if(plot) plot = $.plot(plot_holder, {}, plot_options);
         updateGraph(null, true);
 
+        // clear LOS lines
+        drawLOSPaths(null);
+
         // update lookangles box
         if(GPS_ts !== null) $("#lookanglesbox span").hide().parent().find(".nofollow").show();
 
@@ -755,6 +803,7 @@ function followVehicle(vcallsign, noPan, force) {
         $("#main .vehicle"+vehicles[vcallsign].uuid).addClass("follow");
 
         updateGraph(vcallsign, true);
+        drawLOSPaths(vcallsign);
 	}
 
     if(should_pan) {
@@ -929,7 +978,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
            '</div>' + // left
            '<div class="right">' +
            '<dl>' +
-           ((vehicle.vehicle_type == "car") ? '' : '<dt>'+ascent_text+' '+hrate_text+'</dt><dd>rate v|h</dd>') +
+           ((vehicle.vehicle_type == "car") ? '' : '<dt>'+ascent_text+'<br/>'+hrate_text+'</dt><dd>rate v|h</dd>') +
            '<dt>'+text_alt+'</dt><dd>altitude</dd>' +
            '<dt>'+text_alt_max+'</dt><dd>max alt</dd>' +
            '';
@@ -2521,6 +2570,8 @@ function updateReceivers(r) {
             receiver_names.splice(i,1);
         }
     }
+
+    if(follow_vehicle !== null) drawLOSPaths(follow_vehicle);
 }
 
 function updatePredictions(r) {
@@ -2637,6 +2688,7 @@ function update(response) {
 
                 if(listScroll) listScroll.refresh();
                 if(zoomed_in && follow_vehicle == vcallsign && !manual_pan) panTo(follow_vehicle);
+                if(follow_vehicle == vcallsign) drawLOSPaths(vcallsign);
             }
 
             // step to the next callsign