From fe394a02f894a497eeee1bed179c683a1649ee4b Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 12 Feb 2021 18:12:47 +0000
Subject: [PATCH] align 3d shapes with direction

---
 package.json          |  2 +-
 worldmap/index3d.html | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index dffd39e..5039f43 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.8.2",
+    "version": "2.8.3",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "cgi": "0.3.1",
diff --git a/worldmap/index3d.html b/worldmap/index3d.html
index 1e5cd3d..6dd09e5 100644
--- a/worldmap/index3d.html
+++ b/worldmap/index3d.html
@@ -142,7 +142,8 @@ map.on('load', function() {
     }
 
     var setMarker = function(d) {
-        //console.log("DATA",d);
+        if (d.hasOwnProperty("area")) { return; }  // ignore areas for now.
+        console.log("DATA",d);
         if (people.hasOwnProperty(d.name)) {
             map.getSource(d.name).setData(getPoints(d)); // Just update existing marker
         }
@@ -198,7 +199,14 @@ map.on('load', function() {
         else if (t === "block") { fac = fac * 4; tall = 5; }    // block large and cube
         else { tall = 2; fac = fac * 2; }                       // else small cube
         //console.log({p},{t},{fac},{base},{tall});
-        var fac2 = fac / Math.cos( Math.PI / 180 * p.lat );
+        var sin = 1;
+        var cos = 0;
+        if (p.hasOwnProperty("hdg")) {
+            sin = Math.sin((90 - p.hdg) * Math.PI / 180);
+            cos = Math.cos((90 - p.hdg) * Math.PI / 180);
+        }
+        var dx = 1 * cos - 1 * sin;
+        var dy = 1 * sin + 1 * cos;
         var d = {
             "type": "Feature",
             "properties": {
@@ -212,11 +220,11 @@ map.on('load', function() {
                 "type": "Polygon",
                 "coordinates": [
                     [
-                        [ p.lon - fac2, p.lat - fac ],
-                        [ p.lon - fac2, p.lat + fac ],
-                        [ p.lon + fac2, p.lat + fac ],
-                        [ p.lon + fac2, p.lat - fac ],
-                        [ p.lon - fac2, p.lat - fac ],
+                        [ p.lon + (fac * dx ) / Math.cos( Math.PI / 180 * p.lat ), p.lat + (fac * dy) ],
+                        [ p.lon - (fac * dy ) / Math.cos( Math.PI / 180 * p.lat ), p.lat + (fac * dx) ],
+                        [ p.lon - (fac * dx ) / Math.cos( Math.PI / 180 * p.lat ), p.lat - (fac * dy) ],
+                        [ p.lon + (fac * dy ) / Math.cos( Math.PI / 180 * p.lat ), p.lat - (fac * dx) ],
+                        [ p.lon + (fac * dx ) / Math.cos( Math.PI / 180 * p.lat ), p.lat + (fac * dy) ],
                     ]
                 ]
             }