Add more missing awaits

lib/ModelMixins/ExportWebCoverageServiceMixin.ts

@@ -412,7 +412,7 @@ function ExportWebCoverageServiceMixin<
           );
         });
 
-        pendingWorkbenchItem.terria.workbench.add(pendingWorkbenchItem);
+        await pendingWorkbenchItem.terria.workbench.add(pendingWorkbenchItem);
 
         // Load WCS metadata (DescribeCoverage request)
         (await this.loadWcsMetadata()).throwIfError();

lib/ModelMixins/TileErrorHandlerMixin.ts

@@ -224,14 +224,14 @@ function TileErrorHandlerMixin<T extends AbstractConstructor<ModelType>>(
 
           // Browsers don't tell us much about a failed image load, so we do an
           // XHR to get more error information if needed.
-          const maybeXhr =
+          const maybeXhr: Promise<HTMLImageElement | ImageBitmap> | undefined =
             attemptNumber === 1
               ? Promise.reject(tileProviderError.error)
               : fetchTileImage(tile, imageryProvider);
 
           if (this.handleTileError && maybeXhr) {
             // Give the catalog item a chance to handle this error.
-            this.handleTileError(maybeXhr as any, tile);
+            await this.handleTileError(maybeXhr as any, tile);
           }
 
           try {

lib/ModelMixins/TimeFilterMixin.ts

@@ -65,7 +65,7 @@ function TimeFilterMixin<T extends AbstractConstructor<BaseType>>(Base: T) {
 
             const coords = coordinatesFromTraits(this.timeFilterCoordinates);
             if (coords) {
-              this.setTimeFilterFromLocation(coords);
+              await this.setTimeFilterFromLocation(coords);
             }
             disposeListener();
           })

lib/Models/Catalog/Ows/WebProcessingServiceCatalogFunction.ts

@@ -348,7 +348,7 @@ export default class WebProcessingServiceCatalogFunction extends XmlRequestMixin
       return;
     }
 
-    const inputValue = await Promise.resolve(result.inputValue);
+    const inputValue = await result.inputValue;
     if (!isDefined(inputValue)) {
       return;
     }

lib/Models/Catalog/addUserCatalogMember.ts

@@ -23,7 +23,7 @@ export default async function addUserCatalogMember(
   newCatalogMemberOrPromise: BaseModel | Promise<BaseModel | undefined>,
   options: AddUserCatalogMemberOptions = {}
 ): Promise<BaseModel | undefined> {
-  const promise =
+  const promise: Promise<BaseModel | undefined> =
     newCatalogMemberOrPromise instanceof Promise
       ? newCatalogMemberOrPromise
       : Promise.resolve(newCatalogMemberOrPromise);

lib/Models/Catalog/addUserFiles.ts

@@ -89,7 +89,7 @@ export default async function addUserFiles(
     }
 
     tempCatalogItem.loadPromise = loadPromise;
-    terria.workbench.add(tempCatalogItem);
+    await terria.workbench.add(tempCatalogItem);
     tempCatalogItemList.push(tempCatalogItem);
   }
 

lib/Models/GlobeOrMap.ts

@@ -411,7 +411,7 @@ export default abstract class GlobeOrMap {
               })
             );
 
