diff --git a/README.md b/README.md index 86c378f..989f65d 100644 --- a/README.md +++ b/README.md @@ -351,12 +351,19 @@ Ex : `-e "SERVICE_ENABLE_RADARBOX=true" -e "RADARBOX_SHARING_KEY=35345bf2258aea6 _Note : You may have this error on windows `[radarbox-feeder] /usr/bin/rbfeeder: line 17: 208 Segmentation fault /usr/bin/rbfeeder_armhf "$@"`, there is no solution to it._ _Note : You may have seg fault error, see https://github.com/mikenye/docker-radarbox/issues/9#issuecomment-633068833 for resolution_ +_Note : You may have 'already claimed' error on supplied sharing key, see https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/issues/145_ ## Adsbhub First-time users should obtain a sharing key. -In order to obtain a sharing key, you need to register on https://www.adsbhub.org/ and create a new station under settings. +In order to obtain a sharing key, you need to register on https://www.adsbhub.org/ and create a new station under settings, setup the station as follow: + +- Station mode: Client +- Feeder Type: Linux +- Data Protocol: Raw +- Station Host(IP): Your public IP + Add the environment variable `ADSBHUB_CKEY` and set it to to the value under "Station dynamic IP update ckey". Add the environment variable `SERVICE_ENABLE_ADSBHUB` and set it to `true`. @@ -394,6 +401,9 @@ Example : | `HTML_RECEIVER_STATS_PAGE_ADSBEXCHANGE` | empty | URL of your receiver's stats page on ADS-B Exchange. Usually https://www.adsbexchange.com/api/feeders/?feed= | | `HTML_RECEIVER_STATS_PAGE_PLANEFINDER` | empty | URL of your receiver's stats page on PlaneFinder. Usually https://planefinder.net/coverage/receiver/ | | `HTML_RECEIVER_STATS_PAGE_OPENSKY_NETWORK` | empty | URL of your receiver's stats page on Opensky Netowrk. Usually https://opensky-network.org/receiver-profile?s= | +| `HTML_RECEIVER_STATS_PAGE_RADARBOX` | empty | URL of your receiver's stats page on Radarbox. Usually https://www.radarbox.com/stations/ | +| `HTML_RECEIVER_STATS_PAGE_ADSBFI` | empty | URL of your receiver's stats page on ADSB.fi. Usually https://adsb.fi/ | +| `HTML_RECEIVER_STATS_PAGE_ADSBHUB` | empty | URL of your receiver's stats page on ADSBHub. Usually https://www.adsbhub.org/statistic.php | | `HTML_FR24_FEEDER_STATUS_PAGE` | empty | URL of your local FR24 Feeder Status page. Usually http://:8754/ (depends on the port you indicated when starting the container) | | `DUMP1090_ADDITIONAL_ARGS` | empty | Additial arguments for dump1090 e.g.: `--json-location-accuracy 2` | | `SYSTEM_HTTP_ULIMIT_N` | -1 | Enforce ulimit like docker <=22 to prevent OOM issues (-1 means not enforced), recommended value when crash 1048576 | diff --git a/patch/flightradar24.patch b/patch/flightradar24.patch index 5afe229..ed01043 100644 --- a/patch/flightradar24.patch +++ b/patch/flightradar24.patch @@ -11,7 +11,7 @@ diff -ru upstream/public_html/config.js modified/public_html/config.js // Center marker. If dump1090 provides a receiver location, // that location is used and these settings are ignored. -@@ -36,6 +39,15 @@ +@@ -36,6 +39,18 @@ SiteLon = 9.0; SiteName = "My Radar Site"; // tooltip of the marker @@ -21,6 +21,9 @@ diff -ru upstream/public_html/config.js modified/public_html/config.js +myAdsbexchangeFeederStatusUrl = ""; +myOpenskyFeederStatusUrl = ""; +myPlanefinderFeederStatusUrl = ""; ++myRadarboxFeederStatusUrl = ""; ++myAdsbfiFeederStatusUrl = ""; ++myAdsbhubFeederStatusUrl = ""; +// The local FR24 Feeder Status page +myFR24FeederStatusUrl = ""; + @@ -51,7 +54,7 @@ diff -ru upstream/public_html/index.html modified/public_html/index.html
-@@ -202,6 +203,12 @@ +@@ -202,6 +203,15 @@ @@ -61,6 +64,9 @@ diff -ru upstream/public_html/index.html modified/public_html/index.html + + + ++ ++ ++ @@ -79,7 +85,7 @@ diff -ru upstream/public_html/index.html modified/public_html/index.html diff -ru upstream/public_html/script.js modified/public_html/script.js --- upstream/public_html/script.js 2020-03-19 15:21:17.000000000 +0100 +++ modified/public_html/script.js 2021-03-14 21:04:58.453101668 +0100 -@@ -461,6 +461,42 @@ +@@ -461,6 +461,60 @@ }); }); @@ -118,6 +124,24 @@ diff -ru upstream/public_html/script.js modified/public_html/script.js + } else { + $('#planefinder_feeder_status_page').css('display', 'none'); + } ++ ++ if (myRadarboxFeederStatusUrl) { ++ $('#radarbox_feeder_status_page').attr('href',myRadarboxFeederStatusUrl); ++ } else { ++ $('#radarbox_feeder_status_page').css('display', 'none'); ++ } ++ ++ if (myAdsbfiFeederStatusUrl) { ++ $('#adsbfi_feeder_status_page').attr('href',myAdsbfiFeederStatusUrl); ++ } else { ++ $('#adsbfi_feeder_status_page').css('display', 'none'); ++ } ++ ++ if (myAdsbhubFeederStatusUrl) { ++ $('#adsbhub_feeder_status_page').attr('href',myAdsbhubFeederStatusUrl); ++ } else { ++ $('#adsbhub_feeder_status_page').css('display', 'none'); ++ } + // Force map to redraw if sidebar container is resized - use a timer to debounce var mapResizeTimeout; diff --git a/root/etc/confd/html/templates/config.js.tmpl b/root/etc/confd/html/templates/config.js.tmpl index e8dad2c..403dcbb 100644 --- a/root/etc/confd/html/templates/config.js.tmpl +++ b/root/etc/confd/html/templates/config.js.tmpl @@ -45,6 +45,9 @@ myAdsbStatsSiteUrlFlightradar24 = "{{getv "/receiver/stats/page/flightradar24"}} myAdsbexchangeFeederStatusUrl = "{{getv "/receiver/stats/page/adsbexchange"}}"; myOpenskyFeederStatusUrl = "{{getv "/receiver/stats/page/opensky/network"}}"; myPlanefinderFeederStatusUrl = "{{getv "/receiver/stats/page/planefinder"}}"; +myRadarboxFeederStatusUrl = "{{getv "/receiver/stats/page/radarbox"}}"; +myAdsbfiFeederStatusUrl = "{{getv "/receiver/stats/page/adsbfi"}}"; +myAdsbhubFeederStatusUrl = "{{getv "/receiver/stats/page/adsbhub"}}"; // The local FR24 Feeder Status page myFR24FeederStatusUrl = "{{getv "/fr24/feeder/status/page"}}";