From b1fcb71174f4f8f3dabe8dbbd8fd754c6a5f8418 Mon Sep 17 00:00:00 2001 From: Per Qvarforth Date: Sun, 30 Jan 2022 13:13:57 +0100 Subject: [PATCH 01/10] added trail chart --- htdocs/public/data/kml.php | 60 ++++++++ htdocs/public/data/trail.php | 55 +++++++ htdocs/public/station/overview.php | 3 +- htdocs/public/station/raw.php | 1 + htdocs/public/station/statistics.php | 1 + htdocs/public/station/telemetry.php | 1 + htdocs/public/station/trail.php | 210 +++++++++++++++++++++++++++ htdocs/public/station/weather.php | 1 + 8 files changed, 331 insertions(+), 1 deletion(-) create mode 100644 htdocs/public/data/kml.php create mode 100644 htdocs/public/data/trail.php create mode 100644 htdocs/public/station/trail.php diff --git a/htdocs/public/data/kml.php b/htdocs/public/data/kml.php new file mode 100644 index 0000000..7038a33 --- /dev/null +++ b/htdocs/public/data/kml.php @@ -0,0 +1,60 @@ +getObjectById($_GET['id']); +} else { + $station = new Station(null); +} + +$color = null; +if (isset($_GET['color'])) { + $color = $_GET['color']; +} + +$startTimestamp = time() - (60*60*24); // Default to 24h +if (isset($_GET['startts'])) { + $startTimestamp = $_GET['startts']; +} +if ($startTimestamp < (time() - (60*60*24*3))) { + $startTimestamp = time() - (60*60*24*3); // Not older than 3 days allowed +} + +$endTimestamp = time(); +if (isset($_GET['endts']) && isInt($_GET['endts'])) { + $endTimestamp = $_GET['endts']; +} + +$startTimestampString = strftime('%Y%m%d%H%M', $startTimestamp); +$endTimestampString = strftime('%Y%m%d%H%M', $endTimestamp); + +if ($station->isExistingObject()) { + $stationIds = []; + if ($station->stationTypeId == 2) { + $currentStations = StationRepository::getInstance()->getObjectListByName($station->name, 2, $station->sourceId); + foreach ($currentStations as $currentStation) { + $stationIds[] = $currentStation->getId(); + } + } else { + $stationIds[] = $station->getId(); + } + + $lateststation = null; + foreach ($stationIds as $stationId) { + $s = StationRepository::getInstance()->getObjectById($stationId); + if ($lateststation === null) { + $lateststation = $s; + } else if ($lateststation->latestConfirmedPacketTimestamp < $s->latestConfirmedPacketTimestamp) { + $lateststation = $s; + } + } + + $packets = PacketRepository::getInstance()->getConfirmedObjectListByStationIdList($stationIds, $startTimestamp, $endTimestamp); + $dom = Kml::getInstance()->getKmlDomDocument($lateststation, $packets, $startTimestamp, $endTimestamp, $color); + $kmlOutput = $dom->saveXML(); + + header('Content-type: application/vnd.google-earth.kml+xml'); + header('Content-Disposition: attachment; filename="' . htmlspecialchars($lateststation->name) . '-' . $startTimestampString . '-' . $endTimestampString . '.kml"'); + echo Kml::getInstance()->formatKmlContent($kmlOutput, " ", 4); +} \ No newline at end of file diff --git a/htdocs/public/data/trail.php b/htdocs/public/data/trail.php new file mode 100644 index 0000000..1229b1e --- /dev/null +++ b/htdocs/public/data/trail.php @@ -0,0 +1,55 @@ +getObjectById($_GET['id'] ?? null); +if ($station->isExistingObject()) { + $numberOfHours = $_GET['hours'] ?? 1; +error_log($numberOfHours); + $columns = ['timestamp']; + $type = 'speed'; + if ($_GET['type'] == 'speed') { + $type = 'speed'; + if ($_GET['imperialUnits'] ?? '0' == '1') { + $response[] = array('Time', 'Speed (mph)'); + } else { + $response[] = array('Time', 'Speed (kmh)'); + } + } else { + $type = 'altitude'; + if ($_GET['imperialUnits'] ?? '0' == '1') { + $response[] = array('Time', 'Altitude (ft)'); + } else { + $response[] = array('Time', 'Altitude (m)'); + } + } + $columns[] = $type; + + $packets = PacketRepository::getInstance()->getLatestDataListByStationId($_GET['id'] ?? null, $numberOfHours, $columns); + foreach($packets as $packet) { + $value = floatval($packet[$type]); + if ($_GET['imperialUnits'] ?? '0' == '1') { + if ($type == 'speed') { + $value = convertKilometerToMile($value); + } else if ($type == 'altitude') { + $value = convertMeterToFeet($value); + } + } + + if ($type == 'speed' && count($response) > 1) { + if (isset($response[count($response) - 1])) { + $prevTimestamp = $response[count($response) - 1][0]; + if ($prevTimestamp < ($timestamp - 60*60)) { + // Previous value is old, make sure we have a break in graph + $response[] = array($prevTimestamp + 1, null); + } + } + } + + $response[] = [$packet['timestamp'], $value]; + } +} + +header('Content-type: application/json'); +echo json_encode($response); diff --git a/htdocs/public/station/overview.php b/htdocs/public/station/overview.php index bd47579..e05c0c5 100644 --- a/htdocs/public/station/overview.php +++ b/htdocs/public/station/overview.php @@ -52,6 +52,7 @@
Overview Statistics + Trail Chart Weather Telemetry Raw packets @@ -436,7 +437,7 @@ -
Export name); ?> data to KML
+
Export name); ?> data to KML
diff --git a/htdocs/public/station/raw.php b/htdocs/public/station/raw.php index 9bf2892..3879c9e 100644 --- a/htdocs/public/station/raw.php +++ b/htdocs/public/station/raw.php @@ -84,6 +84,7 @@
Overview Statistics + Trail Chart Weather Telemetry Raw packets diff --git a/htdocs/public/station/statistics.php b/htdocs/public/station/statistics.php index ec935e0..9865734 100644 --- a/htdocs/public/station/statistics.php +++ b/htdocs/public/station/statistics.php @@ -44,6 +44,7 @@
Overview Statistics + Trail Chart Weather Telemetry Raw packets diff --git a/htdocs/public/station/telemetry.php b/htdocs/public/station/telemetry.php index 7bd4ef5..2bb56e6 100644 --- a/htdocs/public/station/telemetry.php +++ b/htdocs/public/station/telemetry.php @@ -73,6 +73,7 @@
Overview Statistics + Trail Chart Weather Telemetry Raw packets diff --git a/htdocs/public/station/trail.php b/htdocs/public/station/trail.php new file mode 100644 index 0000000..1bc6557 --- /dev/null +++ b/htdocs/public/station/trail.php @@ -0,0 +1,210 @@ + + +getObjectById($_GET['id'] ?? null); ?> +isExistingObject()) : ?> + + + + + <?php echo $station->name; ?> Trail Chart + + + + + + + + + + + + + +
+
+ Overview + Statistics + Trail Chart + Weather + Telemetry + Raw packets +
+ +
 
+ +

+ Show chart for +

+ + +
+ + + +
+ +
+ +
+ +

+ * chart x-axis is based on your timezone (not the timezone of the station). +

+
+ + + \ No newline at end of file diff --git a/htdocs/public/station/weather.php b/htdocs/public/station/weather.php index d52090c..715fd81 100644 --- a/htdocs/public/station/weather.php +++ b/htdocs/public/station/weather.php @@ -68,6 +68,7 @@
Overview Statistics + Trail Chart Weather Telemetry Raw packets From c14430124acddc1506060ea3d6c011b9cece820f Mon Sep 17 00:00:00 2001 From: Per Qvarforth Date: Sun, 30 Jan 2022 13:17:19 +0100 Subject: [PATCH 02/10] improved about dialog --- htdocs/public/about.php | 140 +++++++++++++++++++++++++++++++++++++ htdocs/public/css/main.css | 4 +- htdocs/public/index.php | 41 +++++------ 3 files changed, 160 insertions(+), 25 deletions(-) create mode 100644 htdocs/public/about.php 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 + + + + + + + + +
+

1. I have a question. Who may I contact?

+

+ Maintainer of this website is Unknown. +

