Merge branch 'wiedehopf:master' into master

MartinRusk · Jun 5, 2022 · 61be7bb · 61be7bb
2 parents b063f57 + fcfd964
commit 61be7bb
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 18 deletions.
diff --git a/README-query.md b/README-query.md
@@ -65,3 +65,17 @@ See the main readme for more exapmles on how to use the filters
 - desktop - force desktop view.
 - kiosk - force kiosk mode (tempTrails=true / hideButtons=true / userScale=2).
 - allTracks - enable tracks as if pressing T
+
+## heatmap / reaplay (only available with readsb --heatmap parameter)
+
+- replay - replay history of all planes
+- heatmap - show a heatmap for the last 24h by default (optional: supply the maximum number of dots drawn, default 32000)
+- heatDuration - how many hours to show in the heatmap
+- heatEnd - how many hours to shift the heatmap time window into the past
+- heatAlpha - 0.1 to 1.0 - how transparent the dots will be
+- heatRadius - dot size for heatmap
+- heatManualRedraw - only redraw dots when pressing r
+
+- realHeat - real heatmap instead of dots
+- heatBlur - parameter for realHeat
+- heatWeight - parameter for realHeat
diff --git a/html/early.js b/html/early.js
@@ -234,7 +234,7 @@ function arraybufferRequest() {
     return xhrOverride;
 }
 
-if (usp.has('heatmap')) {
+if (usp.has('heatmap') || usp.has('realHeat')) {
 
     heatmap = {};
 
@@ -774,3 +774,19 @@ Filter.prototype.init = function() {
     jQuery('#' + this.id).on('submit', this.update);
     jQuery('#' + this.id).on('reset', this.reset);
 }
+
+let custom_layers = new ol.Collection();
+function add_kml_overlay(url, name, opacity) {
+    custom_layers.push(new ol.layer.Vector({
+        source: new ol.source.Vector({
+            url: url,
+            format: new ol.format.KML(),
+        }),
+        name: name,
+        title: 'custom_' + name,
+        type: 'overlay',
+        opacity: opacity,
+        visible: true,
+        zIndex: 99,
+    }));
+}
diff --git a/html/layers.js b/html/layers.js
@@ -21,7 +21,6 @@ function createBaseLayers() {
     let world = new ol.Collection();
     let us = new ol.Collection();
     let europe = new ol.Collection();
-    custom_layers = new ol.Collection();
 
     if (loStore['customTiles'] != undefined) {
         custom_layers.push(new ol.layer.Tile({

diff --git a/html/markers.js b/html/markers.js
@@ -1036,6 +1036,7 @@ let TypeDesignatorIcons = {
     'GYRO': ['gyrocopter', 1],
     'DLTA': ['verhees', 1],
 
+    'B1': ['unknown', 1.2],
     'B52': ['b52', 1],
     'C17': ['c17', 1.25],
     'C5M': ['c5', 1.18],

diff --git a/html/script.js b/html/script.js
@@ -160,7 +160,6 @@ let MessageRate = 0;
 
 let layers;
 let layers_group;
-let custom_layers;
 
 const nullStyle = new ol.style.Style({});
 
@@ -1927,6 +1926,8 @@ function initMap() {
     layers_group = createBaseLayers();
     layers = layers_group.getLayers();
 
+    //add_kml_overlay('https://developers.google.com/kml/documentation/KML_Samples.kml', 'samples', 0.8);
+
     siteCircleLayer = new ol.layer.Vector({
         name: 'siteCircles',
         type: 'overlay',
@@ -7729,20 +7730,5 @@ if (adsbexchange && window.location.hostname.startsWith('inaccurate')) {
     jQuery('#inaccurate_warning').removeClass('hidden');
 }
 
-function add_kml_overlay(url, name, opacity) {
-    custom_layers.push(new ol.layer.Vector({
-        source: new ol.source.Vector({
-            url: url,
-            format: new ol.format.KML(),
-        }),
-        name: name,
-        title: 'custom_' + name,
-        type: 'overlay',
-        opacity: opacity,
-        visible: true,
-        zIndex: 99,
-    }));
-}
-
 parseURLIcaos();
 initialize();