bbox method from Workspaces client to avoid X-Workspace header issues

Author: jeffmaki

services/osm.ts

@@ -253,13 +253,11 @@ export class OsmApiClient extends BaseHttpClient implements ICancelableClient {
   }
 
   async getWorkspaceBbox(workspaceId: WorkspaceId) {
-    const response = await this._get(`workspaces/${workspaceId}/bbox.json`);
-
-    if (response.status === 204) {
-      return undefined
-    }
-
-    return await response.json();
+    // The workspace bbox lives on the v1 tasking API, owned by WorkspacesClient.
+    // OsmApiClient is constructed before workspacesClient (which depends on it),
+    // so we resolve the singleton lazily at call time to avoid the import cycle.
+    const { workspacesClient } = await import('~/services/index');
+    return workspacesClient.getWorkspaceBbox(workspaceId);
   }
 
   async getExportBbox(id: number) {

services/workspaces.ts

@@ -119,8 +119,22 @@ export class WorkspacesClient extends BaseHttpClient implements ICancelableClien
     }
   }
 
-  getWorkspaceBbox(id: WorkspaceId): Promise<BoundingBox> {
-    return this.#osmClient.getWorkspaceBbox(id);
+  async getWorkspaceBbox(id: WorkspaceId): Promise<BoundingBox | undefined> {
+    const originalBaseUrl = this._baseUrl;
+    this._baseUrl = this.#newApiUrl;
+
+    try {
+      const response = await this._send(`workspaces/${id}/bbox`, 'GET');
+
+      if (response.status === 204) {
+        return undefined;
+      }
+
+      return await response.json();
+    }
+    finally {
+      this._baseUrl = originalBaseUrl;
+    }
   }
 
   async createWorkspace(workspace: WorkspaceCreation): Promise<WorkspaceId> {