[hamradio-commits] [dump1090] 208/373: Merge remote-tracking branch 'upstream/master'

Thu Oct 23 14:58:20 UTC 2014

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit 143606209e029d52387ffe0880cb36d1755c418e
Merge: 6bf2f2b e50c2a5
Author: terribl <terri at rannalla.net>
Date:   Thu May 23 13:16:14 2013 +0300

    Merge remote-tracking branch 'upstream/master'

 dump1090.c            | 118 +++++++++++++++++++++++++++++++++++++-------------
 public_html/gmap.html |   3 ++
 public_html/script.js |   4 ++
 3 files changed, 96 insertions(+), 29 deletions(-)

diff --cc public_html/gmap.html
index e6462bf,78bfd77..c93e4ed

--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@@ -4,6 -4,6 +4,9 @@@
    <head>
      <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
      
++    <!-- For developers -->
++    <script type="text/javascript" src="untrackedDeveloperSettings.js"></script>
++    
      <link rel="stylesheet" type="text/css" href="style.css" />
      <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
      <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=true"></script>
diff --cc public_html/script.js
index 74a2aca,50df145..c47a75f
--- a/public_html/script.js
+++ b/public_html/script.js
@@@ -1,14 -1,7 +1,18 @@@
++if (typeof(developerSettings) === 'undefined') { // If not developers
++
 +// "Constant" variables - Since there is no constants in make sure
 +// not to change these CONST_ variables.
 +var CONST_CENTERLAT = 45.0; // 45.0
 +var CONST_CENTERLON = 9.0; // 9.0
 +var CONST_ZOOMLVL   = 5; //5
 +
++} // End of !developerSettings
++
 +// Global variables
  var Map       = null;
 -var CenterLat = 45.0;
 -var CenterLon = 9.0;
 -var ZoomLvl   = 5;
 +var CenterLat = CONST_CENTERLAT;
 +var CenterLon = CONST_CENTERLON;
 +var ZoomLvl   = CONST_ZOOMLVL;
  var Planes    = {};
  var PlanesOnMap  = 0;
  var PlanesOnGrid = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git