-            this.terria.overlays.add(catalogItem);
+            await this.terria.overlays.add(catalogItem);
             this._highlightPromise = catalogItem.loadMapItems();
 
             const removeCallback = (this._removeHighlightCallback = () => {

lib/Models/ItemSearchProviders/IndexedItemSearchProvider.ts

@@ -105,6 +105,7 @@ export default class IndexedItemSearchProvider extends ItemSearchProvider {
     const json = await loadJson5(indexRootUrl);
     try {
       this.indexRoot = parseIndexRoot(json);
+      // FIXME: missing await.
       this.getOrLoadResultsData();
     } catch (parseError) {
       console.warn(parseError);

lib/Models/Terria.ts

@@ -1422,6 +1422,7 @@ export default class Terria {
 
     // Zoom to workbench items if any of the init sources specifically requested it
     if (this.focusWorkbenchItemsAfterLoadingInitSources) {
+      // FIXME: missing await.
       this.doZoomToWorkbenchItems();
     }
 
@@ -1731,7 +1732,7 @@ export default class Terria {
       // - If there are multiple initSources, the setting from the last source takes effect
       try {
         const initialCamera = CameraView.fromJson(initData.initialCamera);
-        this.currentViewer.zoomTo(initialCamera, 2.0);
+        await this.currentViewer.zoomTo(initialCamera, 2.0);
         // reset in case this was enabled by a previous initSource
         this.focusWorkbenchItemsAfterLoadingInitSources = false;
       } catch (error) {
@@ -1768,7 +1769,7 @@ export default class Terria {
         );
       }
       if (isJsonString(initData.settings.baseMapId)) {
-        this.mainViewer.setBaseMap(
+        await this.mainViewer.setBaseMap(
           this.baseMapsModel.baseMapItems.find(
             (item) => item.item.uniqueId === initData.settings!.baseMapId
           )?.item

lib/Models/Workbench.ts

@@ -219,7 +219,7 @@ export default class Workbench {
     if (!error && MappableMixin.isMixedInto(item)) {
       error = (await item.loadMapItems()).error;
       if (!error && item.zoomOnAddToWorkbench && !item.disableZoomTo) {
-        item.terria.currentViewer.zoomTo(item);
+        await item.terria.currentViewer.zoomTo(item);
       }
     }
 

lib/ReactViewModels/ViewState.ts

@@ -502,7 +502,7 @@ export default class ViewState {
           );
           result.throwIfError();
           const model = result.throwIfUndefined();
-          this.viewCatalogMember(model);
+          await this.viewCatalogMember(model);
         } catch (e) {
           terria.raiseErrorToUser(e, {
             message: `Couldn't find model \`${previewedItemId}\` for preview`

lib/ReactViews/DragDropFile.tsx

@@ -96,9 +96,9 @@ class DragDropFile extends React.Component<PropsType> {
         );
 
         isDefined(firstZoomableItem) &&
-          runInAction(() =>
+          (await runInAction(() =>
             props.viewState.terria.currentViewer.zoomTo(firstZoomableItem, 1)
-          );
+          ));
       }
 
       runInAction(() => (props.viewState.isDraggingDroppingFile = false));

lib/ReactViews/ExplorerWindow/Tabs.jsx

@@ -28,7 +28,7 @@ class Tabs extends React.Component {
         result.raiseError(this.props.terria);
       } else {
         if (!file.disableZoomTo) {
-          this.props.terria.currentViewer.zoomTo(file, 1);
+          await this.props.terria.currentViewer.zoomTo(file, 1);
         }
       }
     }

lib/ReactViews/Map/Panels/ToolsPanel/CountDatasets.tsx

@@ -81,7 +81,7 @@ const CountDatasets: React.FC<CountDatasetsProps> = observer((props) => {
           path.push(member.name!);
 
           const loadPromise = member.loadMembers();
-          const countPromise = member.isLoading
+          const countPromise: Promise<void> = member.isLoading
             ? loadPromise
                 .then((result) => result.throwIfError())
                 .then(

lib/ReactViews/Tools/DiffTool/DiffTool.tsx

@@ -443,7 +443,7 @@ class Main extends React.Component<MainPropsType> {
       const imageryProvider =
         part && ImageryParts.is(part) && part.imageryProvider;
       if (imageryProvider) {
-        const promises = [
+        const promises: Promise<boolean>[] = [
           setTimeFilterFromLocation(
             this.props.leftItem,
             markerLocation,

lib/ReactViews/Workbench/Controls/ViewingControls.tsx

@@ -262,7 +262,7 @@ class ViewingControls extends React.Component<
       });
 
       // Add it to terria.catalog, which is required so the new item can be shared.
-      addUserCatalogMember(terria, splitRef, {
+      await addUserCatalogMember(terria, splitRef, {
         open: false
       });
     });