Commit graph

324 commits

Author SHA1 Message Date
Oliver Jowett d84bb22c24 Default to excluding the chartbundle layers. 2016-07-05 22:49:58 +01:00
Oliver Jowett a2d5d4abf7 Merge branch 'upstream' 2016-07-05 22:30:31 +01:00
Oliver Jowett 6e1372708c Switch to OL 3.17.1; include a copy locally. 2016-07-05 22:07:26 +01:00
Oliver Jowett b93ada6196 Explain where to get map keys. 2016-07-05 21:54:24 +01:00
Oliver Jowett ae6a7acb67 Move aircraft icons above aircraft trails. 2016-07-03 14:54:36 +01:00
Oliver Jowett abab5f5440 Fix initial baselayer selection if no type was stored. 2016-07-03 14:54:14 +01:00
Oliver Jowett 2bbc117528 Base64-encode the SVG markers, seems to make Firefox happier. 2016-07-03 14:44:05 +01:00
Oliver Jowett 381ce5f280 Lots of layer cleanups.
Move layer config into a separate file.
Add a Mapzen vector tile layer.
Make the overlay layers toggleable.
2016-07-03 13:56:58 +01:00
Oliver Jowett 6676bc8172 Allow forEachRecursive to work on a collection/array. 2016-07-03 13:36:32 +01:00
Oliver Jowett 4862010d42 Don't gratuitously reverse the layer order in the switcher. 2016-07-03 13:35:54 +01:00
Oliver Jowett 6e8b7cff57 Expand the attributions control by default. 2016-07-02 21:53:07 +01:00
Oliver Jowett a357b9676d Keyless MapQuest access goes away shortly so remove that layer. 2016-07-02 21:13:10 +01:00
Oliver Jowett 2e68341106 Layer switching support, ChartBundle, Bing maps. 2016-07-02 21:12:31 +01:00
Oliver Jowett 49cb77ac8f Do stuff while animating/interacting. 2016-07-02 18:45:03 +01:00
Oliver Jowett 986c910a73 Turns out we don't need an interaction to catch feature clicks. 2016-07-02 18:11:05 +01:00
Oliver Jowett 54dc91adc5 Make table selection a little more robust. 2016-07-02 18:10:37 +01:00
Oliver Jowett 5cf512cf63 Clean out some debug, dead code. 2016-07-02 18:10:15 +01:00
Oliver Jowett b7fc52bcb3 Tweak the svg stroke width based on scale.
The stroke width is applied before scaling, but we actually want
the outline to have the same weight regardless of the scale chosen.
2016-07-02 17:14:58 +01:00
Oliver Jowett fc95719f2e Reinstate selecting aircraft by clicking on their icons. 2016-07-02 17:11:33 +01:00
Oliver Jowett 90f5a7d4e3 Round the computed colors a bit to reduce flickering.
(each color change requires regenerating the svg icon)
2016-07-02 17:11:08 +01:00
Oliver Jowett 18bd8b630d Draw plane icons. 2016-07-02 17:10:52 +01:00
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 b1acfcf26a Switch to latest stable jquery/jqueryui. Include a local copy. 2016-07-02 11:00:27 +01:00
Oliver Jowett bf042642c3 Increase the size of the heavy icon a little. 2016-06-05 21:43:28 +01:00
Oliver Jowett 7c9320ad97 Update source comment for the new heavy marker 2016-06-05 19:13:55 +01:00
danielmerritt c701b46559 Added a new marker for heavy aircraft 2016-05-16 22:47:56 +09:30
Oliver Jowett a628369228 Update PageName in config.js 2016-04-11 16:56:23 +01:00
Oliver Jowett 22fb17caf9 Call this "FlightAware dump1090" so it makes sense for both FF and Piaware images.
Update URL for the eventual home of this repo.
2016-04-11 12:12:11 +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 ebce0fdda6 Pedantic tweaks for HTML5 validation 2016-03-30 09:12:58 -04: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
Oliver Jowett c6fff0ff32 Merge branch 'upstream' 2016-02-26 10:38:43 +00:00
Bjorge Dijkstra a283ab2786 Fix check for valid distance in drawCircle() 2016-02-18 20:47:17 +01:00
Bjorge Dijkstra 3a98bf0d00 Remove invalid css property 'align' from timestamps div 2016-02-18 20:28:49 +01:00
Bjorge Dijkstra 1d723b0731 Remove sensor parameter from google maps api url, it is no longer required.
https://developers.google.com/maps/documentation/javascript/error-messages#sensor-not-required
2016-02-18 20:20:35 +01:00
Bjorge Dijkstra 99696cfac0 minor html syntax fixes for map view 2016-02-18 20:17:01 +01:00
Oliver Jowett b19c1f9dd2 Merge branch 'upstream' 2016-02-17 19:42:39 +00:00
Oliver Jowett 108b402918 Directly include the VRS-derived json db since the underlying DB
is not being updated any more.
2016-02-16 10:33:18 +00:00
Oliver Jowett b433a521bf Start trimming dump1090-mutability down for use in piaware. 2016-01-13 00:00:08 +00: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 f84e9a8de1 Fix the missing comma in the monochrome display example. 2015-10-26 23:09:26 +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 416c8591b7 Tweak the display of mlat aircraft icons (not convinced these are the best settings) 2015-10-26 12:30:21 +00:00
Oliver Jowett 976dc44d11 Regenerate the ICAO ranges table based on data extracted from Annex 10. 2015-09-01 14:21:25 +01: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
Dino M 0858fa2af4 fixed colspan issue for position 2015-08-30 10:25:43 -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 8a1c08cafb Moved loading of flags.js above script.js 2015-08-26 10:00:19 -06:00
Dynomity 95f90fe799 file rename 2015-08-25 19:21:58 -06:00
Dynomity de426ba823 removed flag id 2015-08-24 20:35:00 -06:00
Dynomity c95e5775ff minor cosmetic tweaks around flags 2015-08-24 12:44:59 -06:00
Dynomity 899e072cf1 Added back the flag in the selected section 2015-08-24 12:39:37 -06:00
Dynomity 00f3f3723e removed Country column 2015-08-22 10:13:02 -06:00
Dynomity 9e94a6dc1a fixed North/South Korea elements 2015-08-21 18:44:27 -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 687720386f Removed decimal ICAO codes. Only hex objects 2015-08-18 22:31:13 -06:00
Dynomity 725fd31249 Update flags.js 2015-08-18 12:19:43 -06:00
Dynomity 31ccabe952 added flags.js 2015-08-17 22:25:39 -06:00
Dynomity 849fc1acf2 work in progress
created static file to store ICAO codes
2015-08-17 22:23:23 -06:00
Dynomity bb576566ca changed ICAO to Country in selected section 2015-08-17 22:20:13 -06:00
Dynomity ee36258f49 Create README.txt 2015-08-17 12:20:34 -06:00
Dynomity 3f4d35f04c add blank flag 2015-08-17 05:00:19 -06:00
Dynomity e907a068f2 Update gmap.html 2015-08-16 17:22:10 -06:00
Dynomity 54be82c50c Update script.js 2015-08-16 17:17:16 -06:00
Dynomity c3e3130da8 flag images
flag images in flags-tiny directory
2015-08-16 14:09:13 -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 e5053ac5c9 Only set/reset position_from_mlat when we actually see position data.
Otherwise, if the position data times out on the dump1090 side, we'd
keep the last seen position on the webpage side but lose the mlat
status.
2015-06-29 15:51:42 +01:00
Oliver Jowett 32f87412d6 Show mlat positions differently in the detail pane. 2015-06-29 14:04:52 +01:00
Oliver Jowett f1f76cb8e3 When receiving mlat, allow larger gaps between positions before plotting estimated tracks.
mlat positions aren't generally so frequent as proper ES, so they'd almost always plot
as estimated.
2015-06-29 12:44:19 +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 8209267301 Avoid creating small child blocks, keep data in the parent where possible.
This reduces the number of blocks from 151 to 61.
2015-02-24 23:04:26 +00:00
Oliver Jowett da2fff8531 Proof of concept for an aircraft metadata DB. 2015-02-24 21:51:30 +00:00
Oliver Jowett b804359077 Initialize category. 2015-02-22 20:11:11 +00:00
Oliver Jowett 7fbdde156a Change map icon based on aircraft category.
This only has different icons for the "rotorcraft" and "light"
categories at the moment - all others are the default plane icon
at different scales.
2015-02-22 17:02:23 +00:00
Oliver Jowett 7bd2bcc0a2 Move color settings into config.js 2015-02-22 12:27:01 +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
Oliver Jowett 082e973990 Merge branch 'Unit_settings' of git://github.com/m30164/dump1090 into m30164-Unit_settings 2015-02-22 00:55:46 +00:00
Oliver Jowett 8e9220e330 Quick prototype of color-by-altitude. 2015-02-21 18:41:59 +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 a4360cd775 Move the "follow" button to an arrow by the callsign.
Also make the callsign clickable to follow.
2015-01-22 21:30:37 +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 ffe03fe749 Track RSSI in PlaneObject. 2015-01-22 15:31:10 +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 63fb121d1c Status messages in HTTP responses.
(cherry picked from commit 820528b4ad7f3963199718205724cdf3ac97b113)
2015-01-16 20:28:36 +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 0b5aac47c4 Change plane color if we have not seen a recent position update
(previously, any type of message was enough).
2015-01-11 12:15:54 +00:00
Oliver Jowett 019fd1fb06 Tweak the column widths in the infoblock slightly. 2015-01-11 12:12:28 +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 86b59e7bd9 Don't need to stash ICAO on the marker now that we're binding the event listener function directly. 2015-01-07 21:15:56 +00:00
Oliver Jowett b4de83090d Don't update icao in updateData, it should never change. 2015-01-07 21:15:34 +00:00
Oliver Jowett 25ff88c252 Only reset marker title if it changes. 2015-01-07 21:03:26 +00:00
Oliver Jowett 2c0fb752e1 Add the missing div used to display errors. 2015-01-07 18:44:45 +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 97ca1c77e7 Add some notes to config.js 2015-01-07 18:41:38 +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 9996b7c9fb Zoom in a bit more by default. 2015-01-07 01:18:36 +00:00