use map data event instead of interval when waiting for map to be ready

radarlabs · Aug 14, 2024 · aba7820 · aba7820
1 parent 52bd214
commit aba7820
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/src/ui/RadarLineFeature.ts b/src/ui/RadarLineFeature.ts
@@ -77,17 +77,10 @@ class RadarLineFeature extends RadarMapFeature {
     // ensure map is ready before modifying source and layers
     if (map.loaded()) {
       addFeatureToMap();
-    } else { // wait for map to load up to 3 seconds, or abort
-      let count = 0;
-      let interval = setInterval(() => {
-        if (map.loaded()) {
-          clearInterval(interval);
-          addFeatureToMap();
-        } else if (++count >= 30 /* 3 seconds */) {
-          clearInterval(interval);
-          Logger.warn(`could not add line feature ${feature.id}`);
-        }
-      }, 100);
+    } else {
+      map.once('data',() => { // wait for map to be ready
+        addFeatureToMap();
+      });
     }
 
     return this;

diff --git a/src/ui/RadarPolygonFeature.ts b/src/ui/RadarPolygonFeature.ts
@@ -65,17 +65,10 @@ class RadarPolygonFeature extends RadarMapFeature {
     // ensure map is ready before modifying source and layers
     if (map.loaded()) {
       addFeatureToMap();
-    } else { // wait for map to load up to 3 seconds, or abort
-      let count = 0;
-      let interval = setInterval(() => {
-        if (map.loaded()) {
-          clearInterval(interval);
-          addFeatureToMap();
-        } else if (++count >= 30 /* 3 seconds */) {
-          clearInterval(interval);
-          Logger.warn(`could not add polygon feature ${feature.id}`);
-        }
-      }, 100);
+    } else {
+      map.once('data',() => { // wait for map to be ready
+        addFeatureToMap();
+      });
     }
 
     return this;