+ +

2. What is APRS?

+

+ 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?

+

+ Sure! Follow the following instructions... +

+
    +
  1. Open your map at Google My Maps.
    2. +
  2. Look at the current URL and try to find a value named mid. Copy that value!
    3. +
  3. Open this website. Add "&mid={the mid value}" to the end of the URL.
    4. +
  4. Press Enter!
    5. +
+ +

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: +

    +
  1. We exclude positions that have a distance that is further away than the 95th percentile.
    2. +
  2. We use a convex hull algorithm to get a polygon of the covered area.
    3. +
  3. 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.
    4. +
+

+ +

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. +

+
    +
  • Internet Explorer 10 (released 4/9 2012)
    • +
  • Edge 12 (released 30/3 2015)
    • +
  • Firefox 11 (released 31/1 2012)
    • +
  • Chrome 16 (released 25/10 2012)
    • +
  • Safari 7 (released 22/10 2013)
    • +
  • Opera 6.1 (released 5/11 2012)
    • +
  • iOS Safari 6.1 (released 28/1 2013)
    • +
  • Android Browser 4.4 (released 9/12 2013)
    • +
  • Blackberry browser 7 (released 1/1 2012)
    • +
  • Opera Mobile 12.1 (released 9/10 2012)
    • +
  • Chrome 53 for Android (released 8/9 2016)
    • +
  • Firefox 49 for Android (released 20/9 2016)
    • +
  • IE Mobile 10 (released 20/6 2012)
    • +
  • UC Browser 11 (released 17/8 2016)
    • +
  • Samsung Internet 4 (released 19/4 2016)
    • +
