diff --git a/README.md b/README.md
index 57cc910..fb1d9d9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# APRS Track Direct
-APRS Track Direct is a collection of tools that can be used to run an APRS website. You can use data from APRS-IS, CWOP-IS, OGN, HABHUB, CBAPRS or any other source that uses the APRS specification.
+APRS Track Direct is a collection of tools that can be used to run an APRS website. You can use data from APRS-IS, CWOP-IS, OGN or any other source that uses the APRS specification.
Tools included are an APRS data collector, a websocket server, a javascript library (websocket client and more), a heatmap generator and a website example (which can of course be used as is).
@@ -61,7 +61,7 @@ sudo python2 setup.py install
```
### Set up aprsc
-You should not to connect to a public APRS server (APRS-IS, CWOP-IS or OGN server). The collector will use a full feed connection and each websocket client will use a filtered feed connection. To not cause extra load on public servers it is better to run your own aprsc server and let your collector and all websocket connections connect to that instead (will result in only one full feed connection to a public APRS server).
+You should not to connect your collector and websocket server directly to a public APRS server (APRS-IS, CWOP-IS or OGN server). The collector will use a full feed connection and each websocket client will use a filtered feed connection (through the websocket server). To not cause extra load on public servers it is better to run your own aprsc server and let your collector and all websocket connections connect to that instead (will result in only one full feed connection to a public APRS server).
Note that it seems like aprsc needs to run on a server with a public ip, otherwise uplink won't work.
@@ -114,7 +114,7 @@ ALTER ROLE {USER} WITH SUPERUSER;
GRANT ALL PRIVILEGES ON DATABASE "trackdirect" to {USER};
```
-Remember to add password to password-file:
+Might be good to add password to password-file:
```
vi ~/.pgpass
```
diff --git a/config/trackdirect.ini b/config/trackdirect.ini
index 62d2cfe..6a2d71f 100644
--- a/config/trackdirect.ini
+++ b/config/trackdirect.ini
@@ -12,11 +12,15 @@ password="foobar"
port="5432"
;; Settings for the remover script
-days_to_save_position_data="31"
-days_to_save_station_data="90"
+days_to_save_position_data="10"
+days_to_save_station_data="30"
days_to_save_weather_data="10"
days_to_save_telemetry_data="10"
+;; If this setting is enabled, OGN stations that we are not allowed to reveal the identity of will be given a random name similar to "UNKNOWN123"
+;; If disabled we will drop all packets regarding stations that we should not reveal the identity of.
+save_ogn_stations_with_missing_identity="0"
+
[websocket_server]
@@ -29,10 +33,10 @@ port="9000"
;; Websocket server log output
error_log="~/trackdirect/server/log/wsserver_aprs.log"
-;; Frequency limit
-;; Packets received more frequently than the configured frequency limit will be dropped
-;; Frequency limit is specified in seconds, and 0 means that the limit is disabled.
-;; This setting is very useful when frequency is very high (when receiving data from the OGN network this needs to be at least 15s)
+;; Packets received more frequently than the configured frequency limit will be dropped (limit is specified in seconds)
+;; This frequency limit is only refering to pakets that is received in real time from the filtered feed used by the websocket server
+;; This frequency limit may be a bit more forgiving than the frequence limit on the collector.
+;; When receiving data from the OGN network this needs to be about 15s or more.
frequency_limit="0"
;; First APRS IS server for the websocket server to connect to.
@@ -40,6 +44,7 @@ frequency_limit="0"
aprs_host1="127.0.0.1"
aprs_port1="14580"
+;; Important that you set the correct source, otherwise it might be handled incorrect
;; - Source Id 1: APRS-IS
;; - Source Id 2: CWOP
;; - Source Id 3: CBAPRS
@@ -54,18 +59,18 @@ aprs_source_id1="1"
;aprs_source_id2="2"
;; Allow time travel
-;; Use this settings to disable data requests with a time interval
-;; Useful when it is not allowed to show data older than 24h (like when data comes from the OGN network)
-;; Note that you need to configure the remover script to delete data after 24h as well (if the source require you to do so)
+;; Use this settings to disable/enable data requests with a time interval (this must be disabled for the OGN network)
allow_time_travel="1"
-;; Max default time in seconds (how old packets that will be included in the response)
+;; Max default time in minutes (how old packets that will be included in the response)
+;; This setting should be no more than 1440 for for the OGN network.
max_default_time="1440"
-;; Max time in seconds when filtering (how old packets that will be included in the response)
-max_filter_time="14400"
+;; Max time in minutes when filtering (how old packets that will be included in the response)
+;; This setting should be no more than 1440 for for the OGN network.
+max_filter_time="1440"
-;; Time in seconds until idle client is disconnected
+;; Time in minutes until idle client is disconnected
max_client_idle_time="60"
;; Max age in seconds for real time packets waiting to be sent to client (dropping packets if limit is excceded)
@@ -78,6 +83,7 @@ host="aprsc"
port_full="10152"
port_filtered="14580"
+;; Important that you set the correct source, otherwise it might be handled incorrect
;; - Source Id 1: APRS-IS
;; - Source Id 2: CWOP
;; - Source Id 3: CBAPRS
@@ -92,10 +98,8 @@ passcode="-1"
;; Database inserts is done in batches
numbers_in_batch="50"
-;; Frequency limit
-;; Packets received more frequently than the configured frequency limit will not be shown on map.
-;; Frequency limit is specified per station in seconds, and 0 means that the limit is disabled.
-;; This setting is very useful when frequency is very high (when receiving data from the OGN network this needs to be at least 20s).
+;; Packets received more frequently than the configured frequency limit will not be shown on map (limit is specified in seconds)
+;; When receiving data from the OGN network this needs to be 20s or more.
;; If setting save_fast_packets to "0", packets that is received to frequently will not be save (useful for OGN, but not for APRS-IS).
frequency_limit="5"
save_fast_packets="1"
diff --git a/htdocs/includes/common.php b/htdocs/includes/common.php
index b8627bb..8f04af3 100644
--- a/htdocs/includes/common.php
+++ b/htdocs/includes/common.php
@@ -1744,4 +1744,35 @@ function getSymbolDescription($symbolTable, $symbol, $includeUndefinedOverlay)
}
}
}
+}
+
+
+/**
+ * Returnes true if the time travel feature works
+ *
+ * @return boolean
+ */
+function isTimeTravelAllowed() {
+ $isTimeTravelAllowed = false;
+ $config = parse_ini_file(ROOT . '/../config/trackdirect.ini', true);
+
+ if (isset($config['websocket_server'])) {
+ if (isset($config['websocket_server']['allow_time_travel'])) {
+ if ($config['websocket_server']['allow_time_travel'] == '1') {
+ $isTimeTravelAllowed = true;
+ }
+ }
+
+ if (isset($config['websocket_server']['aprs_source_id1']) && $config['websocket_server']['aprs_source_id1'] == 5) {
+ // Data source is OGN, disable time travel (server will block it anyway)
+ $isTimeTravelAllowed = false;
+ }
+
+ if (isset($config['websocket_server']['aprs_source_id2']) && $config['websocket_server']['aprs_source_id2'] == 5) {
+ // Data source is OGN, disable time travel (server will block it anyway)
+ $isTimeTravelAllowed = false;
+ }
+ }
+
+ return $isTimeTravelAllowed;
}
\ No newline at end of file
diff --git a/htdocs/includes/repositories/packetpathrepository.class.php b/htdocs/includes/repositories/packetpathrepository.class.php
index 1cb5d02..cadeae5 100644
--- a/htdocs/includes/repositories/packetpathrepository.class.php
+++ b/htdocs/includes/repositories/packetpathrepository.class.php
@@ -95,4 +95,36 @@ class PacketPathRepository extends ModelRepository
$stmt = $pdo->prepareAndExec($sql, $args);
return $stmt->fetchAll(PDO::FETCH_ASSOC);
}
+
+ /**
+ * Get latest data list by receiving station id
+ *
+ * @param int $stationId
+ * @param int $hours
+ * @param int $limit
+ * @return array
+ */
+ public function getLatestDataListByReceivingStationId($stationId, $hours, $limit)
+ {
+ if (!isInt($stationId) || !isInt($hours)) {
+ return [];
+ }
+ $minTimestamp = time() - (60*60*$hours);
+
+ $sql = 'select pp.*
+ from packet_path pp
+ where pp.station_id = ?
+ and pp.timestamp >= ?
+ and pp.number = 0
+ and pp.sending_latitude is not null
+ and pp.sending_longitude is not null
+ order by pp.timestamp
+ limit ?';
+
+ $arg = [$stationId, $minTimestamp, $limit];
+
+ $pdo = PDOConnection::getInstance();
+ $stmt = $pdo->prepareAndExec($sql, $arg);
+ return $stmt->fetchAll(PDO::FETCH_ASSOC);
+ }
}
diff --git a/htdocs/includes/repositories/packetrepository.class.php b/htdocs/includes/repositories/packetrepository.class.php
index a91511e..d61909d 100644
--- a/htdocs/includes/repositories/packetrepository.class.php
+++ b/htdocs/includes/repositories/packetrepository.class.php
@@ -148,15 +148,14 @@ class PacketRepository extends ModelRepository
* Get latest packet data list by station id (useful for creating a chart)
*
* @param int $stationId
- * @param int $startTimestamp
- * @param int $endTimestamp
+ * @param int $numberOfHours
* @param array $columns
* @return Array
*/
- public function getLatestDataListByStationId($stationId, $startTimestamp, $endTimestamp, $columns)
+ public function getLatestDataListByStationId($stationId, $numberOfHours, $columns)
{
$result = Array();
- if (!isInt($stationId) || !isInt($startTimestamp) || !isInt($endTimestamp)) {
+ if (!isInt($stationId) || !isInt($numberOfHours)) {
return $result;
}
@@ -165,27 +164,13 @@ class PacketRepository extends ModelRepository
$columns[] = 'timestamp';
}
- if ($endTimestamp < time()-60) {
- // Fetching old values
- $sql = 'select ' . implode(',', $columns) . ', position_timestamp from packet
- where station_id = ?
- and timestamp >= ?
- and (timestamp <= ? or (position_timestamp is not null and position_timestamp <= ?))
- and (speed is not null or altitude is not null)
- and map_id in (1,12,5,7,9)
- order by timestamp';
- $arg = [$stationId, $startTimestamp, $endTimestamp, $endTimestamp];
- } else {
- // Fetching recent values
- $sql = 'select ' . implode(',', $columns) . ', position_timestamp from packet
- where station_id = ?
- and timestamp >= ?
- and timestamp <= ?
- and (speed is not null or altitude is not null)
- and map_id in (1,12,5,7,9)
- order by timestamp';
- $arg = [$stationId, $startTimestamp, $endTimestamp];
- }
+ $sql = 'select ' . implode(',', $columns) . ', position_timestamp from packet
+ where station_id = ?
+ and timestamp >= ?
+ and (speed is not null or altitude is not null)
+ and map_id in (1,12,5,7,9)
+ order by timestamp';
+ $arg = [$stationId, time() - $numberOfHours*60*60];
$pdo = PDOConnection::getInstance();
$stmt = $pdo->prepareAndExec($sql, $arg);
diff --git a/htdocs/public/about.php b/htdocs/public/about.php
new file mode 100644
index 0000000..a7a119d
--- /dev/null
+++ b/htdocs/public/about.php
@@ -0,0 +1,140 @@
+
+
+
+
+ About
+
+
+
+
+
+
+
+
+
+ APRS (Automatic Packet Reporting System) is a digital communications system that uses packet radio to send real time tactical information. The APRS network is used by ham radio operators all over the world.
+
+
+ Information shared over the APRS network is for example coordinates, altitude, speed, heading, text messages, alerts, announcements, bulletins and weather data.
+
+
+
3. What is APRS Track Direct
+
+ This website is based on the APRS Track Direct tools. Read more on GitHub. But please note that the maintainer of APRS Track Direct has nothing to do with this website.
+
+
+
4. I have a map created in Google My Maps, can I render it on top of this map?
Look at the current URL and try to find a value named mid. Copy that value!
+
Open this website. Add "&mid={the mid value}" to the end of the URL.
+
Press Enter!
+
+
+
5. My latest packet seems to be using different path's depending on what website I look at (APRS-IS related). Why?
+
+ The websites you compare are not collecting packets from the same APRS-IS servers. Each APRS-IS server performes duplicate filtering, and which packet that is considered to be a duplicate may differ depending on which APRS-IS server you ask.
+
+
+
6. Where does the displayed data come from?
+
On each station you can see the specified source. APRS data can be received from APRS-IS, CWOP-IS or OGN (and more).
+
+
7. How do I prevent my data from being displayed on websites such as this?
+
A. Answer for APRS-IS/CWOP-IS and more
+
+ If you do not want your APRS data to be publiched on APRS-websites you can append NOGATE to the end of your path (or use RFONLY). If your digipeater path is WIDE1-1,WIDE2-1, you just change it to WIDE1-1,WIDE2-1,NOGATE.
+
+
+
B. Answer for OGN (Open Glider Network)
+
+ Not all information that is sent to the Open Glider Network is published.
+
+
+ Aircrafts that meet any of the following condition is not shown at all.
+ → Has the "no-tracking" flag in FLARM device configuration set.
+ → Has activated the setting "I don't want this device to be tracked" in the the OGN Devices DataBase.
+
+
+ This website will only display information that can be used to identify an aircraft if the aircraft device details exists in the OGN Devices DataBase, and if the setting "I don't want this device to be identified" is deactivated. If the website is configured to also render aircrafts that does not exists in the OGN database, the aircraft is given a temporary name that is only used for a maximum of 24h (to make sure it can not be identified).
+
+
+ Read more about how to "Opt In" or "Opt Out" here.
+
+
+
8. How is the coverage map created?
+
+ Note that the coverage map is only available for receiving stations, it tries to show from which area the station is able to receive packets.
+
+
+ The coverage map consists of two parts:
+
+
The heatmap that shows all recorded coordinates.
+
The interpolated max range plot polygon that shows the coverage.
+
+
+
+ The max range plot is created by:
+
+
We exclude positions that have a distance that is further away than the 95th percentile.
+
We use a convex hull algorithm to get a polygon of the covered area.
+
We add some padding to the area received in the previous step. This step is just used to make the polygon look a bit nicer.
+
+
+
+
9. Can you tell me how the marker logic works?
+
+ Okay, let me tell you more about our brilliant marker logic :-)
+
+
+
We have a speed limit filter and other filters that sorts out packets that has a faulty position.
+
If a moving station sends a packet that is sorted out by our speed limit filter the packet will be marked as unconfirmed, if we later receive a packet that confirmes that the station is moving in that direction, the previous packet will be confirmed then.
+
If a station moves in one area and suddently appear in another area the two tails will be connected by a dashed polyline.
+
A moving station that reports it's speed and direction will have an animated direction polyline (will be hidden after 15min).
+
The dotted polyline shows the packet transmit path, will be shown when you hover over a marker or a "dotmarker". If a station in the path hasn't sent a position packet in a long time it will show up for some seconds and than disappear again.
+
Note that the time-interval specified in the station info-window (on the map) is how long a station has been on that location without any downtime longer than 24h.
+
+
+
10. What browsers do this website support?
+
+ Our goal is that APRS Direct should work on all broswers that supports websockets (an HTML5 feature). The following browser version (and newer) supports the websocket-protocol.
+