From a9b2558cf28fe33193722a9c46903f293b7a7fa4 Mon Sep 17 00:00:00 2001
From: Keith Paterson <keith.paterson@gmx.de>
Date: Mon, 21 Dec 2020 16:36:07 +0100
Subject: [PATCH] Fix position of Tower Icon

---
 src/renderer/loaders/Threshold.js    |  4 ---
 src/renderer/loaders/Tower.js        | 46 ++++++++++++----------------
 src/renderer/loaders/tower_loader.js |  4 +--
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/renderer/loaders/Threshold.js b/src/renderer/loaders/Threshold.js
index 27d3e57..3677cd3 100644
--- a/src/renderer/loaders/Threshold.js
+++ b/src/renderer/loaders/Threshold.js
@@ -51,10 +51,6 @@ L.Threshold = L.Marker.extend({
             }
         }
     },
-    onAdd : function(map) {
-        var metersPP = this.metersPerPixel(map.getCenter().lat, map.getZoom());
-        this.updateIcon(map);
-    },
     metersPerPixel: function (latitude, zoomLevel) {
         var earthCircumference = 40075017;
         var latitudeRadians = latitude * (Math.PI / 180);
diff --git a/src/renderer/loaders/Tower.js b/src/renderer/loaders/Tower.js
index 0180eac..7beefcd 100644
--- a/src/renderer/loaders/Tower.js
+++ b/src/renderer/loaders/Tower.js
@@ -22,18 +22,6 @@ L.TowerMarker = L.Marker.extend({
     options: {
         zIndexOffset: 10000,
     },
-
-    initialize: function (latlng, options) {
-        L.Marker.prototype.initialize(latlng, options);
-        L.Util.setOptions(this, options);
-        this.svg = this.stripSVG('tower.svg');
-
-        this.isDragging = false;        
-    },
-    updateProperties: function(properties) {
-        this.heading = properties.heading;
-        this.updateIcon();
-    },
     stripSVG: function(fName) {
         var rx = /<\s*svg[^>]*>([\s\S]*)<\s*\/svg[^>]*>/gm;
         var svg = fs.readFileSync(path.join(__static, '/', fName), 'utf8');
@@ -41,27 +29,28 @@ L.TowerMarker = L.Marker.extend({
         return svg2[0];
     },
     updateIcon : function(map) {
+        console.debug(`Lat Lng Threshold ${this.getLatLng()}`);
         if(map !== null) {
             var metersPP = this.metersPerPixel(map.getCenter().lat, map.getZoom());
-            if(this._metersPP != metersPP) {
-                console.debug('Meters per pixel ' + metersPP);
-                var pixelSize = 32 / metersPP;
-                var scale = pixelSize/64;
-                var offset = -(64/2);
+            console.debug('Old Meters per pixel ' + this.metersPP);
+            console.debug('New Meters per pixel ' + metersPP);
+            if(this._metersPP != metersPP) {                
+                var pixelSize = (this.iconSize/2) / metersPP;
+                var scale = pixelSize/this.iconSize;
+                var offset = 0;//-(this.iconSize/2);                
                 this.setIcon(L.divIcon({
                     iconSize: 64,
-                    className: 'tower-marker-icon',
-                    html: `<div style=\'transform: translateX(${offset}px) translateY(${offset}px) scale(${scale}); border: 1px red\'>${this.svg}</div>`,
+                    className: 'threshold-marker-icon',
+                    html: `<div style=\'transform: translateX(${offset}px) translateY(${offset}px) scale(${scale}) rotate(${this.options.heading}deg); border: 1px red\'>${this.svg}</div>`,
                 }));    
+
+                this.update(this.getLatLng());
+                console.debug();
+                this.setLatLng(this.getLatLng());
                 this._metersPP = metersPP;
             }
         }
-    },
-    onAdd : function(map) {
-        var metersPP = this.metersPerPixel(map.getCenter().lat, map.getZoom());
-        console.debug('Meters per pixel ' + metersPP);
-        this.updateIcon(map);
-    },
+    },    
     metersPerPixel: function (latitude, zoomLevel) {
         var earthCircumference = 40075017;
         var latitudeRadians = latitude * (Math.PI / 180);
@@ -75,10 +64,15 @@ L.TowerMarker = L.Marker.extend({
 
 });
 
+L.TowerMarker.addInitHook(function(){
+    this.svg = this.stripSVG('tower.svg');
+    this.iconSize = 64;
+});
+
 //Builds a marker for a ai or multiplayer aircraft
 var tower = function (n, options) {
     var latlon = convert(n.find('lat/text()').text() + " " + n.find('lon/text()').text());
-    return new L.TowerMarker([latlon.decimalLatitude, latlon.decimalLongitude], options);
+    return new L.TowerMarker([latlon.decimalLatitude, latlon.decimalLongitude], {heading: 0});
 }
 
 module.exports = tower;
diff --git a/src/renderer/loaders/tower_loader.js b/src/renderer/loaders/tower_loader.js
index e898bd1..f932126 100644
--- a/src/renderer/loaders/tower_loader.js
+++ b/src/renderer/loaders/tower_loader.js
@@ -63,12 +63,12 @@ exports.readTowerXML = function (fDir, icao, force) {
             towerNodes.map(n => {
                 var towerIcon = tower(n, layerGroup);
                 towerIcon.addTo(layerGroup);
-                var latlon = convert(n.find('lat/text()').text() + " " + n.find('lon/text()').text());
                 /*
+                //DEBUG Code 
+                var latlon = convert(n.find('lat/text()').text() + " " + n.find('lon/text()').text());
                 var marker = new L.Circle([latlon.decimalLatitude, latlon.decimalLongitude], 5);
                 marker.addTo(layerGroup);
                 */
-
                 features.push(towerIcon);
             }).sort();