Commit graph

223 commits

Author SHA1 Message Date
Oliver Jowett e8a62293c2 More WIP on the webmap, mostly fixing up track history. 2015-01-06 01:00:44 +00:00
Oliver Jowett 1f06abf67d WIP webmap cleanup 2015-01-05 23:20:03 +00:00
Oliver Jowett 69532b3c53 Center the webmap on the receiver location.
Mark config.js as a conffile, so user changes won't get overwritten.
2015-01-02 22:48:27 +00:00
Oliver Jowett 2aa37f06da Link to github from the webmap. 2014-12-27 21:40:18 +00:00
Oliver Jowett f04c4d5dde Fix webmap to look for site location under the right names. 2014-12-10 21:34:05 +00:00
Oliver Jowett 9fa09e0e92 receiver.json support, internal webserver cleanup.
Add data/receiver.json (generated once) and support for it in script.js.

Internal webserver rearrangement to support multiple json files.
2014-12-10 17:05:22 +00:00
Oliver Jowett 6910a4bf4d Experimental json changes 2014-11-23 16:02:11 +00:00
Jeff Lawson cd09210cb9 Merge branch 'master' into faurl 2014-10-29 23:00:38 -05:00
Malcolm Robb abaf9d8b39 Fix W3C Validation Errors #34
Submitted by ddeitterick, but the push didn't work on IE8/9. I hope I've
extracted the required parts and implemented them correctly here.
2014-10-29 17:39:34 +00:00
MalcolmRobb 7b2e4ca67d Merge pull request #49 from mutability/show-stale-planes
Change the marker color for aircraft with no recent updates.
2014-10-29 15:32:30 +00:00
MalcolmRobb d1ad4b91c6 Merge pull request #30 from tslocum/fr24link
Add flightradar24.com link
2014-10-28 13:07:15 +00:00
MalcolmRobb f95d54e837 Merge pull request #25 from ddeitterick/center_selected_plane_distance
Center "Distance from Site" for Selected Plane
2014-10-28 12:59:43 +00:00
MalcolmRobb e225b5dead Merge pull request #24 from ddeitterick/add_distance_to_table
Add Distance to Table Info
2014-10-28 12:59:08 +00:00
Jeff Lawson 87a88c9798 Merge branch 'master' into faurl 2014-10-12 16:31:35 -05:00
Oliver Jowett 75438d5595 Change the marker color for aircraft with no recent updates. 2014-10-02 22:50:09 +01:00
Malcolm Robb aa063ba89f Undo Parts of Pull request #29
The table sizing doesn't seem to work in M$ IE8 and IE9.
2014-09-30 16:35:15 +01:00
MalcolmRobb 732fe52a10 Merge pull request #28 from ddeitterick/change_plotted_plane_table_bg_color
Change the Background Color for a Plotted Plane
2014-09-30 15:19:42 +01:00
MalcolmRobb 9d3452f424 Merge pull request #27 from ddeitterick/format_track_field
Add Degree Symbol to Track Value
2014-09-30 15:18:35 +01:00
Trevor Slocum e5fddba182 Add flightradar24.com link 2014-08-10 00:01:31 -07:00
Trevor Slocum b7d01c5615 Don't restrict sidebar width 2014-08-07 23:50:28 -07:00
Trevor Slocum 14ff25b87f Improve map display layout and styling 2014-08-06 19:31:05 -07:00
ddeitterick df4a8ce00b Change the Background Color for a Plotted Plane
Changed the background color for a plotted plane in the planes table to
something that was more easily visible.
2014-08-03 22:11:09 -04:00
ddeitterick 0c2487df30 Add Degree Symbol to Track Value
Add the degree symbol to the "Track:" value in the plane details
section.
2014-08-01 23:42:58 -04:00
ddeitterick f933ed2723 Center "Distance from Site" for Selected Plane
Center "Distance from Site" under "Lat/Long" for selected plane.
2014-07-16 21:51:41 -04:00
ddeitterick a13c2f8540 Add Distance to Table Info
Add distance to table if site coordinates are provided and sort the
table by distance.  If coordinates aren't provided, the column isn't
displayed.
2014-07-16 21:42:02 -04:00
Jeff Lawson cc27ff6234 link to FlightAware for flight details 2014-02-27 14:40:14 -06:00
Malcolm Robb a968f03c3a Stop heading using multiple lines
In the table view of aircraft, the heading was displayed as "330 (NW)"
or similar. However, this cause the entry to scroll over into two lines
of text, and reduces the number of planes that can be seen in the table
at any one time.

