Commit graph

193 commits

Author SHA1 Message Date
Oliver Jowett 98564ab6d0 Add a scale. 2016-07-02 17:09:16 +01:00
Oliver Jowett 8639ab3837 More work on OL3. 2016-07-02 14:44:14 +01:00
Oliver Jowett 5acecbaf6f Starting to hack on OL3 support. 2016-07-02 12:55:38 +01:00
Oliver Jowett 50d67ff722 Merge branch 'upstream' 2016-04-11 12:11:05 +01:00
Oliver Jowett e1278c36f7 Revert script.js indent changes from d00b07f361 2016-03-31 20:09:12 +01:00
Chris Bowles e509e76294 Avoid mixed-content warnings when served over HTTPS (in a protocol-relative way) 2016-03-30 09:12:22 -04:00
Chris Bowles d00b07f361 Indentation/Readability cleanup 2016-03-30 08:54:37 -04:00
Chris Bowles f53bca99e4 Add PlaneFinder link 2016-03-29 17:50:39 -04:00
Oliver Jowett c218bb9dfa Link to the new FA ModeS redirect URL 2016-02-27 16:14:12 +00:00
Oliver Jowett ccb9a6c034 Link to FA by hexid; clean up some dead code. 2016-02-27 15:52:02 +00:00
Bjorge Dijkstra a283ab2786 Fix check for valid distance in drawCircle() 2016-02-18 20:47:17 +01:00
Oliver Jowett c4a2a5c9fb Fix the upintheair URL. 2015-12-23 10:10:05 +00:00
Oliver Jowett 75ddd87408 Basic support for terrain-limit rings based on data from heywhatsthat.com 2015-12-21 17:43:26 +00:00
Oliver Jowett 779c66e2e9 Reindenting. 2015-12-21 17:40:39 +00:00
Oliver Jowett 91fce10f30 Remember map type selection in local storage.
Fixes #26.
2015-10-26 23:03:34 +00:00
Oliver Jowett f8a3c46139 Add generic map type config for maps that can be handled by simple URL pattern substitution. 2015-10-26 12:59:38 +00:00
Oliver Jowett 482d3a1d38 Turn on scale (and zoom for good measure, though it's on by default) 2015-10-26 12:58:49 +00:00
Oliver Jowett b5960fd44a Cleanups, reformatting, a few bugfixes, add sort-by-country. 2015-09-01 12:19:23 +01:00
Dynomity 84ad8a2788 removed old commented line 2015-08-30 11:34:37 -06:00
Dynomity 9e00c2d0d3 Merge remote-tracking branch 'origin/flags' into flags
Conflicts:
	public_html/script.js
2015-08-30 10:19:53 -06:00
Dynomity 402e40fc36 fixed table display column problem
This is the final version for this project. (I hope!)
2015-08-30 10:16:40 -06:00
Dynomity b5d49b451b just cleaning up the formatting 2015-08-26 10:07:50 -06:00
Dynomity 899e072cf1 Added back the flag in the selected section 2015-08-24 12:39:37 -06:00
Dynomity baddeb9034 cleaning up code and plane table 2015-08-21 18:38:38 -06:00
Dynomity 1babb5b55c Added span for flag icon in selected 2015-08-19 22:00:57 -06:00
Dynomity 1a5e6e2187 searches in hex now.
The search now looks at the hex object array in flags.js. Also moved
the search in the planeObject section. See got to to figure out whether
I should add a new property for the image.
2015-08-18 22:37:34 -06:00
Dynomity 54be82c50c Update script.js 2015-08-16 17:17:16 -06:00
Dynomity c62dda5136 adding country flags to ICAO listing
Requires addition of flag images as .png files stored in ~/flags-tiny.
I think I got them from http://www.iconarchive.com/category/flag-icons.html

This is my first attempt with github. Please bear with me!
2015-08-16 12:49:41 -06:00
Oliver Jowett b4490c7b47 Clear markers and don't color rows if the aircraft sees no positions for 60s,
even if they are still receiving other messages.

The marker/trail can be redisplayed by selecting the plane from the table.
2015-07-15 17:07:28 +01:00
Oliver Jowett 32f87412d6 Show mlat positions differently in the detail pane. 2015-06-29 14:04:52 +01:00
Oliver Jowett bd96d40e4e Display aircraft with mlat-derived positions with a different row color. 2015-06-29 10:47:29 +01:00
Oliver Jowett da2fff8531 Proof of concept for an aircraft metadata DB. 2015-02-24 21:51:30 +00:00
Oliver Jowett 268599a211 Tweaks to title mangling:
* use PageName, not literal "DUMP1090"
 * use document.title directly, not a selector
 * include number of positionless aircraft too
 * rename the config options
 * some simplification of the changes
2015-02-22 11:51:58 +00:00
Oliver Jowett 288a8242dd Merge branch 'title_numbers' of https://github.com/m30164/dump1090 into m30164-title_numbers 2015-02-22 11:35:59 +00:00
Oliver Jowett df64abe433 Move special-character definitions to formatter.js. 2015-02-22 01:29:02 +00:00
Oliver Jowett 5c1cf53316 Simplify settings down to just Metric / ShowOtherUnit.
Factor out some common code.
2015-02-22 01:22:05 +00:00
m30164 297d3b0125 Number of planes and messages in title
Simple addition to display the current number of planes and messages in
the title.
2015-02-20 11:42:29 +01:00
m30164 a531327533 Added extended unit settings
Added some code to enable the user to configure unit selection in a more
detailed fashion. you can now select either metric or imperial, or both,
and even set which one of those should be displayed first.
2015-02-20 00:09:03 +01:00
Oliver Jowett 6fbeae070c Handle long refresh rates better, don't draw all tracks as dotted. 2015-02-11 00:15:48 +00:00
Oliver Jowett 2ba56231a6 Do an initial data fetch immediately (useful if the refresh interval is long). 2015-02-11 00:15:21 +00:00
Oliver Jowett 7053ad02da Make aircraft tracking use milliseconds everywhere. 2015-02-10 21:49:37 +00:00
Oliver Jowett 4dbedecc1e Fix history loading if receiver.json says history:0 2015-01-25 21:54:40 +00:00
Oliver Jowett dcd9f0b1e7 Link ICAO to airframes.org (complete with horrible javascript form-submission workaround) 2015-01-23 19:17:07 +00:00
Oliver Jowett d76b8948b3 Make doubleclick-follow also set zoom, like clicking the follow arrow does. 2015-01-22 23:12:41 +00:00
Oliver Jowett 07c4f045aa Fix italicizing of non-ICAO rows 2015-01-22 22:19:17 +00:00
Oliver Jowett f76842d186 Doubleclick on plane marker to follow, too. 2015-01-22 21:35:59 +00:00
Oliver Jowett 53203a5f71 Make the arrow bold/unbold to reflect current follow mode. 2015-01-22 21:31:02 +00:00
Oliver Jowett 3040609816 Doubleclick on a table entry to follow that aircraft. 2015-01-22 21:28:35 +00:00
Oliver Jowett 6672d92d9e Don't double up the ICAO display if there's no callsign. 2015-01-22 17:35:20 +00:00
Oliver Jowett d3537ec139 When first following a plane, zoom in if we are zoomed far out. 2015-01-22 16:14:32 +00:00
Oliver Jowett 3fd2032f49 Make altitude column indicator consistent with the detailed info. 2015-01-22 16:14:11 +00:00
Oliver Jowett 09c50fff4d Show vertical rate indicators next to altitude. 2015-01-22 16:09:19 +00:00
Oliver Jowett ba8a8935be Move ICAO for the selected plane into the header line.
Put RSSI in the selected info box where ICAO used to be.
2015-01-22 15:31:35 +00:00
Oliver Jowett fac838b9ad Rearrangements to infoblock layout. 2015-01-22 14:44:32 +00:00
Oliver Jowett 6daf116b40 Clean up config.js a bit, support configuring page name and site name. 2015-01-22 14:33:42 +00:00
Oliver Jowett b78b28d95f Add a "follow" link to the selected plane info. 2015-01-22 14:17:12 +00:00
Oliver Jowett 7500cabb08 Show rows with non-ICAO addresses in italic. 2015-01-22 13:21:47 +00:00
Oliver Jowett 5e80a11934 Fix stable sort of rows with no sortable values (would cause "jumping" rows at the end of the table) 2015-01-19 23:28:04 +00:00
Oliver Jowett 5cbe5d909b Don't cache receiver.json as it may change more frequently now (history size). 2015-01-17 21:02:17 +00:00
Oliver Jowett f71f93464b Always sort missing values at the end of the table, even in a descending sort.
Simplify the sorting a bit by separating out the "extract value to compare" logic.
2015-01-17 12:27:13 +00:00
Oliver Jowett bfcfb1fdcb Fix sort-by-message-count.
(cherry picked from commit 9f40dbaf786c69aaf459c69b2058bba9cd30569f)
2015-01-16 20:34:03 +00:00
Oliver Jowett dd734debc3 Add a loading progress bar, as it can be slow with internal webserver (100ms/request)
plus large history (120 requests).

(cherry picked from commit e1b0b7a5b6759bb7a59536efcc4d6652d92dda16)
2015-01-16 20:33:32 +00:00
Oliver Jowett 6458cfd2fe Load history when the map is initialized.
This can take a few seconds, so add a loading spinny while it loads.

(cherry picked from commit 8d3fdcc1625278a25a289dee33ef6b8eaccfd0ff)
2015-01-16 20:32:55 +00:00
Oliver Jowett 72bfc31458 Display message rate (30 sec average) on the webmap.
(cherry picked from commit 848af78be685c6e2a26d0b30e9f385696201a2c4)
2015-01-13 22:01:53 +00:00
Oliver Jowett 0ccb5cc48e Tweak wordwrap on the infoblock. 2015-01-11 12:02:25 +00:00
Oliver Jowett 2f2803a775 Fix UTC clock display in non-UTC timezones. 2015-01-11 11:54:17 +00:00
Oliver Jowett 35e5088529 Fix initial map centering thinkos. 2015-01-07 23:54:54 +00:00
Oliver Jowett 94f62e5b5f Simplify sort functions, fix stable sort in the descending case. 2015-01-07 22:16:49 +00:00
Oliver Jowett b639fb9107 Don't display a track of "0" for aircraft with no heading data. 2015-01-07 22:14:50 +00:00
Oliver Jowett 93aedbe15c Tell the user about AJAX errors.
Set AJAX options: 5s timeout, no caching.
Don't spool up a second request while the previous one is in progress.
If we repeatedly see the same receiver timestamp, warn the user that the JSON isn't being updated.
2015-01-07 18:43:08 +00:00
Oliver Jowett b2b0aa9afe Rearrangements to clock layout.
Provide UTC and last-receiver-update clocks.
2015-01-07 18:39:19 +00:00
Oliver Jowett e6a70345b5 Remove options / extension support (no plans to work on those in the current form). 2015-01-07 17:37:34 +00:00
Oliver Jowett 139ed5cb36 Turn on strict mode, fix a few errors. 2015-01-07 17:35:32 +00:00
Oliver Jowett df79f7c989 Fix up selected vs is_selected. 2015-01-07 17:32:20 +00:00
Oliver Jowett 29509d9633 Make PlaneObject a class.
Rearrange internal storage of positions.
Maintain sitedist within PlaneObject, not externally.
Clean up speed/dist/etc formatting.
Show both metric & imperial values in the plane detail infobox.
2015-01-07 17:18:33 +00:00
Oliver Jowett 58e5485c2a Stylistic cleanups. Unify special squawk data. 2015-01-07 16:32:58 +00:00
Oliver Jowett feb8c55bac Display the number of history points stored.
Rejuggle how markers are handled so that we avoid creating lots of new icons all the time.
Rearrange reaping / update times so that it is all based on timestamps from the receiver.
2015-01-07 01:19:05 +00:00
Oliver Jowett 43d29389f2 Lots more map work, mostly around switching from "construct a big HTML string"
to working directly with the DOM to update the table / selected plane info.
Seems to speed things up (and deflicker them) a lot.

Also stable sorts, allow disabling the clocks, draw ground tracks in a different
color, put "last seen" info on the selected plane infobox, if position updates
are infrequent then combine them into a single estimated line so that dash
placement works properly, probably a bunch of other things..
2015-01-06 20:15:25 +00:00
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
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
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 14ff25b87f Improve map display layout and styling 2014-08-06 19:31:05 -07: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