fix: check for multidomains in areas

WatWowMap · Feb 22, 2024 · e5b8a9c · e5b8a9c
1 parent f470f53
commit e5b8a9c
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/server/src/services/areas.js b/server/src/services/areas.js
@@ -333,16 +333,20 @@ const loadLatestAreas = async () => {
   /** @type {Record<string, import("@rm/types").RMGeoJSON>} */
   const scanAreas = {
     main: await loadScanPolygons(fileName),
-    ...Object.fromEntries(
-      await Promise.all(
-        config
-          .getSafe('multiDomains')
-          .map(async (d) => [
-            d.general?.geoJsonFileName ? d.domain.replaceAll('.', '_') : 'main',
-            await loadScanPolygons(d.general?.geoJsonFileName || fileName),
-          ]),
-      ),
-    ),
+    ...(config.has('multiDomains')
+      ? Object.fromEntries(
+          await Promise.all(
+            config
+              .getSafe('multiDomains')
+              .map(async (d) => [
+                d.general?.geoJsonFileName
+                  ? d.domain.replaceAll('.', '_')
+                  : 'main',
+                await loadScanPolygons(d.general?.geoJsonFileName || fileName),
+              ]),
+          ),
+        )
+      : {}),
   }
   return buildAreas(scanAreas)
 }
@@ -353,14 +357,18 @@ const loadCachedAreas = () => {
   /** @type {Record<string, import("@rm/types").RMGeoJSON>} */
   const scanAreas = {
     main: loadFromFile(fileName),
-    ...Object.fromEntries(
-      config
-        .getSafe('multiDomains')
-        .map((d) => [
-          d.general?.geoJsonFileName ? d.domain.replaceAll('.', '_') : 'main',
-          loadFromFile(d.general?.geoJsonFileName || fileName),
-        ]),
-    ),
+    ...(config.has('multiDomains')
+      ? Object.fromEntries(
+          config
+            .getSafe('multiDomains')
+            .map((d) => [
+              d.general?.geoJsonFileName
+                ? d.domain.replaceAll('.', '_')
+                : 'main',
+              loadFromFile(d.general?.geoJsonFileName || fileName),
+            ]),
+        )
+      : {}),
   }
   return buildAreas(scanAreas)
 }