There probably should be a way to make the table view wider by scrolling
it, but I can't see any way to do that. So for the moment I've commented
out the extra (NW) bit.
2013-09-27 10:57:26 +01:00
Malcolm Robb 2c28d9fe2f IE 8/9 Bugs in Web interface
*DISCLAIMER*
I didn't write any of this code initially, I've never tried to use it,
and I don't understand Java Script at all. In-fact I hate the wretched
stuff.

Anyway, it appears that no-one has bothered to test any of the Web
interface code using Microsoft Internet Explorer 8 or 9. I've attempted
to hack out the sections of the code that are causing problems, and at
least the web interface now seems to run.

However, for some reason the planes never move - I know this must be a
bug, but I don't know how to fix it.

Most of the errors relate to trailing commas.  My guess it that some
Java engines don't mind trailing commas, but that the Microsoft ones do.
There are also some undefined modules (untrackedDeveloperSettings) and
functions (console.log) which I guess those who wrote the code have on
their machines, but forgot to include in the public distribution. I've
no idea how to fix this, so I've just hacked them out of the code.
2013-09-26 12:59:46 +01:00
terribl 5f0e295580 From DE8MSH: Plane markers!
Now markers look like planes! Thank You | Tak!

(And bug pointed out by DE8MSH :))

	modified:   public_html/planeObject.js
	modified:   public_html/script.js
2013-06-02 20:49:45 +03:00
terribl e91b0a6be1 Added warning label when 7x00 squawk is shown.
"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
2013-06-02 16:51:38 +03:00
terribl 92d665e0da Hide Settings-windows text while page is loading.
modified:   public_html/gmap.html
	modified:   public_html/script.js
2013-06-02 13:45:53 +03:00
terribl 0e3426d46b "Reset Map" deselects plane correctly.
modified:   public_html/script.js
2013-05-31 10:29:51 +03:00
terribl 10e33892e8 Fixed resetMap() bug
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
2013-05-31 10:04:11 +03:00
Brian Davenport 072fba8718 Rolling back a couple changes and spawning a branch from here. 2013-05-30 21:26:16 +00:00
Brian Davenport 21229d58ea The start of a crummy looking options. It is bugged right now.
Brought back the reset map.
2013-05-30 17:45:10 +00:00
Brian Davenport 5c3f6dac50 Merge branch 'mapRefactor' of https://github.com/bdavenport/dump1090 into mapRefactor
Conflicts:
	public_html/script.js
2013-05-30 17:35:57 +00:00
Brian Davenport 4752578b8b Working on making an options window 2013-05-30 17:32:36 +00:00
terribl fd0c116424 Tyop corrected 2013-05-30 12:31:41 +03:00
terribl 9904c22859 Added option to draw measurement circles around site
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
2013-05-30 12:22:52 +03:00
terribl 3000baf184 Added metric-option to web-view
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
2013-05-28 12:15:18 +03:00
terribl ca314fcf2c Added distance to plane from site
Just for fun. Distance is only shown if SiteShow is true in config.js-file.

	modified:   public_html/script.js
2013-05-27 11:36:23 +03:00
terribl 8b8f74697c Added site marker (and settings for that)
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
2013-05-26 23:34:38 +03:00
terribl 11d69cb54b Tweaks and Fixes
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
2013-05-26 15:19:38 +03:00
terribl 498b512894 Merge branch 'mapRefactor' of https://github.com/bdavenport/dump1090 into mapRefactor
modified:   public_html/script.js
2013-05-25 23:57:39 +03:00
terribl e2b552eba0 Merge branch 'mapRefactor' of https://github.com/bdavenport/dump1090 into mapRefactor
Missing semicolon;

	modified:   public_html/script.js
