geoData can be a promise to resolve

yaph · Aug 8, 2019 · fff81d5 · fff81d5
1 parent edff38f
commit fff81d5
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/js/geomap.js b/src/js/geomap.js
@@ -21,7 +21,7 @@ export class Geomap {
             /**
              * Contents of TopoJSON file. If specified, geofile is ignored.
              *
-             * @type {object|null}
+             * @type {Promise<object>|object|null}
              */
             geoData: null,
             height: null,
@@ -131,11 +131,12 @@ export class Geomap {
             self.update();
         };
 
-        if (self.properties.geoData) {
-            drawGeoData(self.properties.geoData);
-        } else {
-            d3JSONFetch(self.properties.geofile).then(geo => drawGeoData(geo));
-        }
+        Promise.resolve(() => {
+            if (self.properties.geoData) {
+                return self.properties.geoData;
+            }
+            return d3JSONFetch(self.properties.geofile);
+        }).then(geo => drawGeoData(geo));
     }
 
     update() {