Break circular dep: src/index.ts ... src/util/web_worker.ts -> src/in…

…dex.ts (#2156)
maplibre · Feb 9, 2023 · b5cc0c1 · b5cc0c1
1 parent 7351d2f
commit b5cc0c1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -142,7 +142,13 @@ const exported = {
         config.MAX_PARALLEL_IMAGE_REQUESTS = numRequests;
     },
 
-    workerUrl: '',
+    get workerUrl(): string {
+        return config.WORKER_URL;
+    },
+
+    set workerUrl(value: string) {
+        config.WORKER_URL = value;
+    },
 
     /**
      * Sets a custom load tile function that will be called when using a source that starts with a custom url schema.

diff --git a/src/util/config.ts b/src/util/config.ts
@@ -2,12 +2,14 @@ type Config = {
     MAX_PARALLEL_IMAGE_REQUESTS: number;
     MAX_PARALLEL_IMAGE_REQUESTS_PER_FRAME: number;
     REGISTERED_PROTOCOLS: {[x: string]: any};
+    WORKER_URL: string;
 };
 
 const config: Config = {
     MAX_PARALLEL_IMAGE_REQUESTS: 16,
     MAX_PARALLEL_IMAGE_REQUESTS_PER_FRAME: 8,
     REGISTERED_PROTOCOLS: {},
+    WORKER_URL: ''
 };
 
 export default config;
diff --git a/src/util/web_worker.ts b/src/util/web_worker.ts
@@ -1,4 +1,4 @@
-import maplibregl from '../index';
+import config from './config';
 
 import type {WorkerSource} from '../source/worker_source';
 
@@ -29,5 +29,5 @@ export interface WorkerGlobalScopeInterface {
 }
 
 export default function workerFactory() {
-    return new Worker(maplibregl.workerUrl);
+    return new Worker(config.WORKER_URL);
 }