cleanup flags again

Author: dceejay

worldmap/worldmap.js

@@ -2125,12 +2125,15 @@ function setMarker(data) {
         }
         opts.size = opts.size || sz;
         opts.size = opts.size * (opts.scale || 1);
-        if (data.SIDC.length > 12 && /^[A-Za-z]{2}$/gm.test(data.SIDC.substr(12,2))) {
+        if (!data.flag && data.SIDC.length > 12 && /^[A-Za-z]{2}$/gm.test(data.SIDC.substr(12,2))) {
             var cc = data.SIDC.substr(12,2).toLowerCase();
             opts.country = cc.toUpperCase();
             opts.staffComments = emojify(":flag-"+cc+":") + " " + (opts?.staffComments || "");
             data.flag = opts.country.toUpperCase() + " " + emojify(":flag-"+cc+":");
         }
+        else if(/\p{Emoji}/u.test(data.flag)) {
+            opts.staffComments = data.flag + " " + (opts?.staffComments || "");
+        }
         if (data.SIDC.length == 12 && data?.flag && data.flag.length == 2) {
             opts.staffComments = emojify(":flag-"+data.flag.toLowerCase()+":") + " " + (opts?.staffComments || "");
         }
@@ -2143,7 +2146,7 @@ function setMarker(data) {
                 opts.country = data.flag.toUpperCase() + " " + emojify(":flag-"+data.flag.toLowerCase()+":");
             }
         }
-        console.log("OPTS",opts)
+        //console.log("OPTS",opts)
         data.speed = opts?.speed || data?.speed; // If SIDC then options.speed can override the speed.
         if (data?.speed && !opts?.direction) { opts.direction = data?.track || data?.hdg || data?.heading || data?.COG || data?.bearing }
         if (data.speed == undefined) { delete data.speed; }