2013-05-25 23:55:13 +03:00
terribl 5cd8a096b2 Merge branch 'mapRefactor' of https://github.com/bdavenport/dump1090 into mapRefactor 2013-05-25 23:52:19 +03:00
terribl 40c666b732 Changed table and selected planes info display
Changed table and selected planes info to show 'n/a' when data is not present.

	modified:   public_html/script.js
2013-05-25 23:44:40 +03:00
Brian Davenport b5d0038315 Fixes the selection bugs 2013-05-25 15:53:56 +00:00
terribl e22cff4bd2 Small bugs and cleaned squawkdisplay
modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-25 14:08:26 +03:00
terribl 9c465c174b Added untrackedDeveloperSettings to this branch too.
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 ---
2013-05-25 11:56:32 +03:00
Brian Davenport 8b5c74ded8 Split into multiple JS files,
Selecting planes now works,
Started work on settings window,
Created extension.js, an area for new ideas to be tested or loaded out of.
2013-05-24 02:15:37 +00:00
Brian Davenport d2a15659e7 Couple more small tweaks to the tails of planes.
Added "CoolClock" both local and GMT to the info pane, http://randomibis.com/coolclock/
2013-05-22 17:09:12 +00:00
Brian Davenport b5424884ca Updated a copy/paste error, where I did not update the paste. 2013-05-22 00:48:16 -03:00
Brian Davenport caf413cc01 Working on adding paths to the planes. 2013-05-22 03:26:40 +00:00
Brian Davenport c43c922148 Making the inital checkin to the refactored map page. 2013-05-21 20:28:16 +00:00
terribl 0dfc083aa5 New settings area
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
2013-05-21 15:19:36 +03:00
terribl 0ee5cdb5de Fixed a bug on Settings-link placement 2013-05-21 11:43:08 +03:00
terribl 2d1325f014 Changing info_footer to info_settings.
Location from footer to top right hand corner.

	modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-21 10:33:02 +03:00
terribl 9e8c1053bd Added link to FlightStats for flights with flight number.
modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-20 11:21:08 +03:00
Brian Davenport e1a06656d5 Added terribl's suggestion. 2013-05-19 15:44:19 +00:00
Brian Davenport 4dc9271ee0 Adds a bit of sorting to the table by clicking column headers
Also made the design work for lower resolution monitors, especially when the list has 20+ planes.
2013-05-18 21:54:59 +00:00
terribl 7b99ad5f6c Few bugs 2013-05-14 13:04:31 +03:00
terribl 72142fac84 Combined effort and code from bdavenport and me.
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
2013-05-14 12:55:16 +03:00
terribl ae69cd5d48 Web view JavaScript modifications.
modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-12 15:15:18 +03:00
terribl 6f228b9c88 Upstream merge finalized 2013-05-12 09:53:07 +03:00
terribl cac715e40a Upstream merge conflicts resolved 2013-05-12 09:50:20 +03:00
terribl 78f565cb4f Really minor tweaks 2013-05-12 09:37:17 +03:00
Malcolm Robb 8feabda35b BDAVENPORT : Adds a Table
Implement improvements to the public_html stuff as supplied by
bdavenport.
No changes to the C code.
2013-05-12 00:57:30 +01:00
terribl e65e873c13 Added flags to json for valid position and heading
As MalcolmRobb suggested.

	modified:   dump1090.c
	modified:   public_html/script.js
2013-05-11 23:36:11 +03:00
terribl e6080e259f Some map view changes
modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-11 17:04:23 +03:00
terribl bf4ccaca06 bdavenports .diff-file 2013-05-11 13:15:09 +03:00
terribl c5fdde64e4 Added resetMap()-function to web-view.
+ some small tweaks.

	modified:   dump1090.c
	modified:   public_html/script.js
2013-05-09 21:57:33 +03:00
terribl 6968bf92a6 Splitted gmap.html to multiple files in new 'public_html'-directory.
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
2013-05-09 17:59:26 +03:00