popup anchor and resize fix

static/map.js

@@ -24,7 +24,11 @@ function initializeMap(mapImgUrl) {
 
 // this works but assumes the map is square (reasonable limitation I think)
 function resizeMarkers() {
+  let tryAgain = false;
   tokens.forEach(t=>{
+    if (t.m._icon == null) {
+      tryAgain = true;
+    } else {
       const icon = t.m.options.icon;
       const scaleFactor = mapImg._image.clientWidth / mapImg._image.naturalWidth;
     
@@ -33,7 +37,11 @@ function resizeMarkers() {
       icon.options.popupAnchor = [0, -scaleFactor * t.t.oY];
     
       t.m.setIcon(icon);
+    }
   });
+  if (tryAgain) {
+    setTimeout(resizeMarkers, 500)
+  }
 }
 
 function processTokens(tokenChanges) {
@@ -45,7 +53,6 @@ function processTokens(tokenChanges) {
       if (t.x != null && t.y != null && !self.t.active && t.active) {
         self.t.active = true;
         self.m.addTo(map);
-        resizeMarkers();
       // token was made inactive
       } else if (t.x != null && t.y != null && self.t.active && !t.active) {
         self.t.active = false;
@@ -74,7 +81,6 @@ function processTokens(tokenChanges) {
         });
         if (t.active) {
           self.m.addTo(map);
-          resizeMarkers();
         }
       }
     }

static/socket.js

@@ -197,9 +197,11 @@ function dial() {
             tokens[0].m.removeFrom(map);
             tokens.shift();
           }
+          if (mapImg) {
             mapImg.removeFrom(map);
             mapImg = null;
           }
+        }
       });
       conn.addEventListener("open", e => {
         offline = false;