diff --git a/config/trackdirect.ini b/config/trackdirect.ini index fa4ee97..aa2256e 100644 --- a/config/trackdirect.ini +++ b/config/trackdirect.ini @@ -4,20 +4,20 @@ [website] -title="APRS Track Direct" -owner_name="Unknown" -owner_email="no@name.com" +title="Glider RADAR - APRS Track Direct Demo" +owner_name="Per Qvarforth" +owner_email="per@aprsdirect.com" -;maptiler_key="" -;google_key="" -;here_app_id="" -;here_app_code="" +maptiler_key="deepSyffDpytnquAsdpY" +google_key="AIzaSyD1YtgT5SuEHlXjH6S0lrwub5KawTYO47s" +here_app_id="XNPNNGLsENC2A1oB2x3d" +here_app_code="Wmda4iAl4siiOSnzsrbTuw" ;; For the map type "Leaflet - Raster Tiles" we have a lot of options ;; Please read usage policy for each map provider (OpenStreetMap usage policy: https://operations.osmfoundation.org/policies/tiles/) -leaflet_raster_tile_roadmap="OpenStreetMap" ;; Examples: "OpenStreetMap.DE", "Stamen.TonerLite", "CartoDB.Voyager", "HERE.normalDay" or "HERE.reducedDay" -leaflet_raster_tile_terrain="OpenTopoMap" ;; Examples: "OpenTopoMap", "Stamen.Terrain" or "HERE.terrainDay" -leaflet_raster_tile_satellite="" ;; Examples: "HERE.satelliteDay" +leaflet_raster_tile_roadmap="HERE.reducedDay" ;; Examples: "OpenStreetMap.DE", "Stamen.TonerLite", "CartoDB.Voyager", "HERE.normalDay" or "HERE.reducedDay" +leaflet_raster_tile_terrain="OpenTopoMap" ;; Examples: "OpenTopoMap", "Stamen.Terrain" or "HERE.terrainDay" +leaflet_raster_tile_satellite="HERE.satelliteDay" ;; Examples: "HERE.satelliteDay" ;; Coverage settings, by default we include stationary senders and only include the 95% percent of the closest positions coverage_only_moving_senders="0" @@ -25,7 +25,7 @@ coverage_percentile="95" ;; Url to the websocket server, if you use https you need to set this ;; If nothing is set we will try the url: ws://current-url:9000/ws -;websocket_url="wss://ws.my-domain.com" +websocket_url="wss://ws.gliderradar.com" [database] @@ -59,7 +59,7 @@ host="0.0.0.0" port="9000" ;; If you are using a reverse proxy you need to play with the "external_port" setting, otherwise it should be the same as "port" -external_port="9000" +external_port="80" ;; Websocket server log output error_log="~/trackdirect/server/log/wsserver_aprs.log" @@ -68,7 +68,7 @@ error_log="~/trackdirect/server/log/wsserver_aprs.log" ;; 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" +frequency_limit="30" ;; First APRS IS server for the websocket server to connect to. ;; Important: Please set up your own APRS IS server, do not use a public server. @@ -82,7 +82,7 @@ aprs_port1="14580" ;; - Source Id 3: CBAPRS ;; - Source Id 4: HUBHAB ;; - Source Id 5: OGN -aprs_source_id1="1" +aprs_source_id1="5" ;; Second APRS IS server for the websocket server to connect to (only needed if you use multiple sources). ;; Important: Please set up your own APRS IS server, do not use a public server. @@ -122,7 +122,7 @@ port_filtered="14580" ;; - Source Id 3: CBAPRS ;; - Source Id 4: HUBHAB ;; - Source Id 5: OGN -source_id="1" +source_id="5" ;; Your callsign and passcode callsign="NOCALL" @@ -134,8 +134,8 @@ numbers_in_batch="50" ;; 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" +frequency_limit="60" +save_fast_packets="0" ;; Collector error log error_log="~/trackdirect/server/log/collector.log" diff --git a/server/trackdirect/TrackDirectHeatMapCreator.py b/server/trackdirect/TrackDirectHeatMapCreator.py index b94e0cc..8f8e11f 100644 --- a/server/trackdirect/TrackDirectHeatMapCreator.py +++ b/server/trackdirect/TrackDirectHeatMapCreator.py @@ -85,7 +85,7 @@ class TrackDirectHeatMapCreator(): # zoom 7: 256 parts (images) # all images will alter be splitted into tile of size 256x256 for part in parts: - # We are not in any hurry so we sleep to lower the effect on other processes (we are on a shared server) + # We are not in any hurry so we sleep to lower the effect on other processes time.sleep(1) totalMinLat = float(-85.05115)