AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added untrackedDeveloperSettings to this branch too.

Browse source 
Load devel settings file after config.js and settings are saved for
developers even after merges.

	modified:   .gitignore
	modified:   public_html/config.js
	modified:   public_html/gmap.html
	modified:   public_html/script.js

Example file
--- untrackedDeveloperSettings.js ---
// Load this file after config.js so these settings are used

var CONST_CENTERLAT = 35.21928;
var CONST_CENTERLON = -80.94406;
var CONST_ZOOMLVL   = 9;
--- untrackedDeveloperSettings.js END ---
This commit is contained in:
terribl 2013-05-25 11:56:32 +03:00
parent 8b5c74ded8
commit 9c465c174b
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -7,3 +7,5 @@ frames.js
*~ *~
*.rej *.rej
*.orig *.orig
untrackedDeveloperSettings.js

9
public_html/config.js
View file

@ -1,15 +1,16 @@
// ---------------------------------------------------- // ----------------------------------------------------
// //
// This file is to configure the configurable settings // This file is to configure the configurable settings.
// Load this file before script.js file at gmap.html.
// //
// ---------------------------------------------------- // ----------------------------------------------------
// The Latitude and Longitude in decimal format // The Latitude and Longitude in decimal format
var CenterLat = 35.21928; var CONST_CENTERLAT = 45.0;
var CenterLon = -80.94406; var CONST_CENTERLON = 9.0;
// The google maps zoom level, 0 - 16, lower is further out // The google maps zoom level, 0 - 16, lower is further out
var ZoomLvl = 9; var CONST_ZOOMLVL = 5;
// The default marker color // The default marker color
var MarkerColor = "rgb(127, 127, 127)"; var MarkerColor = "rgb(127, 127, 127)";

4
public_html/gmap.html
View file

@ -1,10 +1,10 @@
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css" href="style.css" /> <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 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=false"></script> <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
<script type="text/javascript" src="config.js"></script> <script type="text/javascript" src="config.js"></script>
<script type="text/javascript" src="untrackedDeveloperSettings.js"></script> <!-- Developers -->
<script type="text/javascript" src="planeObject.js"></script> <script type="text/javascript" src="planeObject.js"></script>
<script type="text/javascript" src="extension.js"></script> <script type="text/javascript" src="extension.js"></script>
<script type="text/javascript" src="script.js"></script> <script type="text/javascript" src="script.js"></script>
@ -25,7 +25,7 @@
<td> <td>
<canvas id="localclock" class="CoolClock:classic:40"></canvas> <canvas id="localclock" class="CoolClock:classic:40"></canvas>
</td> </td>
<td>GMT Time</td> <td>UTC Time</td>
<td> <td>
<canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas> <canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas>
</td> </td>

10
public_html/script.js
View file

@ -11,6 +11,11 @@ var bSortASC=true;
var bDefaultSortASC=true; var bDefaultSortASC=true;
var iDefaultSortCol=3; var iDefaultSortCol=3;
// Get current map settings
CenterLat = Number(localStorage['CenterLat']) || CONST_CENTERLAT;
CenterLon = Number(localStorage['CenterLon']) || CONST_CENTERLON;
ZoomLvl = Number(localStorage['ZoomLvl']) || CONST_ZOOMLVL;
function fetchData() { function fetchData() {
$.getJSON('/dump1090/data.json', function(data) { $.getJSON('/dump1090/data.json', function(data) {
PlanesOnMap = 0 PlanesOnMap = 0
@ -148,11 +153,6 @@ function initialize() {
reaper(); reaper();
extendedPulse(); extendedPulse();
}, 1000); }, 1000);
// Faster timer, smoother things
//window.setInterval(function() {
// printTime();
//}, 250);
} }
// This looks for planes to reap out of the master Planes variable // This looks for planes to reap out of the master Planes variable