Conflicts:
.gitignore
public_html/gmap.html
public_html/script.js
All conflicts fixed but you are still merging.
modified: .gitignore
modified: dump1090.c
new file: public_html/config.js
new file: public_html/coolclock/coolclock.js
new file: public_html/coolclock/excanvas.js
new file: public_html/coolclock/moreskins.js
new file: public_html/extension.js
modified: public_html/gmap.html
new file: public_html/options.js
new file: public_html/planeObject.js
modified: public_html/script.js
modified: public_html/style.css
"Please don't call authorities"-warning label is show on map if any special squawk is show.
modified: public_html/gmap.html
modified: public_html/script.js
modified: public_html/style.css
Fixed resetMap()-funtion to reset map-settings to default. Map saves last location and zoom values to localStorage.
Also added new css-class '.pointer'.
modified: public_html/gmap.html
modified: public_html/script.js
modified: public_html/style.css
Options:
SiteCircles = true;
SiteCirclesDistances = new Array(100,150,200);
Circles are only shown if 'SiteShow' is true. SiteCirclesDistances is array of numbers. Distances are in NM or km depending 'Metric'-settings.
modified: public_html/config.js
modified: public_html/script.js
Added option to show values in metric system.
Metric = false; // true|false
Removed unused conversion from aircraftsToJson() at dump1090.c-file.
Tweaked distance calculation to use google map api.
modified: dump1090.c
modified: public_html/config.js
modified: public_html/gmap.html
modified: public_html/script.js
Shows radars location on map. Default is not showing.
Settings:
SiteShow is boolean [true|false]
SiteLat & SiteLon in decimal format.
If using untrackedDeveloperSettings.js-file these settings can be
copy-pasted on that file:
SiteShow = false;
SiteLat = 45.0;
SiteLon = 9.0;
modified: public_html/config.js
modified: public_html/script.js
modified: public_html/style.css
Tweaked selected planes display so it won't push plane-table around. Added
link to FlightStats service and speed to selected plane table.
modified: public_html/script.js
modified: public_html/style.css
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 ---
untrackedDeveloperSettings.js
Create file and add line `var developerSettings = true;` on top of it.
After that some settings can be overwritten with deleloper's flavour.
-- Example File w/o line numbers --
var developerSettings = true;
var CONST_CENTERLAT = 60.0; // 45.0
var CONST_CENTERLON = 20.0; // 9.0
var CONST_ZOOMLVL = 6; //5
-- End of Example File --
modified: .gitignore
modified: public_html/gmap.html
modified: public_html/script.js
New settings area can be opened by clicking Settings-link and closed by same link or OK-button. No settings to change yet.
modified: public_html/gmap.html
modified: public_html/script.js
modified: public_html/style.css
Added quite a lot of new things this time - see modified files or just
be brave and try :)
modified: public_html/gmap.html
modified: public_html/script.js
modified: public_html/style.css
Changes to 'dump1090.c'-file made accordingly.
modified: .gitignore
modified: dump1090.c
deleted: gmap.html
new file: public_html/gmap.html
new file: public_html/script.js
new file: public_html/style.css