+
+ + diff --git a/htdocs/public/css/main.css b/htdocs/public/css/main.css index d7fa822..7c587cd 100755 --- a/htdocs/public/css/main.css +++ b/htdocs/public/css/main.css @@ -11,7 +11,7 @@ body { height: 100%; font-family: "Sans-serif", "Helvetica" !important; - font-size: 14px; + font-size: 12px; background: #fff; } @@ -264,7 +264,7 @@ a { overflow: hidden; } -#modal-station-info-iframe, #modal-station-search-iframe { +#modal-station-info-iframe, #modal-station-search-iframe, #modal-about-iframe { width: 100%; height: 100%; border: none; diff --git a/htdocs/public/index.php b/htdocs/public/index.php index 2333f6b..9d5ef77 100755 --- a/htdocs/public/index.php +++ b/htdocs/public/index.php @@ -24,7 +24,8 @@ - + + @@ -52,9 +53,6 @@ + @@ -56,6 +57,7 @@ var options = {}; options['isMobile'] = false; options['useImperialUnit'] = ; + options['coverageDataUrl'] = 'data/coverage.php';; var md = new MobileDetect(window.navigator.userAgent); if (md.mobile() !== null) { diff --git a/htdocs/public/js/convex-hull.js b/htdocs/public/js/convex-hull.js new file mode 100644 index 0000000..376cb7f --- /dev/null +++ b/htdocs/public/js/convex-hull.js @@ -0,0 +1,87 @@ +/* + * Convex hull algorithm - Library (compiled from TypeScript) + * + * Copyright (c) 2021 Project Nayuki + * https://www.nayuki.io/page/convex-hull-algorithm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program (see COPYING.txt and COPYING.LESSER.txt). + * If not, see . + */ +"use strict"; +var convexhull; +(function (convexhull) { + // Returns a new array of points representing the convex hull of + // the given set of points. The convex hull excludes collinear points. + // This algorithm runs in O(n log n) time. + function makeHull(points) { + var newPoints = points.slice(); + newPoints.sort(convexhull.POINT_COMPARATOR); + return convexhull.makeHullPresorted(newPoints); + } + convexhull.makeHull = makeHull; + // Returns the convex hull, assuming that each points[i] <= points[i + 1]. Runs in O(n) time. + function makeHullPresorted(points) { + if (points.length <= 1) + return points.slice(); + // Andrew's monotone chain algorithm. Positive y coordinates correspond to "up" + // as per the mathematical convention, instead of "down" as per the computer + // graphics convention. This doesn't affect the correctness of the result. + var upperHull = []; + for (var i = 0; i < points.length; i++) { + var p = points[i]; + while (upperHull.length >= 2) { + var q = upperHull[upperHull.length - 1]; + var r = upperHull[upperHull.length - 2]; + if ((q.x - r.x) * (p.y - r.y) >= (q.y - r.y) * (p.x - r.x)) + upperHull.pop(); + else + break; + } + upperHull.push(p); + } + upperHull.pop(); + var lowerHull = []; + for (var i = points.length - 1; i >= 0; i--) { + var p = points[i]; + while (lowerHull.length >= 2) { + var q = lowerHull[lowerHull.length - 1]; + var r = lowerHull[lowerHull.length - 2]; + if ((q.x - r.x) * (p.y - r.y) >= (q.y - r.y) * (p.x - r.x)) + lowerHull.pop(); + else + break; + } + lowerHull.push(p); + } + lowerHull.pop(); + if (upperHull.length == 1 && lowerHull.length == 1 && upperHull[0].x == lowerHull[0].x && upperHull[0].y == lowerHull[0].y) + return upperHull; + else + return upperHull.concat(lowerHull); + } + convexhull.makeHullPresorted = makeHullPresorted; + function POINT_COMPARATOR(a, b) { + if (a.x < b.x) + return -1; + else if (a.x > b.x) + return +1; + else if (a.y < b.y) + return -1; + else if (a.y > b.y) + return +1; + else + return 0; + } + convexhull.POINT_COMPARATOR = POINT_COMPARATOR; +})(convexhull || (convexhull = {})); \ No newline at end of file diff --git a/htdocs/public/js/trackdirect.min.js b/htdocs/public/js/trackdirect.min.js index 3e3ba9d..d730ec1 100755 --- a/htdocs/public/js/trackdirect.min.js +++ b/htdocs/public/js/trackdirect.min.js @@ -1,4 +1,4 @@ -var trackdirect={services:{},models:{},_time:null,_timetravel:null,_center:null,_zoom:null,_maptype:null,_mid:null,_rulers:[],_filterTimeoutId:null,_waitForFilterResponse:false,_doNotChangeLocationOnFilterResponse:false,_doNotChangeLocationOnFilterResponseTmp:false,_filters:{},_defaultLatitude:null,_defaultLongitude:null,_eventListeners:{},_eventListenersOnce:{},_cordinatesContainerElementId:null,_statusContainerElementId:"td-status-text",_mapElementId:null,_wsServerUrl:null,_map:null,_websocket:null,_mapCreated:false,_trackdirectInitDone:false,isMobile:false,settings:{},init:function(wsServerUrl,mapElementId,options){this._initSettings();this._wsServerUrl=wsServerUrl;this._mapElementId=mapElementId;if($("#"+mapElementId).length<=0){console.log("ERROR: Specified map element missing");return;} +var trackdirect={services:{},models:{},_time:null,_timetravel:null,_center:null,_zoom:null,_maptype:null,_mid:null,_rulers:[],_filterTimeoutId:null,_waitForFilterResponse:false,_doNotChangeLocationOnFilterResponse:false,_doNotChangeLocationOnFilterResponseTmp:false,_filters:{},_defaultLatitude:null,_defaultLongitude:null,_eventListeners:{},_eventListenersOnce:{},_cordinatesContainerElementId:null,_statusContainerElementId:"td-status-text",_mapElementId:null,_wsServerUrl:null,_map:null,_websocket:null,_mapCreated:false,_trackdirectInitDone:false,isMobile:false,coverageDataUrl:null,settings:{},init:function(wsServerUrl,mapElementId,options){this._initSettings();this._wsServerUrl=wsServerUrl;this._mapElementId=mapElementId;if($("#"+mapElementId).length<=0){console.log("ERROR: Specified map element missing");return;} if(typeof google==="object"&&typeof google.maps==="object"){this.settings.defaultMinZoomForMarkerLabel=12;this.settings.minZoomForMarkerLabel=12;} this._parseOptions(options);var me=this;this.addListener("map-created",function(){me._initTime();me._websocket=new trackdirect.Websocket(me._wsServerUrl);me._initWebsocketListeners();me._handleWebsocketStateChange();me._initMapListeners();if(!me._initFilterUrlRequest()){trackdirect.services.callbackExecutor.add(me,me._sendPositionRequest,[]);} me._setWebsocketStateIdle();if(inIframe()){var parentUrl="";try{parentUrl=window.location!=window.parent.location?document.referrer:document.location.href;}catch(e){parentUrl="Unknown";}} @@ -15,7 +15,8 @@ if(stationId!==null){var trackLinkElementClass="trackStationLink"+stationId;$(". if(this._map.state.trackStationId!==null){var trackLinkElementClass="trackStationLink"+this._map.state.trackStationId;$("."+trackLinkElementClass).html("Track");} this._map.state.onlyTrackRecentPackets=onlyTrackRecentPackets;this._map.state.trackStationId=stationId;this._emitEventListeners("track-changed",[stationId,stationName]);},focusOnStation:function(stationId,openInfoWindow){var map=this._map;openInfoWindow=typeof openInfoWindow!=="undefined"?openInfoWindow:false;var marker=map.markerCollection.getStationLatestMarker(stationId);if(marker!==null){marker.show();marker.showLabel();if(openInfoWindow){map.openMarkerInfoWindow(marker,false);}else{this.setCenter(marker.packet.latitude,marker.packet.longitude);} marker.hide(5000,true);}},focusOnMarkerId:function(markerId,zoom){var map=this._map;var markerIdKey=map.markerCollection.getMarkerIdKey(markerId);if(map.markerCollection.isExistingMarker(markerIdKey)){var marker=map.markerCollection.getMarker(markerIdKey);if(map.markerCollection.hasRelatedDashedPolyline(marker)){newerMarker=map.markerCollection.getMarker(marker._relatedMarkerOriginDashedPolyLine.ownerMarkerIdKey);if(newerMarker.packet.hasConfirmedMapId()){return this.focusOnMarkerId(newerMarker.packet.marker_id);}} -marker.show();marker.showLabel();this.setCenter(marker.packet.latitude,marker.packet.longitude,zoom);map.openMarkerInfoWindow(marker);marker.hide(5000,true);}},setMapType:function(mapType){if(this._map!==null){this._map.setMapType(mapType);}},getMapType:function(){if(this._map!==null){return this._map.getMapType();}},setMapDefaultLocation:function(setDefaultZoom){this._map.setMapDefaultLocation(setDefaultZoom);},setMapLocationByGeoLocation:function(failCallBack,successCallBack,timeout){var me=this;if(navigator&&navigator.geolocation){navigator.geolocation.getCurrentPosition(function(position){var pos={lat:position.coords.latitude,lng:position.coords.longitude,};me._map.setCenter(pos,12);if(successCallBack!==null){successCallBack();}},function(error){if(failCallBack!==null){failCallBack(error.message);}},{enableHighAccuracy:false,timeout:timeout,maximumAge:5000,});}else{if(failCallBack!==null){failCallBack();}}},openStationInformationDialog:function(stationId){var packet=this._map.markerCollection.getStationLatestPacket(stationId);if(packet==null){packet={station_id:stationId,id:null};} +marker.show();marker.showLabel();this.setCenter(marker.packet.latitude,marker.packet.longitude,zoom);map.openMarkerInfoWindow(marker);marker.hide(5000,true);}},toggleStationCoverage:function(stationId,coverageLinkElementClass){coverageLinkElementClass=typeof coverageLinkElementClass!=="undefined"?coverageLinkElementClass:null;var coveragePolygon=this._map.markerCollection.getStationCoverage(stationId);if(coveragePolygon!==null&&coveragePolygon.isRequestedToBeVisible()){coveragePolygon.hide();if(coverageLinkElementClass!==null){$("."+coverageLinkElementClass).html("Coverage");}}else{if(coveragePolygon!==null){coveragePolygon.show();if(!coveragePolygon.hasContent()){alert("Currently we do not have enough data to create a max range coverage plot for this station. Try again later!");}else{if(coverageLinkElementClass!==null){$("."+coverageLinkElementClass).html("Hide coverage");}}}else{var packet=this._map.markerCollection.getStationLatestPacket(stationId);var center={lat:parseFloat(packet.latitude),lng:parseFloat(packet.longitude),};var coveragePolygon=new trackdirect.models.StationCoveragePolygon(center,this._map,true);this._map.markerCollection.addStationCoverage(stationId,coveragePolygon);coveragePolygon.showWhenDone();if(coverageLinkElementClass!==null){$("."+coverageLinkElementClass).html('Loading ');coveragePolygon.addTdListener("visible",function(){if(!coveragePolygon.hasContent()){coveragePolygon.hide();alert("Currently we do not have enough data to create a max range coverage plot for this station. Try again later!");$("."+coverageLinkElementClass).html("Coverage");}else{$("."+coverageLinkElementClass).html("Hide coverage");}},true);} +var me=this;$.getJSON(this.coverageDataUrl+"?id="+stationId,function(data){if("station_id"in data&&"coverage"in data){coveragePolygon.setData(data["coverage"]);var marker=me._map.markerCollection.getStationLatestMarker(stationId);if(marker.isVisible()){if(coveragePolygon.isRequestedToBeVisible()){coveragePolygon.show();}}}}).fail(function(){coveragePolygon.hide();alert("Failed to fetch coverage data. Try again later!");$("."+coverageLinkElementClass).html("Coverage");}).always(function(){});}}},setMapType:function(mapType){if(this._map!==null){this._map.setMapType(mapType);}},getMapType:function(){if(this._map!==null){return this._map.getMapType();}},setMapDefaultLocation:function(setDefaultZoom){this._map.setMapDefaultLocation(setDefaultZoom);},setMapLocationByGeoLocation:function(failCallBack,successCallBack,timeout){var me=this;if(navigator&&navigator.geolocation){navigator.geolocation.getCurrentPosition(function(position){var pos={lat:position.coords.latitude,lng:position.coords.longitude,};me._map.setCenter(pos,12);if(successCallBack!==null){successCallBack();}},function(error){if(failCallBack!==null){failCallBack(error.message);}},{enableHighAccuracy:false,timeout:timeout,maximumAge:5000,});}else{if(failCallBack!==null){failCallBack();}}},openStationInformationDialog:function(stationId){var packet=this._map.markerCollection.getStationLatestPacket(stationId);if(packet==null){packet={station_id:stationId,id:null};} this._emitEventListeners("station-name-clicked",packet);},openMarkerInfoWindow:function(markerId){var markerIdKey=this._map.markerCollection.getMarkerIdKey(markerId);if(this._map.markerCollection.isExistingMarker(markerIdKey)){var marker=this._map.markerCollection.getMarker(markerIdKey);this._map.openMarkerInfoWindow(marker);}},closeAnyOpenInfoWindow:function(){if(this._map!==null){var state=this._map.state;if(state.isInfoWindowOpen()){state.openInfoWindow.hide();}}},setTimeTravelTimestamp:function(ts,sendRequestToServer){if(ts!=0||this._map.state.endTimeTravelTimestamp!=null){sendRequestToServer=typeof sendRequestToServer!=="undefined"?sendRequestToServer:true;if(this._map.state.endTimeTravelTimestamp!=ts){if(ts!=null&&ts!=0&&ts!=""){this._map.state.endTimeTravelTimestamp=ts;}else{this._map.state.endTimeTravelTimestamp=null;} if(sendRequestToServer){trackdirect.services.callbackExecutor.add(this,this._handleTimeChange,[]);}} this._emitEventListeners("time-travel-changed",ts);this._emitEventListeners("mode-changed");}},getTimeTravelTimestamp:function(){return this._map.state.endTimeTravelTimestamp;},setTimeLength:function(time,sendRequestToServer){sendRequestToServer=typeof sendRequestToServer!=="undefined"?sendRequestToServer:true;if(this._map.state.getTimeLength()/60!=time){this._map.state.setTimeLength(time*60);if(sendRequestToServer){trackdirect.services.callbackExecutor.add(this,this._handleTimeChange,[]);}} @@ -35,6 +36,7 @@ var packet=this._map.markerCollection.getStationLatestPacket(stationId);if(packe this.trackStation(stationId,stationName,true);}}},_initSettings:function(){this.settings={animate:true,defaultMinZoomForMarkerLabel:11,defaultMinZoomForMarkerPrevPosition:11,defaultMinZoomForMarkerTail:9,minZoomForMarkerLabel:11,minZoomForMarkerPrevPosition:11,minZoomForMarkerTail:9,minZoomForMarkers:8,markerSymbolBaseDir:"/symbols/",imagesBaseDir:"/images/",defaultCurrentZoom:11,defaultCurrentZoomMobile:11,dateFormat:"L LTSZ",dateFormatNoTimeZone:"L LTS",host:"www.aprsdirect.com",baseUrl:"https://www.aprsdirect.com",defaultTimeLength:60,symbolsToScale:[],primarySymbolWithNoDirectionPolyline:[87,64,95],alternativeSymbolWithNoDirectionPolyline:[40,42,64,74,84,85,96,98,101,102,112,116,119,121,123,],};},_parseOptions:function(options){if(typeof options["cordinatesContainerElementId"]!==undefined){this._cordinatesContainerElementId=options["cordinatesContainerElementId"];} if(typeof options["statusContainerElementId"]!==undefined){this._statusContainerElementId=options["statusContainerElementId"];} if(typeof options["isMobile"]!==undefined){this.isMobile=options["isMobile"];} +if(typeof options["coverageDataUrl"]!==undefined){this.coverageDataUrl=options["coverageDataUrl"];} if(typeof options["time"]!==undefined){this._time=options["time"];} if(typeof options["timetravel"]!==undefined){this._timetravel=options["timetravel"];} if(typeof options["center"]!==undefined){this._center=options["center"];} @@ -257,6 +259,36 @@ trackdirect.models.TailPolyline.prototype.constructor=trackdirect.models.TailPol return null;};trackdirect.models.TailPolyline.prototype.pushPathItem=function(latLng){if(typeof google==="object"&&typeof google.maps==="object"){var path=google.maps.Polyline.prototype.getPath.call(this);path.push(latLng);}else if(typeof L==="object"){this.addLatLng(latLng);}};trackdirect.models.TailPolyline.prototype.removePathItem=function(index){if(typeof google==="object"&&typeof google.maps==="object"){var path=google.maps.Polyline.prototype.getPath.call(this);path.removeAt(index);}else if(typeof L==="object"){var list=this.getLatLngs();if(typeof list[index]!=="undefined"){list.splice(index,1);this.setLatLngs(list);}}};trackdirect.models.TailPolyline.prototype.getPathLength=function(index){if(typeof google==="object"&&typeof google.maps==="object"){var path=google.maps.Polyline.prototype.getPath.call(this);return path.getLength();}else if(typeof L==="object"){var list=this.getLatLngs();return list.length;}};trackdirect.models.TailPolyline.prototype.getPath=function(){if(typeof google==="object"&&typeof google.maps==="object"){return google.maps.Polyline.prototype.getPath.call(this);}else if(typeof L==="object"){return this.getLatLngs();} return[];};trackdirect.models.TailPolyline.prototype.getMap=function(){if(typeof google==="object"&&typeof google.maps==="object"){var map=google.maps.Polyline.prototype.getMap.call(this);if(typeof map!=="undefined"){return map;}}else if(typeof L==="object"){if(this._defaultMap.hasLayer(this)){return this._defaultMap;}} return null;};trackdirect.models.TailPolyline.prototype.setMarkerIdKey=function(markerIdKey){this.markerIdKey=markerIdKey;this.ownerMarkerIdKey=markerIdKey;this._addInfoWindowListener(markerIdKey);};trackdirect.models.TailPolyline.prototype.setRelatedMarkerIdKey=function(markerIdKey){this.relatedMarkerIdKey=markerIdKey;};trackdirect.models.TailPolyline.prototype.show=function(){if(typeof google==="object"&&typeof google.maps==="object"){if(typeof this.getMap()==="undefined"||this.getMap()===null){this.setMap(this._defaultMap);}}else if(typeof L==="object"){if(!this._defaultMap.hasLayer(this)){this.addTo(this._defaultMap);}}};trackdirect.models.TailPolyline.prototype.hide=function(){if(typeof google==="object"&&typeof google.maps==="object"){if(this.getMap()!==null){this.setMap(null);}}else if(typeof L==="object"){if(this._defaultMap.hasLayer(this)){this._defaultMap.removeLayer(this);}}};trackdirect.models.TailPolyline.prototype.addMarker=function(marker){if(typeof google==="object"&&typeof google.maps==="object"){var latLng=new google.maps.LatLng(parseFloat(marker.packet.latitude),parseFloat(marker.packet.longitude));latLng.marker=marker;this.pushPathItem(latLng);}else if(typeof L==="object"){var latLng=new L.latLng(parseFloat(marker.packet.latitude),parseFloat(marker.packet.longitude));latLng.marker=marker;this.addLatLng(latLng);}};trackdirect.models.TailPolyline.prototype._addInfoWindowListener=function(markerIdKey){var me=this;if(typeof google==="object"&&typeof google.maps==="object"){google.maps.event.addListener(this,"click",function(event){var marker=me._defaultMap.markerCollection.getMarker(markerIdKey);me._defaultMap.openPolylineInfoWindow(marker,event.latLng);});}else if(typeof L==="object"){this.on("click",function(event){var marker=me._defaultMap.markerCollection.getMarker(markerIdKey);me._defaultMap.openPolylineInfoWindow(marker,event.latlng);});}};trackdirect.models.TailPolyline.prototype._getGooglePolylineOptions=function(color){return{geodesic:false,strokeOpacity:0.6,strokeWeight:4,strokeColor:color,map:null,zIndex:100,};};trackdirect.models.TailPolyline.prototype._getLeafletPolylineOptions=function(color){return{opacity:0.7,weight:4,color:color,};}; +trackdirect.models.StationCoveragePolygon=function(center,map,tryToShowCoveragePolygon){tryToShowCoveragePolygon=typeof tryToShowCoveragePolygon!=="undefined"?tryToShowCoveragePolygon:true;this._showPolygon=tryToShowCoveragePolygon;this._map=map;this._center=center;this._isRequestedToBeVisible=false;this._polygon=null;this._polygonCoordinates=null;this._heatmapCoordinates=null;this._heatmap=null;this._tdEventListeners={};this._tdEventListenersOnce={};this._upperMaxRangeInMeters=1000*1000;this._percentile=95;this._paddingInPercentOfMaxRange=10;this._paddingMinInMeters=1000;};trackdirect.models.StationCoveragePolygon.prototype.setData=function(data){this._addParametersToData(data);this._heatmapCoordinates=this._getCoordinates(data);if(this._showPolygon){var maxRange=this._getCoveragePolygonMaxRange(data);if(maxRange<=0){this._showPolygon=false;}else{this._polygonCoordinates=this._getConvexHullCoordinates(data,maxRange);}} +if(typeof google==="object"&&typeof google.maps==="object"){this._googleMapsInit();}else if(typeof L==="object"){this._leafletInit();}};trackdirect.models.StationCoveragePolygon.prototype.addTdListener=function(event,handler,execOnce){execOnce=typeof execOnce!=="undefined"?execOnce:false;if(execOnce){if(!(event in this._tdEventListenersOnce)){this._tdEventListenersOnce[event]=[];} +this._tdEventListenersOnce[event].push(handler);}else{if(!(event in this._tdEventListeners)){this._tdEventListeners[event]=[];} +this._tdEventListeners[event].push(handler);}};trackdirect.models.StationCoveragePolygon.prototype.hasContent=function(){if(this._heatmapCoordinates!==null&&this._heatmapCoordinates.length>0){return true;} +return false;};trackdirect.models.StationCoveragePolygon.prototype.isRequestedToBeVisible=function(){return this._isRequestedToBeVisible;};trackdirect.models.StationCoveragePolygon.prototype.showWhenDone=function(){this._isRequestedToBeVisible=true;};trackdirect.models.StationCoveragePolygon.prototype.show=function(){if(typeof google==="object"&&typeof google.maps==="object"){if(this._polygon!==null){this._polygon.setMap(this._map);} +if(this._heatmap!==null){this._heatmap.setMap(this._map);}}else if(typeof L==="object"){if(this._polygon!==null){this._polygon.addTo(this._map);} +if(this._heatmap!==null){this._heatmap.addTo(this._map);}} +this._isRequestedToBeVisible=true;if(this._showPolygon&&this._polygonCoordinates!==null){this._emitTdEventListeners("visible");}else if(this._heatmapCoordinates!==null){this._emitTdEventListeners("visible");}};trackdirect.models.StationCoveragePolygon.prototype.hide=function(stillMarkAsVisible){stillMarkAsVisible=typeof stillMarkAsVisible!=="undefined"?stillMarkAsVisible:false;if(typeof google==="object"&&typeof google.maps==="object"){if(this._polygon!==null){this._polygon.setMap(null);} +if(this._heatmap!==null){this._heatmap.setMap(null);}}else if(typeof L==="object"){if(this._polygon!==null){this._map.removeLayer(this._polygon);} +if(this._heatmap!==null){this._map.removeLayer(this._heatmap);}} +if(!stillMarkAsVisible){this._isRequestedToBeVisible=false;} +this._emitTdEventListeners("hidden");};trackdirect.models.StationCoveragePolygon.prototype._googleMapsInit=function(){if(this._polygonCoordinates!==null&&this._polygonCoordinates.length>0){this._polygon=new google.maps.Polygon({paths:this._polygonCoordinates,strokeColor:"#0000FF",strokeOpacity:0,strokeWeight:0,fillColor:"#0000FF",fillOpacity:0.2,});} +if(this._heatmapCoordinates!==null&&this._heatmapCoordinates.length>0){var data=[];for(var i=0;i0){this._polygon=new L.polygon(this._polygonCoordinates,{color:"#0000FF",opacity:0,weight:0,fillColor:"#0000FF",fillOpacity:0.2,});} +if(this._heatmapCoordinates!==null&&this._heatmapCoordinates.length>0){var data=[];for(var i=0;imaxRange){continue;} +result.push(data[i].latLngLiteral);} +return result;};trackdirect.models.StationCoveragePolygon.prototype._getCoveragePolygonMaxRange=function(data){var maxRange=this._getDistancePercentile(data,this._percentile,this._upperMaxRangeInMeters);if(isNaN(maxRange)){maxRange=0;} +return maxRange;};trackdirect.models.StationCoveragePolygon.prototype._getDistancePercentile=function(data,percentile,upperMaxRange){var values=[];for(var i=0;imaxRange){continue;} +counter++;} +return counter;};trackdirect.models.StationCoveragePolygon.prototype._convertToXYPos=function(positions){var result=[];for(var i=0;i99999){if(this._map.state.useImperialUnit){distance=Math.round(trackdirect.services.imperialConverter.convertKilometerToMile(distance/1000)).toString()+" miles";}else{distance=Math.round(distance/1000).toString()+" km";}}else if(distance>999){if(this._map.state.useImperialUnit){distance=(Math.round(trackdirect.services.imperialConverter.convertKilometerToMile(distance/1000)*10)/10).toString()+" miles";}else{distance=(Math.round(distance/100)/10).toString()+" km";}}else{distance=distance.toString()+" m";} var bearing=Math.round(trackdirect.services.distanceCalculator.getBearing(p2,p1),0).toString();return bearing+"º "+distance;};trackdirect.models.Ruler.prototype._getPositionLiteral=function(marker){if(typeof google==="object"&&typeof google.maps==="object"){var latLng=marker.getPosition();if(typeof latLng!=="undefined"&&typeof latLng.lat==="function"){return{lat:latLng.lat(),lng:latLng.lng()};}else{return latLng;}}else if(typeof L==="object"){var latLng=marker.getLatLng();if(typeof latLng!=="undefined"){return{lat:latLng.lat,lng:latLng.lng};}else{return latLng;}} @@ -381,7 +413,7 @@ if(marker.overwrite==true&&packet.overwrite==0){return false;}else{if(marker.pac if(marker.packet.reported_timestamp!==null&&packet.reported_timestamp!==null&&Math.abs(marker.packet.reported_timestamp-packet.reported_timestamp)<600){if(marker.packet.reported_timestamp>packet.reported_timestamp){return true;}}}} if(packet.is_moving==1){var list=this._map.markerCollection.getStationMarkerIdKeys(packet.station_id);for(var relatedMarkerIdKey in list){var relatedMarker=this._map.markerCollection.getMarker(relatedMarkerIdKey);if(relatedMarker!==null&&relatedMarker.overwrite==false&&relatedMarker.packet.timestamp>packet.timestamp){return true;}}} return false;}; -trackdirect.models.MarkerCollection=function(){this._markerKeys={};this._markers=[];this._stationMarkers={};this._stationLastMovingMarkerIdKey={};this._stationLastMarker={};this._senderLastMarker={};this._positionMarkersIdKeys={};this._dotMarkers=[];this._markerPolyLines=[];this._markerOriginDashedPolyLines=[];this._mapSectorMarkerIdKeys={};this.resetAllMarkers();};trackdirect.models.MarkerCollection.prototype.getMarkerIdKey=function(markerId){if(!(markerId in this._markerKeys)){this._markers.push(null);this._markerPolyLines.push(null);this._dotMarkers.push(null);this._markerOriginDashedPolyLines.push(null);var markerIdKey=this._markers.length-1;this._markerKeys[markerId]=markerIdKey;return markerIdKey;}else{return this._markerKeys[markerId];}};trackdirect.models.MarkerCollection.prototype.isExistingMarker=function(markerIdKey){if(markerIdKey in this._markers&&this._markers[markerIdKey]!==null){return true;} +trackdirect.models.MarkerCollection=function(){this._markerKeys={};this._markers=[];this._stationMarkers={};this._stationLastMovingMarkerIdKey={};this._stationLastMarker={};this._senderLastMarker={};this._positionMarkersIdKeys={};this._dotMarkers=[];this._markerPolyLines=[];this._markerOriginDashedPolyLines=[];this._mapSectorMarkerIdKeys={};this._stationCoverage={};this.resetAllMarkers();};trackdirect.models.MarkerCollection.prototype.getMarkerIdKey=function(markerId){if(!(markerId in this._markerKeys)){this._markers.push(null);this._markerPolyLines.push(null);this._dotMarkers.push(null);this._markerOriginDashedPolyLines.push(null);var markerIdKey=this._markers.length-1;this._markerKeys[markerId]=markerIdKey;return markerIdKey;}else{return this._markerKeys[markerId];}};trackdirect.models.MarkerCollection.prototype.isExistingMarker=function(markerIdKey){if(markerIdKey in this._markers&&this._markers[markerIdKey]!==null){return true;} return false;};trackdirect.models.MarkerCollection.prototype.setMarker=function(markerIdKey,marker){if(marker!==null&&typeof marker.packet!=="undefined"){var packet=marker.packet;this._markers[markerIdKey]=marker;this._addStationMarkerId(markerIdKey,packet);this._addStationLastMarker(packet,marker);this.addPostionMarkerId(markerIdKey,packet);}};trackdirect.models.MarkerCollection.prototype.getMarker=function(markerIdKey){if(markerIdKey!==null&&markerIdKey in this._markers){return this._markers[markerIdKey];} return null;};trackdirect.models.MarkerCollection.prototype.getAllMarkers=function(){return this._markers;};trackdirect.models.MarkerCollection.prototype.removeMarker=function(markerIdKey){if(markerIdKey!==null&&markerIdKey in this._markers){this._markers.splice(markerIdKey,1);}};trackdirect.models.MarkerCollection.prototype.getNumberOfMarkers=function(){return this._markers.length;};trackdirect.models.MarkerCollection.prototype.setMarkerLabel=function(markerIdKey,label){if(markerIdKey in this._markers&&this._markers[markerIdKey]!==null){this._markers[markerIdKey].label=label;}};trackdirect.models.MarkerCollection.prototype.getMarkerLabel=function(markerIdKey){if(markerIdKey in this._markers&&this._markers[markerIdKey]!==null){return this._markers[markerIdKey].label;} return null;};trackdirect.models.MarkerCollection.prototype.hasMarkerLabel=function(markerIdKey){if(markerIdKey in this._markers&&this._markers[markerIdKey]!==null&&this._markers[markerIdKey].label!==null){return true;} @@ -390,6 +422,9 @@ for(var markerIdKey in this.getPositionMarkerIdKeys(packet.latitude,packet.longi return false;};trackdirect.models.MarkerCollection.prototype.addDotMarker=function(markerIdKey,dotMarker){if(markerIdKey in this._dotMarkers){if(this._dotMarkers[markerIdKey]===null){this._dotMarkers[markerIdKey]=[];} this._dotMarkers[markerIdKey].push(dotMarker);}};trackdirect.models.MarkerCollection.prototype.getDotMarkers=function(markerIdKey){if(markerIdKey in this._dotMarkers&&this._dotMarkers[markerIdKey]!==null){return this._dotMarkers[markerIdKey];} return[];};trackdirect.models.MarkerCollection.prototype.hasDotMarkers=function(markerIdKey){if(markerIdKey in this._dotMarkers&&this._dotMarkers[markerIdKey]!==null&&this._dotMarkers[markerIdKey].length>0){return true;} +return false;};trackdirect.models.MarkerCollection.prototype.addStationCoverage=function(stationId,stationCoveragePolygon){this._stationCoverage[stationId]=stationCoveragePolygon;};trackdirect.models.MarkerCollection.prototype.getStationCoverage=function(stationId){if(stationId in this._stationCoverage&&this._stationCoverage[stationId]!==null){return this._stationCoverage[stationId];} +return null;};trackdirect.models.MarkerCollection.prototype.getStationIdListWithVisibleCoverage=function(){var result=[];for(var stationId in this._stationCoverage){if(this._stationCoverage[stationId].isRequestedToBeVisible()){result.push(stationId);}} +return result;};trackdirect.models.MarkerCollection.prototype.hasCoveragePolygon=function(stationId){if(stationId in this._stationCoverage&&this._stationCoverage[stationId]!==null){return true;} return false;};trackdirect.models.MarkerCollection.prototype.resetDotMarkers=function(markerIdKey){if(markerIdKey in this._dotMarkers&&this._dotMarkers[markerIdKey]!==null){this._dotMarkers[markerIdKey]=[];}};trackdirect.models.MarkerCollection.prototype.removeOldestDotMarker=function(markerIdKey){if(this.hasDotMarkers(markerIdKey)){latestMarker=this.getMarker(markerIdKey);var latestMarkerIndex=this.getDotMarkerIndex(markerIdKey,latestMarker);var dotMarkers=this.getDotMarkers(markerIdKey);var maxNumberOfPolyLinePoints=dotMarkers.length;if(latestMarkerIndex>-1){maxNumberOfPolyLinePoints=maxNumberOfPolyLinePoints-1;} var removedItems=this._dotMarkers[markerIdKey].splice(0,1);if(removedItems.length==1){var removedMarker=removedItems[0];removedMarker.hide();if(this.hasPolyline(removedMarker.markerIdKey)){var polyline=this.getMarkerPolyline(removedMarker.markerIdKey);while(polyline.getPathLength()>maxNumberOfPolyLinePoints){polyline.removePathItem(0);}} removedMarker=null;return true;}} @@ -409,7 +444,7 @@ return{};};trackdirect.models.MarkerCollection.prototype.getPositionMarkerIdKeys return{};};trackdirect.models.MarkerCollection.prototype.addPostionMarkerId=function(markerIdKey,packet){var key=this._getCompareablePosition(packet.latitude,packet.longitude);if(!(key in this._positionMarkersIdKeys)){this._positionMarkersIdKeys[key]={};} this._positionMarkersIdKeys[key][markerIdKey]=true;};trackdirect.models.MarkerCollection.prototype.removePostionMarkerId=function(latitude,longitude,markerIdKey){var key=this._getCompareablePosition(latitude,longitude);if(key in this._positionMarkersIdKeys){if(markerIdKey in this._positionMarkersIdKeys[key]){this._positionMarkersIdKeys[key][markerIdKey]=false;}}};trackdirect.models.MarkerCollection.prototype.addMarkerToMapSector=function(markerIdKey,markerMapSector){if(!(markerMapSector in this._mapSectorMarkerIdKeys)){this._mapSectorMarkerIdKeys[markerMapSector]=[];} if(this._mapSectorMarkerIdKeys[markerMapSector].indexOf(markerIdKey)<0){this._mapSectorMarkerIdKeys[markerMapSector].push(markerIdKey);}};trackdirect.models.MarkerCollection.prototype.getMapSectorMarkerKeys=function(mapSector){if(mapSector in this._mapSectorMarkerIdKeys){return this._mapSectorMarkerIdKeys[mapSector];} -return[];};trackdirect.models.MarkerCollection.prototype.resetAllMarkers=function(){this._markerKeys={};this._markers=[];this._markerPolyLines=[];this._dotMarkers=[];this._markerOriginDashedPolyLines=[];this._stationMarkers={};this._stationLastMovingMarkerIdKey={};this._stationLastMarker={};this._senderLastMarker={};this._positionMarkersIdKeys={};this._mapSectorMarkerIdKeys={};};trackdirect.models.MarkerCollection.prototype.resetMarker=function(markerIdKey){if(this.isExistingMarker(markerIdKey)){var marker=this._markers[markerIdKey];this._markers[markerIdKey]=null;this._markerPolyLines[markerIdKey]=null;this._dotMarkers[markerIdKey]=null;this._markerOriginDashedPolyLines[markerIdKey]=null;if(typeof marker.packet.latitude!="undefined"&&typeof marker.packet.longitude!="undefined"){this.removePostionMarkerId(marker.packet.latitude,marker.packet.longitude,markerIdKey);}}};trackdirect.models.MarkerCollection.prototype.hasRelatedDashedPolyline=function(marker){if(typeof marker._relatedMarkerOriginDashedPolyLine!=="undefined"&&marker._relatedMarkerOriginDashedPolyLine!==null){return true;} +return[];};trackdirect.models.MarkerCollection.prototype.resetAllMarkers=function(){this._markerKeys={};this._markers=[];this._markerPolyLines=[];this._dotMarkers=[];this._markerOriginDashedPolyLines=[];this._stationMarkers={};this._stationLastMovingMarkerIdKey={};this._stationLastMarker={};this._senderLastMarker={};this._positionMarkersIdKeys={};this._mapSectorMarkerIdKeys={};this._stationCoverage={};};trackdirect.models.MarkerCollection.prototype.resetMarker=function(markerIdKey){if(this.isExistingMarker(markerIdKey)){var marker=this._markers[markerIdKey];this._markers[markerIdKey]=null;this._markerPolyLines[markerIdKey]=null;this._dotMarkers[markerIdKey]=null;this._markerOriginDashedPolyLines[markerIdKey]=null;if(typeof marker.packet.latitude!="undefined"&&typeof marker.packet.longitude!="undefined"){this.removePostionMarkerId(marker.packet.latitude,marker.packet.longitude,markerIdKey);}}};trackdirect.models.MarkerCollection.prototype.hasRelatedDashedPolyline=function(marker){if(typeof marker._relatedMarkerOriginDashedPolyLine!=="undefined"&&marker._relatedMarkerOriginDashedPolyLine!==null){return true;} return false;};trackdirect.models.MarkerCollection.prototype.hasNonRelatedMovingMarkerId=function(packet){var latestStationMovingMarkerIdKey=this.getStationLatestMovingMarkerIdKey(packet.station_id);var newMarkerIdKey=this.getMarkerIdKey(packet.marker_id);if(latestStationMovingMarkerIdKey!==null&&latestStationMovingMarkerIdKey!==newMarkerIdKey){var latestStationMovingMarker=this.getMarker(latestStationMovingMarkerIdKey);if(latestStationMovingMarker.packet.hasConfirmedMapId()){return true;}} return false;};trackdirect.models.MarkerCollection.prototype.isPacketReplacingMarker=function(packet){var markerIdKey=this.getMarkerIdKey(packet.marker_id);if(this.isExistingMarker(markerIdKey)){var marker=this.getMarker(markerIdKey);if(marker!==null){if(packet.map_id==14){return true;} if(packet.is_moving==0){return true;} @@ -562,7 +597,7 @@ return 0;};trackdirect.models.Map.prototype.getSouthWestLng=function(){if(this.g return 0;};trackdirect.models.Map.prototype.isMapReady=function(){if(this.getBounds()!=null){return true;} return false;};trackdirect.models.Map.prototype.setMapType=function(mapType){if(mapType in this._supportedMapTypes){this._mapType=mapType;if(typeof google==="object"&&typeof google.maps==="object"){this._updateGoogleMapTileLayer();}else if(typeof L==="object"){this._updateLeafletTileLayer();} this._emitTdEventListeners("change");}};trackdirect.models.Map.prototype.getMapType=function(){return this._mapType;};trackdirect.models.Map.prototype.getLeafletTileLayer=function(){return this._leafletTileLayer;};trackdirect.models.Map.prototype.getMid=function(){if(typeof this._tdMapOptions.mid!=="undefined"){return this._tdMapOptions.mid;} -return null;};trackdirect.models.Map.prototype.resetAllMarkers=function(){while(this.markerCollection.getNumberOfMarkers()>0){var i=this.markerCollection.getNumberOfMarkers();while(i--){var marker=this.markerCollection.getMarker(i);if(marker!==null){marker.stopToOldTimeout();marker.stopDirectionPolyline();marker.hide();marker.hideMarkerPrevPosition();marker.hideMarkerTail();} +return null;};trackdirect.models.Map.prototype.resetAllMarkers=function(){while(this.markerCollection.getNumberOfMarkers()>0){var i=this.markerCollection.getNumberOfMarkers();while(i--){var marker=this.markerCollection.getMarker(i);if(marker!==null){marker.stopToOldTimeout();marker.stopDirectionPolyline();marker.hide();marker.hideMarkerPrevPosition();marker.hideMarkerTail();var stationCoverage=this.markerCollection.getStationCoverage(marker.packet.station_id);if(stationCoverage){stationCoverage.hide();}} this.markerCollection.removeMarker(i);}} if(this.state.openInfoWindow!==null){this.state.openInfoWindow.hide();} if(this.oms){this.oms.clearMarkers();} @@ -590,7 +625,8 @@ this.showTopLabelOnPosition(marker.packet.latitude,marker.packet.longitude);}}}} marker.hideLabel();marker.hasLabel=false;}} if(topMarkerIdKey!=-1){var topMarker=this.markerCollection.getMarker(topMarkerIdKey);topMarker.hasLabel=true;var topMarkerMapSector=trackdirect.services.MapSectorCalculator.getMapSector(topMarker.getPositionLiteral().lat,topMarker.getPositionLiteral().lng);if(this.state.isFilterMode){topMarker.showLabel();}else if(this.isMapSectorVisible(topMarkerMapSector)&&this.getZoom()>=trackdirect.settings.minZoomForMarkerLabel){topMarker.showLabel();}}}};trackdirect.models.Map.prototype._hideMarkersInPreviousVisibleMapSectors=function(previousVisibleMapSectors){if(this._currentContentZoom>=trackdirect.settings.minZoomForMarkers){var markerIdKeyListToMaybeHide={};var markerIdKeyListNotToHide={};for(var i=0;i=trackdirect.settings.minZoomForMarkers){var mapSectorMarkerKeys=this.markerCollection.getMapSectorMarkerKeys(mapSector);for(var j=0;j=trackdirect.settings.minZoomForMarkers){for(var i=0;i=trackdirect.settings.minZoomForMarkers){for(var i=0;i
-

Select date and time to show map data for (enter time for your locale time zone). The regular time length select box can still be used to select how old data that should be shown (relative to selected date and time).

-

*Note that the heatmap will still based on data from the latest hour (not the selected date and time).

-

Date and time:

+ +
+

+ The time travel feature that allows you to see the map as it looked like an earlier date is disabled on this website. The reason is probably that it is a requirement from the data source used. +

+
+ +

Select date and time to show map data for (enter time for your locale time zone). The regular time length select box can still be used to select how old data that should be shown (relative to selected date and time).

+

*Note that the heatmap will still based on data from the latest hour (not the selected date and time).

+

Date and time:

-
- + + - - -
+ + + +
diff --git a/server/bin/collector.py b/server/bin/collector.py index 79ea1b8..d206d00 100644 --- a/server/bin/collector.py +++ b/server/bin/collector.py @@ -26,6 +26,10 @@ if __name__ == '__main__': collectorNumber = int(sys.argv[2]) collectorOptions = config.collector[collectorNumber] + saveOgnStationsWithMissingIdentity = False + if (config.saveOgnStationsWithMissingIdentity) : + saveOgnStationsWithMissingIdentity = True + fh = logging.handlers.RotatingFileHandler(filename=os.path.expanduser( collectorOptions['error_log']), mode='a', maxBytes=1000000, backupCount=10) fh.setLevel(logging.WARNING) @@ -47,7 +51,8 @@ if __name__ == '__main__': try: trackDirectDataCollector = trackdirect.TrackDirectDataCollector( - collectorOptions) + collectorOptions, + saveOgnStationsWithMissingIdentity) trackDirectDataCollector.run() except Exception as e: trackDirectLogger.error(e, exc_info=1) diff --git a/server/trackdirect/TrackDirectConfig.py b/server/trackdirect/TrackDirectConfig.py index 20cea9d..b8c2217 100644 --- a/server/trackdirect/TrackDirectConfig.py +++ b/server/trackdirect/TrackDirectConfig.py @@ -48,6 +48,15 @@ class TrackDirectConfig(Singleton): self.daysToSaveTelemetryData = int(configParser.get( 'database', 'days_to_save_telemetry_data').strip('"')) + self.saveOgnStationsWithMissingIdentity = False + try: + saveOgnStationsWithMissingIdentity = configParser.get( + 'database', 'save_ogn_stations_with_missing_identity').strip('"') + if (saveOgnStationsWithMissingIdentity == "1"): + self.saveOgnStationsWithMissingIdentity = True + except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): + pass + # Websocket server self.websocketHostname = configParser.get( 'websocket_server', 'host').strip('"') @@ -69,11 +78,11 @@ class TrackDirectConfig(Singleton): allowTimeTravel = configParser.get( 'websocket_server', 'allow_time_travel').strip('"') - self.allowTimeTravel = True - if (allowTimeTravel == "0"): - self.allowTimeTravel = False + self.allowTimeTravel = False + if (allowTimeTravel == "1"): + self.allowTimeTravel = True - # Websocket server APRS-IS connection + # Websocket server APRS connection (we support 2 different sources, more can be added...) try: self.websocketAprsHost1 = configParser.get( 'websocket_server', 'aprs_host1').strip('"') @@ -98,6 +107,14 @@ class TrackDirectConfig(Singleton): self.websocketAprsHost2 = None self.websocketAprsPort2 = None + if (self.websocketAprsSourceId1 == 5 or self.websocketAprsSourceId2 == 5) : + # At least one source is of type OGN, disable display of older data + self.allowTimeTravel = False + if (self.maxDefaultTime > 1440) : + self.maxDefaultTime = 1440 + if (self.maxFilterTime > 1440) : + self.maxDefaultTime = 1440 + # Collectors for collectorNumber in range(0, 5): self.collector[collectorNumber] = {} @@ -129,6 +146,13 @@ class TrackDirectConfig(Singleton): self.collector[collectorNumber]['error_log'] = configParser.get( 'collector' + str(collectorNumber), 'error_log').strip('"') + if (self.websocketAprsSourceId1 == 5 or self.websocketAprsSourceId2 == 5) : + # source is of type OGN, make sure we do not save to many packets (will cause to high load on db) + if (self.collector[collectorNumber]['frequency_limit'] < 10) : + self.collector[collectorNumber]['frequency_limit'] = 10 + self.collector[collectorNumber]['save_fast_packets'] = False + + except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): self.collector[collectorNumber]['source_id'] = None self.collector[collectorNumber]['host'] = None diff --git a/server/trackdirect/TrackDirectDataCollector.py b/server/trackdirect/TrackDirectDataCollector.py index a5fa1c4..56188c9 100644 --- a/server/trackdirect/TrackDirectDataCollector.py +++ b/server/trackdirect/TrackDirectDataCollector.py @@ -19,7 +19,6 @@ from trackdirect.database.DatabaseConnection import DatabaseConnection from trackdirect.repositories.StationRepository import StationRepository from trackdirect.objects.Packet import Packet - class TrackDirectDataCollector(): """An TrackDirectDataCollector instance connects to the data source and saves all received packets to the database @@ -28,12 +27,14 @@ class TrackDirectDataCollector(): This is useful if you want one connection to the regular APRS-IS network and one connection to the CWOP network. """ - def __init__(self, collectorOptions): + def __init__(self, collectorOptions, saveOgnStationsWithMissingIdentity): """The __init__ method. Args: - collectorOptions (dict): Contains data like host, port, callsign, passcode, source id + collectorOptions (dict): Contains data like host, port, callsign, passcode, source id + saveOgnStationsWithMissingIdentity (boolean): True if we should not ignore stationss with a missing identity """ + self.saveOgnStationsWithMissingIdentity = saveOgnStationsWithMissingIdentity self.sourceHostname = collectorOptions['host'] self.sourcePort = collectorOptions['port_full'] self.numbersInBatch = collectorOptions['numbers_in_batch'] @@ -142,7 +143,7 @@ class TrackDirectDataCollector(): 'Collector has a delay on %s seconds', self.delay) packetDict = aprslib.parse(line) - parser = AprsPacketParser(self.db) + parser = AprsPacketParser(self.db, self.saveOgnStationsWithMissingIdentity) parser.setSourceId(self.sourceId) packet = parser.getPacket(packetDict, timestamp) @@ -177,7 +178,7 @@ class TrackDirectDataCollector(): try: line = line.decode('utf-8', 'ignore') packetDict = self.basicParse(line) - parser = AprsPacketParser(self.db) + parser = AprsPacketParser(self.db, self.saveOgnStationsWithMissingIdentity) parser.setSourceId(self.sourceId) packet = parser.getPacket(packetDict, timestamp, True) packet.markerId = 1 diff --git a/server/trackdirect/parser/AprsPacketParser.py b/server/trackdirect/parser/AprsPacketParser.py index 70a572c..80aee97 100644 --- a/server/trackdirect/parser/AprsPacketParser.py +++ b/server/trackdirect/parser/AprsPacketParser.py @@ -51,13 +51,15 @@ class AprsPacketParser(): """AprsPacketParser tackes a aprslib output and converts it to a Trackdirect Packet """ - def __init__(self, db): + def __init__(self, db, saveOgnStationsWithMissingIdentity): """The __init__ method. Args: - db (psycopg2.Connection): Database connection + db (psycopg2.Connection): Database connection + saveOgnStationsWithMissingIdentity (boolean): True if we should not ignore stationss with a missing identity """ self.db = db + self.saveOgnStationsWithMissingIdentity = saveOgnStationsWithMissingIdentity self.logger = logging.getLogger('trackdirect') self.databaseWriteAccess = True @@ -315,6 +317,9 @@ class AprsPacketParser(): return elif (not ognDataPolicy.isAllowedToIdentify): + if (not self.saveOgnStationsWithMissingIdentity) : + self.packet.mapId = 15 + return self.isHiddenStation = True self.data["from"] = self._getHiddenStationName() self.data["object_name"] = None diff --git a/server/trackdirect/websocket/aprsis/AprsISPayloadCreator.py b/server/trackdirect/websocket/aprsis/AprsISPayloadCreator.py index 0c7b44f..e38c573 100644 --- a/server/trackdirect/websocket/aprsis/AprsISPayloadCreator.py +++ b/server/trackdirect/websocket/aprsis/AprsISPayloadCreator.py @@ -42,6 +42,10 @@ class AprsISPayloadCreator(): self.config = TrackDirectConfig() self.stationHashTimestamps = {} + self.saveOgnStationsWithMissingIdentity = False + if (self.config.saveOgnStationsWithMissingIdentity) : + self.saveOgnStationsWithMissingIdentity = True + def getPayloads(self, line, sourceId): """Takes a raw packet and returnes a dict with the parsed result @@ -85,7 +89,7 @@ class AprsISPayloadCreator(): Packet """ basicPacketDict = aprslib.parse(line) - parser = AprsPacketParser(self.db) + parser = AprsPacketParser(self.db, self.saveOgnStationsWithMissingIdentity) parser.setDatabaseWriteAccess(False) parser.setSourceId(sourceId) try : From 9a1652508dcd0bd2e5e3a0ced616ec3d38a8c49d Mon Sep 17 00:00:00 2001 From: Per Qvarforth Date: Sun, 30 Jan 2022 16:48:28 +0100 Subject: [PATCH 08/10] improved instructions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ``` From 90724c485846bcb904aac52f2d7c12ca21451cdb Mon Sep 17 00:00:00 2001 From: Per Qvarforth Date: Sun, 30 Jan 2022 17:32:35 +0100 Subject: [PATCH 09/10] modified default time length --- htdocs/public/css/main.css | 4 ++++ htdocs/public/index.php | 9 +++++---- htdocs/public/js/main.js | 13 ++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/htdocs/public/css/main.css b/htdocs/public/css/main.css index 7c587cd..16fa67a 100755 --- a/htdocs/public/css/main.css +++ b/htdocs/public/css/main.css @@ -93,6 +93,10 @@ a { background-image: url(/images/checked.png); } +.dropdown-content-checkbox-hidden { + display: none !important; +} + /* Hide the link that should open and close the topnav on small screens */ .topnav .icon { display: none; diff --git a/htdocs/public/index.php b/htdocs/public/index.php index 414ace9..5abb463 100755 --- a/htdocs/public/index.php +++ b/htdocs/public/index.php @@ -58,6 +58,7 @@ options['isMobile'] = false; options['useImperialUnit'] = ; options['coverageDataUrl'] = 'data/coverage.php';; + options['defaultTimeLength'] = 60; // In minutes var md = new MobileDetect(window.navigator.userAgent); if (md.mobile() !== null) { @@ -173,12 +174,12 @@
10 minutes 30 minutes - 1 hour + 1 hour 3 hours 6 hours - 12 hours - 18 hours - 24 hours + 12 hours + 18 hours + 24 hours
diff --git a/htdocs/public/js/main.js b/htdocs/public/js/main.js index 7967c9a..37b9e0f 100755 --- a/htdocs/public/js/main.js +++ b/htdocs/public/js/main.js @@ -19,6 +19,11 @@ if (!inIframe()) { $("#tdTopnav").hide(); } +// Set correct time length option to active +jQuery(document).ready(function ($) { + $("#tdTopnavTimelengthDefault").addClass("dropdown-content-checkbox-active"); +}); + // Open station dialog if user clicked on station name jQuery(document).ready(function ($) { trackdirect.addListener("station-name-clicked", function (data) { @@ -86,9 +91,10 @@ jQuery(document).ready(function ($) { // Time travel is stopped when filtering is stopped $("#right-container-timetravel").hide(); - // Tail length is reset to 60 minutes when filtering is stopped - $("#tdTopnavTimelength>a").removeClass("active"); - $("#tdTopnavTimelength60").addClass("active"); + // Reset tail length to default when filtering is stopped + $("#tdTopnavTimelength>a").removeClass("dropdown-content-checkbox-active"); + $("#tdTopnavTimelengthDefault").addClass("dropdown-content-checkbox-active"); + $(".dropdown-content-checkbox-only-filtering").addClass("dropdown-content-checkbox-hidden"); } else { var counts = {}; for (var i = 0; i < packets.length; i++) { @@ -102,6 +108,7 @@ jQuery(document).ready(function ($) { "Filtering on " + Object.keys(counts).length + " station(s)" ); $("#right-container-filtered").show(); + $(".dropdown-content-checkbox-only-filtering").removeClass("dropdown-content-checkbox-hidden"); } }); }); From bf7146f27e356c9034fd8e5cb44fff0c93ef9e6c Mon Sep 17 00:00:00 2001 From: Per Qvarforth Date: Sun, 30 Jan 2022 23:43:21 +0100 Subject: [PATCH 10/10] changed geoip service --- htdocs/public/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/index.php b/htdocs/public/index.php index 5abb463..202f748 100755 --- a/htdocs/public/index.php +++ b/htdocs/public/index.php @@ -90,8 +90,8 @@ options['defaultLatitude'] = '59.30928'; options['defaultLongitude'] = '18.08830'; - // Tip: request position from some ip->location service (here using freegeoip as an example) - $.getJSON('https://freegeoip.app/json/', function(data) { + // Tip: request position from some ip->location service (https://freegeoip.app/json and https://ipapi.co/json is two examples) + $.getJSON('https://ipapi.co/json', function(data) { if (data.latitude && data.longitude) { options['defaultLatitude'] = data.latitude; options['defaultLongitude'] = data.longitude;